From da38df5115cfba0d2e17264d69e4078b4791b0a8 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 9 Jun 2024 10:18:10 +0100 Subject: [PATCH 1/3] Push --- war/src/main/scss/components/_app-bar.scss | 6 ++--- war/src/main/scss/components/_buttons.scss | 24 +++++++++----------- war/src/main/scss/components/_dropdowns.scss | 4 ++-- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/war/src/main/scss/components/_app-bar.scss b/war/src/main/scss/components/_app-bar.scss index cbe9b9e53fc7..b1b30048ca70 100644 --- a/war/src/main/scss/components/_app-bar.scss +++ b/war/src/main/scss/components/_app-bar.scss @@ -9,7 +9,7 @@ justify-content: center; flex-direction: column; width: 100%; - min-height: 36px; + min-height: 2.25rem; } .jenkins-app-bar__controls { @@ -17,8 +17,8 @@ align-items: center; justify-content: center; margin-left: var(--section-padding); - min-height: 36px; - gap: 1rem; + min-height: 2.25rem; + gap: 0.75rem; .jenkins-search { min-width: 260px; diff --git a/war/src/main/scss/components/_buttons.scss b/war/src/main/scss/components/_buttons.scss index 5108aca2c6eb..f5386d376f3d 100644 --- a/war/src/main/scss/components/_buttons.scss +++ b/war/src/main/scss/components/_buttons.scss @@ -14,15 +14,14 @@ border: none; outline: none; margin: 0; - padding: 0.5rem 0.85rem; - font-size: 0.8125rem; - font-weight: 500; + padding: 0.5rem 0.9rem; + font-size: 0.875rem; text-decoration: none !important; background: transparent; color: var(--text-color) !important; border-radius: 0.66rem; cursor: pointer; - min-height: 36px; + min-height: 2.25rem; white-space: nowrap; gap: 1ch; transition: var(--standard-transition); @@ -32,8 +31,8 @@ } svg { - width: 1.1rem; - height: 1.1rem; + width: 1.125rem; + height: 1.125rem; } &:disabled { @@ -45,14 +44,13 @@ .jenkins-button--primary { color: var(--button-color--primary) !important; - font-weight: 600; &::before { background: var(--accent-color) !important; } &::after { - box-shadow: 0 0 0 0.66rem var(--accent-color); + box-shadow: 0 0 0 0.5rem var(--accent-color); opacity: 0; } @@ -70,7 +68,7 @@ } &::after { - box-shadow: 0 0 0 0.33rem var(--accent-color); + box-shadow: 0 0 0 0.25rem var(--accent-color); opacity: 0.2; } } @@ -95,7 +93,7 @@ } &::after { - box-shadow: 0 0 0 0.66rem currentColor; + box-shadow: 0 0 0 0.5rem currentColor; opacity: 0; } @@ -112,7 +110,7 @@ } &::after { - box-shadow: 0 0 0 0.33rem currentColor; + box-shadow: 0 0 0 0.25rem currentColor; opacity: 0.1; } } @@ -129,7 +127,7 @@ } &::after { - box-shadow: 0 0 0 0.66rem var(--color); + box-shadow: 0 0 0 0.5rem var(--color); opacity: 0; } @@ -147,7 +145,7 @@ } &::after { - box-shadow: 0 0 0 0.33rem var(--color); + box-shadow: 0 0 0 0.25rem var(--color); opacity: 0.3; } } diff --git a/war/src/main/scss/components/_dropdowns.scss b/war/src/main/scss/components/_dropdowns.scss index 586a07fc5adf..3a4ce4435977 100644 --- a/war/src/main/scss/components/_dropdowns.scss +++ b/war/src/main/scss/components/_dropdowns.scss @@ -92,7 +92,7 @@ $dropdown-padding: 0.4rem; color: var(--text-color-secondary) !important; margin: $dropdown-padding 0.55rem; font-size: 0.8125rem; - font-weight: 600; + font-weight: 500; opacity: 0.8; &:not(:first-of-type) { @@ -133,7 +133,7 @@ $dropdown-padding: 0.4rem; margin: 0; padding: $dropdown-padding 1.75rem $dropdown-padding 0.6rem; font-size: 0.8125rem; - font-weight: 500; + font-weight: 450; text-decoration: none !important; background: transparent; color: var(--text-color) !important; From 77fe5842a5abf92667273e2d2589cb90eaf2389d Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 9 Jun 2024 10:28:03 +0100 Subject: [PATCH 2/3] Push --- war/src/main/scss/components/_breadcrumbs.scss | 2 +- war/src/main/scss/components/_side-panel-tasks.scss | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/war/src/main/scss/components/_breadcrumbs.scss b/war/src/main/scss/components/_breadcrumbs.scss index dda12847140e..f50677846430 100644 --- a/war/src/main/scss/components/_breadcrumbs.scss +++ b/war/src/main/scss/components/_breadcrumbs.scss @@ -26,7 +26,7 @@ justify-content: center; color: var(--text-color); font-weight: 500; - font-size: 0.85rem; + font-size: 0.875rem; padding: 0.2rem 0.4rem; & > a { diff --git a/war/src/main/scss/components/_side-panel-tasks.scss b/war/src/main/scss/components/_side-panel-tasks.scss index df5a362315d0..1ae9168ce235 100644 --- a/war/src/main/scss/components/_side-panel-tasks.scss +++ b/war/src/main/scss/components/_side-panel-tasks.scss @@ -8,7 +8,7 @@ $background-outset: 0.7rem; display: flex; flex-direction: column; margin: var(--section-padding); - gap: 5px; + gap: 0.125rem; /* stylelint-disable-next-line media-query-no-invalid */ @media (min-width: breakpoints.$tablet-breakpoint) { @@ -63,11 +63,11 @@ $background-outset: 0.7rem; align-items: center; justify-content: flex-start; padding: 0.55rem $background-outset; - gap: 0.75rem; + gap: 0.65rem; width: 100%; cursor: pointer; - font-weight: 500 !important; - font-size: 0.9rem; + font-weight: 450 !important; + font-size: 0.875rem; color: var(--text-color) !important; background: transparent; outline: none; @@ -101,11 +101,11 @@ $background-outset: 0.7rem; } &--active { - font-weight: 600 !important; + font-weight: 500 !important; cursor: default; svg * { - stroke-width: 38px; + stroke-width: 35px; } &::before { From 3c9cd1f133ebecb7cd1604ed36ad330cf7e23c76 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sun, 9 Jun 2024 10:38:37 +0100 Subject: [PATCH 3/3] Update _buttons.scss --- war/src/main/scss/components/_buttons.scss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/war/src/main/scss/components/_buttons.scss b/war/src/main/scss/components/_buttons.scss index f5386d376f3d..4812949af07c 100644 --- a/war/src/main/scss/components/_buttons.scss +++ b/war/src/main/scss/components/_buttons.scss @@ -50,7 +50,7 @@ } &::after { - box-shadow: 0 0 0 0.5rem var(--accent-color); + box-shadow: 0 0 0 0.66rem var(--accent-color); opacity: 0; } @@ -68,7 +68,7 @@ } &::after { - box-shadow: 0 0 0 0.25rem var(--accent-color); + box-shadow: 0 0 0 0.33rem var(--accent-color); opacity: 0.2; } } @@ -93,7 +93,7 @@ } &::after { - box-shadow: 0 0 0 0.5rem currentColor; + box-shadow: 0 0 0 0.66rem currentColor; opacity: 0; } @@ -110,7 +110,7 @@ } &::after { - box-shadow: 0 0 0 0.25rem currentColor; + box-shadow: 0 0 0 0.33rem currentColor; opacity: 0.1; } } @@ -127,7 +127,7 @@ } &::after { - box-shadow: 0 0 0 0.5rem var(--color); + box-shadow: 0 0 0 0.66rem var(--color); opacity: 0; } @@ -145,7 +145,7 @@ } &::after { - box-shadow: 0 0 0 0.25rem var(--color); + box-shadow: 0 0 0 0.33rem var(--color); opacity: 0.3; } }