From 9657d460acfbd9e1f70ec7bec66817717d264d6c Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:06:16 +0000 Subject: [PATCH 1/6] Init --- war/src/main/scss/abstracts/_theme.scss | 2 +- war/src/main/scss/base/_style.scss | 2 +- .../scss/components/_panes-and-bigtable.scss | 3 -- .../scss/components/_side-panel-widgets.scss | 30 +++++++------------ 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss index 2ea8f434481d..fa97f23d6b66 100644 --- a/war/src/main/scss/abstracts/_theme.scss +++ b/war/src/main/scss/abstracts/_theme.scss @@ -200,7 +200,7 @@ $semantics: ( --link-dark-text-decoration: none; --link-dark-text-decoration--hover: underline; --link-dark-text-decoration--active: underline; - --link-dark-font-weight: 600; + --link-dark-font-weight: 500; // Pane --pane-border-width: 1px; diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss index 2abd6d4ef10a..535de2aeb288 100644 --- a/war/src/main/scss/base/_style.scss +++ b/war/src/main/scss/base/_style.scss @@ -498,7 +498,7 @@ div.listview-jobs { } td { - padding: 8px; + padding: 0 8px 8px 8px; } } diff --git a/war/src/main/scss/components/_panes-and-bigtable.scss b/war/src/main/scss/components/_panes-and-bigtable.scss index 435622edcbc9..245d25cdfa5e 100644 --- a/war/src/main/scss/components/_panes-and-bigtable.scss +++ b/war/src/main/scss/components/_panes-and-bigtable.scss @@ -10,9 +10,6 @@ padding: 8px 0; color: var(--pane-header-text-color); background: var(--pane-header-bg); - border: var(--pane-border-width) solid var(--pane-header-border-color); - border-left: none; - border-right: none; } .pane { diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss index 037674f61b88..d81b273d96cc 100644 --- a/war/src/main/scss/components/_side-panel-widgets.scss +++ b/war/src/main/scss/components/_side-panel-widgets.scss @@ -1,11 +1,11 @@ @use "../abstracts/mixins"; #side-panel .pane-frame { - border-radius: 0; - border-left: none; - border-right: none; - border-color: var(--panel-border-color); - border-width: 1px; + border-radius: 1rem; + background: var(--card-background); + border: var(--card-border-width) solid var(--card-border-color); + margin-left: 10px; + overflow: hidden; } #side-panel .pane-header { @@ -20,16 +20,14 @@ #side-panel .pane-header, #side-panel .pane-footer { color: var(--link-dark-color); - background-color: var(--panel-header-bg-color); - border-radius: 0; - border-width: 1px; - padding: 0.5rem 1.25rem; + background: transparent; + padding: 0.65rem 1rem; } #side-panel .pane-header-title { display: inline-block; flex: 1; - font-weight: bold; + font-weight: 500; & > div { font-weight: normal; @@ -85,19 +83,11 @@ text-decoration: underline; } -#side-panel .pane-header a { - font-weight: bold; -} - -#side-panel .pane-content a { - font-weight: 600; -} - /** * Build Queue */ #buildQueue { - margin-bottom: var(--section-padding); + margin-bottom: calc(var(--section-padding) / 2); } /** @@ -257,7 +247,7 @@ .jenkins-pane__header--build-history { display: grid; grid-template-columns: auto 1fr auto; - font-weight: bold !important; + font-weight: 500 !important; .jenkins-table__cell--tight { width: auto; From 2922a690bb3889faa2c95574181a47ffbb8e999d Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:11:33 +0000 Subject: [PATCH 2/6] Update _style.scss --- war/src/main/scss/base/_style.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss index 535de2aeb288..d248c6ed7ffd 100644 --- a/war/src/main/scss/base/_style.scss +++ b/war/src/main/scss/base/_style.scss @@ -498,7 +498,7 @@ div.listview-jobs { } td { - padding: 0 8px 8px 8px; + padding: 0 8px 8px; } } From ac5c255530fbda6fb0143f0e3009948685ae1bf8 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:15:28 +0000 Subject: [PATCH 3/6] Remove more bold weights --- war/src/main/scss/base/_style.scss | 1 - war/src/main/scss/components/_side-panel-widgets.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss index d248c6ed7ffd..82c808b0c9bf 100644 --- a/war/src/main/scss/base/_style.scss +++ b/war/src/main/scss/base/_style.scss @@ -593,7 +593,6 @@ div.listview-jobs { .build-row-cell .pane.build-name { width: 25%; - font-weight: bold; vertical-align: top; } diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss index d81b273d96cc..8059207b0221 100644 --- a/war/src/main/scss/components/_side-panel-widgets.scss +++ b/war/src/main/scss/components/_side-panel-widgets.scss @@ -114,7 +114,6 @@ .build-row-cell .pane.build-name { width: 30%; - font-weight: bold; vertical-align: top; } From 428d0e560afcb2096a914debf21fcaba099a7ed8 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Thu, 7 Dec 2023 20:17:10 +0000 Subject: [PATCH 4/6] Lower weight --- war/src/main/scss/base/_style.scss | 1 + war/src/main/scss/components/_side-panel-widgets.scss | 1 + 2 files changed, 2 insertions(+) diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss index 82c808b0c9bf..5d1762b54891 100644 --- a/war/src/main/scss/base/_style.scss +++ b/war/src/main/scss/base/_style.scss @@ -593,6 +593,7 @@ div.listview-jobs { .build-row-cell .pane.build-name { width: 25%; + font-weight: 500; vertical-align: top; } diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss index 8059207b0221..10e576ed6886 100644 --- a/war/src/main/scss/components/_side-panel-widgets.scss +++ b/war/src/main/scss/components/_side-panel-widgets.scss @@ -114,6 +114,7 @@ .build-row-cell .pane.build-name { width: 30%; + font-weight: 500; vertical-align: top; } From 6bb858c5a3113cd3269fc71a373769b10d77ce59 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Wed, 13 Dec 2023 22:03:41 +0000 Subject: [PATCH 5/6] Tweak widths --- war/src/main/scss/components/_side-panel-widgets.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss index 10e576ed6886..b9cc737da0af 100644 --- a/war/src/main/scss/components/_side-panel-widgets.scss +++ b/war/src/main/scss/components/_side-panel-widgets.scss @@ -113,7 +113,7 @@ } .build-row-cell .pane.build-name { - width: 30%; + width: 32%; font-weight: 500; vertical-align: top; } @@ -123,7 +123,7 @@ } .build-row-cell .pane.build-controls { - width: 20%; + width: 18%; text-align: right; } From e58087c133658a7281b0cbb5c2b5214f5da107b7 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Sat, 16 Dec 2023 16:23:54 +0000 Subject: [PATCH 6/6] Fix spacing --- war/src/main/scss/components/_side-panel-widgets.scss | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/war/src/main/scss/components/_side-panel-widgets.scss index b9cc737da0af..bd6715cdc586 100644 --- a/war/src/main/scss/components/_side-panel-widgets.scss +++ b/war/src/main/scss/components/_side-panel-widgets.scss @@ -5,6 +5,7 @@ background: var(--card-background); border: var(--card-border-width) solid var(--card-border-color); margin-left: 10px; + margin-bottom: calc(var(--section-padding) / 2); overflow: hidden; } @@ -83,13 +84,6 @@ text-decoration: underline; } -/** - * Build Queue - */ -#buildQueue { - margin-bottom: calc(var(--section-padding) / 2); -} - /** * Executors */