Skip to content

Commit f9ac241

Browse files
mikebrobertsmikebroberts
committed
More bootstrap 5
Switch to 5.3 from 5.2 (5.3 is actual latest plus has useful switches) Some more styling update. Overall I still think Bootstrap 3 looked better, including colors.
1 parent 46a305a commit f9ac241

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

‎src/app/web/domainComponents/pushComponents.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export type PushRowOptions = {
1414

1515
export function pushRow(clock: Clock, push: GithubPush, options: PushRowOptions) {
1616
return tr(
17-
{ class: 'table-info' },
17+
{ class: 'table-light' },
1818
options.showDescription ? pushDescriptionCell : undefined,
1919
options.showRepo ? repoCellForPush(push) : undefined,
2020
branchCell(push),

‎src/web/app/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
<meta name='viewport' content='width=device-width, initial-scale=1'>
77
<title>Cicada</title>
88
<script src='/js/htmx.min.js' crossorigin='anonymous'></script>
9-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
9+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
1010
<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css'>
1111
</head>
1212
<body>
1313
<script src="/js/checkLoggedIn.js"></script>
1414
<div class='container' id='toplevel'>
15-
<h2>Cicada</h2>
15+
<h1 class="display-3 mt-4">Cicada</h1>
1616
<script src="/js/checkForHtmxUnauthorizedResponse.js"></script>
17-
<h3>GitHub Actions Status</h3>
17+
<h3 class="mt-4">GitHub Actions Status</h3>
1818
<div hx-get='/app/fragment/actionsStatus'
1919
hx-trigger='load'
2020
hx-swap='outerHTML'>Loading GitHub Actions Status...
2121
</div>
22-
<h3>Recent Branch Activity</h3>
22+
<h3 class="mt-4">Recent Branch Activity</h3>
2323
<div hx-get='/app/fragment/gitHubActivity'
2424
hx-trigger='load'
2525
hx-swap='outerHTML'>Loading Recent Activity...

‎src/web/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Cicada</title>
88
<link rel="manifest" href="/site.webmanifest">
99
<!-- TODO - figure out how to make this work from own distribution (it refers to other relative files) -->
10-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
10+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
1111
<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css'>
1212
</head>
1313
<body>
@@ -22,7 +22,7 @@
2222
location.assign("/app")
2323
}
2424
</script>
25-
<h2>Welcome to Cicada!</h2>
25+
<h2 class="mt-4 mb-4">Welcome to Cicada!</h2>
2626
<p>
2727
If you are a user for this installation of Cicada you can <a href='/github/auth/login'>login with your GitHub user here</a>.
2828
</p>

‎src/web/repo/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name='viewport' content='width=device-width, initial-scale=1'>
77
<title>Cicada</title>
88
<script src='/js/htmx.min.js' crossorigin='anonymous'></script>
9-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
9+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
1010
<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css'>
1111
</head>
1212

@@ -18,20 +18,20 @@
1818
const repoKey = { ownerId: urlParams.get('ownerId'), repoId: urlParams.get('repoId') }
1919
</script>
2020
<div class="container" id="toplevel">
21-
<h2>Cicada</h2>
21+
<h1 class="display-3 mt-4">Cicada</h1>
2222
<script src="/js/checkForHtmxUnauthorizedResponse.js"></script>
2323
<div hx-get='/app/fragment/repo/heading'
2424
hx-trigger='load'
2525
hx-vals='js:{ ...repoKey }'
2626
hx-swap='outerHTML'>Finding repository details...
2727
</div>
28-
<h4>GitHub Actions Status</h4>
28+
<h4 class="mt-4">GitHub Actions Status</h4>
2929
<div hx-get='/app/fragment/actionsStatus'
3030
hx-trigger='load'
3131
hx-vals='js:{ ...repoKey }'
3232
hx-swap='outerHTML'>Loading GitHub Actions Status...
3333
</div>
34-
<h4>Recent Activity</h4>
34+
<h4 class="mt-4">Recent Activity</h4>
3535
<div hx-get='/app/fragment/gitHubActivity'
3636
hx-trigger='load'
3737
hx-vals='js:{ ...repoKey }'

‎src/web/web-push.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<title>Cicada Web Push Notifications</title>
88
<script src='/js/web-push.js' type="module"></script>
99
<script src='/js/htmx.min.js' crossorigin='anonymous'></script>
10-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
10+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
1111
<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css'>
1212
</head>
1313
<body>

‎src/web/workflow/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta name='viewport' content='width=device-width, initial-scale=1'>
77
<title>Cicada</title>
88
<script src='/js/htmx.min.js' crossorigin='anonymous'></script>
9-
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
9+
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
1010
<link rel='stylesheet' href='https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.min.css'>
1111
</head>
1212

@@ -22,7 +22,7 @@
2222
}
2323
</script>
2424
<div class="container" id="toplevel">
25-
<h2>Cicada</h2>
25+
<h1 class="display-3 mt-4">Cicada</h1>
2626
<script src="/js/checkForHtmxUnauthorizedResponse.js"></script>
2727
<div hx-get='/app/fragment/workflow/heading'
2828
hx-trigger='load'

‎test/local/functional/web/fragments/homeRecentActivity.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ test('home-recent-activity', async () => {
8686
</tr>
8787
</thead>
8888
<tbody>
89-
<tr class="table-info">
89+
<tr class="table-light">
9090
<td>
9191
<a href="/repo?ownerId=162483619&repoId=768206479">org-test-repo-one</a>
9292
&nbsp;

0 commit comments

Comments
 (0)