From 0f6466dfaaf57ca8a57e236c1ea7fa6d6eedf690 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:21:19 +0100 Subject: [PATCH 01/11] Squashed commit of the following: --- .../config.groovy | 21 +++++++++---------- war/src/main/scss/form/_checkbox.scss | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy index f470918608d3..c494df5c23a9 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy @@ -31,20 +31,19 @@ st = namespace("jelly:stapler") f.section(title: _("Administrative monitors configuration")) { f.advanced(title: _("Administrative monitors")) { - f.entry(title: _("Enabled administrative monitors")) { - p(class: "jenkins-form-description", _("blurb")) + f.entry(title: _("Enabled administrative monitors"), description: _("blurb")) { for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all()) .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) { - div(class: "jenkins-checkbox-help-wrapper") { - f.checkbox(name: "administrativeMonitor", - title: am.displayName, - checked: am.enabled, - json: am.id) - if (am.isSecurity()) { - span(style: 'margin-left: 0.5rem', class: 'am-badge', _("Security")) + div(style: "margin-bottom: 0.625rem") { + div(class: "jenkins-checkbox-help-wrapper") { + f.checkbox(name: "administrativeMonitor", + title: am.displayName, + checked: am.enabled, + json: am.id) + if (am.isSecurity()) { + span(style: 'margin-left: 0.5rem', class: 'am-badge', _("Security")) + } } - } - div(class: "tr") { div(class: "jenkins-checkbox__description") { st.include(it: am, page: "description", optional: true) } diff --git a/war/src/main/scss/form/_checkbox.scss b/war/src/main/scss/form/_checkbox.scss index d9cd5f18c951..ff756788ff6e 100644 --- a/war/src/main/scss/form/_checkbox.scss +++ b/war/src/main/scss/form/_checkbox.scss @@ -187,9 +187,9 @@ } .jenkins-checkbox__description { - margin-top: 0.3rem; + //margin-top: 0.3rem; margin-left: 34px; - margin-bottom: 1rem; + //margin-bottom: 1rem; color: var(--text-color-secondary); line-height: 1.66; } From 6db28f7bbcbb1ed8fca00b4fc369286de7367735 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 14:31:00 +0100 Subject: [PATCH 02/11] Rename section --- .../config.groovy | 6 +-- .../config_it.properties | 1 - .../config_ru.properties | 1 - .../config_sv_SE.properties | 1 - .../config_tr.properties | 1 - war/src/main/scss/components/_badges.scss | 38 +------------------ 6 files changed, 5 insertions(+), 43 deletions(-) diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy index c494df5c23a9..e94c51f9b2b8 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy @@ -29,9 +29,9 @@ import hudson.model.AdministrativeMonitor f = namespace(lib.FormTagLib) st = namespace("jelly:stapler") -f.section(title: _("Administrative monitors configuration")) { +f.section(title: _("Administrative monitors"), description: _("blurb")) { f.advanced(title: _("Administrative monitors")) { - f.entry(title: _("Enabled administrative monitors"), description: _("blurb")) { + f.entry(title: _("Enabled administrative monitors")) { for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all()) .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) { div(style: "margin-bottom: 0.625rem") { @@ -41,7 +41,7 @@ f.section(title: _("Administrative monitors configuration")) { checked: am.enabled, json: am.id) if (am.isSecurity()) { - span(style: 'margin-left: 0.5rem', class: 'am-badge', _("Security")) + span(style: 'margin-left: 0.5rem', class: 'jenkins-badge', _("Security")) } } div(class: "jenkins-checkbox__description") { diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties index 99774b93a33c..1af9898ec0d7 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties @@ -22,7 +22,6 @@ # THE SOFTWARE. Administrative\ monitors=Monitor amministrativi -Administrative\ monitors\ configuration=Configurazione monitor amministrativi blurb=I monitor amministrativi sono avvisi visualizzati agli amministratori \ di Jenkins riguardanti lo stato dell''istanza di Jenkins. In generale è \ caldamente consigliato mantenere tutti i monitor amministrativi abilitati, \ diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties index fabeb6e453ef..71d48a0c418e 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties @@ -21,7 +21,6 @@ # THE SOFTWARE. Administrative\ monitors=Мониторы администрирования -Administrative\ monitors\ configuration=Настройка мониторов администрирования blurb=Мониторы администрирования - это предупреждения о состоянии экземпляра Jenkins, которые показываются \ администраторам Jenkins. Обычно настоятельно рекомендуется оставить все мониторы администрирования включёнными, но \ если некоторые предупреждения вас не интересуют, отключите их здесь, чтобы навсегда скрыть их. diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties index 2d46f007949b..e98561120936 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties @@ -4,5 +4,4 @@ blurb=Administrativa övervakningar är varningar som visas för Jenkins-adminis inte är intresserad av specifika varningar kan du avmarkera dem här för att \ dölja dem permanent. Administrative\ monitors=Administrativa övervakningar -Administrative\ monitors\ configuration=Konfiguration av administrativa övervakningar Enabled\ administrative\ monitors=Aktiverade administrativa övervakningar \ No newline at end of file diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties index 188640215ba6..ba08a86733df 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties @@ -1,4 +1,3 @@ -Administrative\ monitors\ configuration=İdari monitör ayarları Administrative\ monitors=İdari monitörler Enabled\ administrative\ monitors=Aktif idari monitörler blurb=İdari monitörler, Jenkins yöneticilerine Jenkins örneğinin durumu hakkında gösterilen uyarılardır. Genel olarak tüm yönetim monitörlerini etkin tutmanız şiddetle tavsiye edilir, ancak belirli uyarılarla ilgilenmiyorsanız, kalıcı olarak gizlemek için buradaki işaretlerini kaldırın. diff --git a/war/src/main/scss/components/_badges.scss b/war/src/main/scss/components/_badges.scss index 7fc69376af34..0b5917d87034 100644 --- a/war/src/main/scss/components/_badges.scss +++ b/war/src/main/scss/components/_badges.scss @@ -1,37 +1,3 @@ -.am-badge, -.plugin-manager__category-label:link, -.plugin-manager__category-label:visited { - display: inline-block; - border: 1px solid var(--plugin-manager-category-link-border-color); - background-color: var(--plugin-manager-category-link-bg-color); - color: var(--plugin-manager-category-text-color); - border-radius: 4px; - font-size: 0.75rem; - font-weight: 500; - padding: 0 0.5rem; - margin: 0 0.25rem 0 0; - text-decoration: none; - text-align: center; - white-space: nowrap; - vertical-align: baseline; - transition: all 0.15s ease-in-out; -} - -.plugin-manager__category-label:link, -.plugin-manager__category-label:visited { - &:hover, - &:focus, - &:active { - background-color: var(--plugin-manager-category-link-bg-color--hover); - border-color: var(--plugin-manager-category-link-border-color--hover); - color: var(--plugin-manager-category-link-color--hover); - } -} - -.am-badge { - display: inline; -} - .jenkins-badge { display: flex; align-items: center; @@ -42,8 +8,8 @@ min-height: 20px; min-width: 20px; padding: 0 0.4rem; - background: color-mix(in sRGB, var(--color) 85%, transparent); - box-shadow: inset 0 -1px 2px var(--color); + background: color-mix(in sRGB, var(--color, var(--accent-color)) 85%, transparent); + box-shadow: inset 0 -1px 2px var(--color, var(--accent-color)); color: var(--white) !important; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); backdrop-filter: blur(2.5px); From 8bb0f00105b67081966a970f15e6ca3725d31414 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:02:34 +0100 Subject: [PATCH 03/11] Push --- .../hudson/PluginManager/updates.jelly | 2 +- .../views/LastFailureColumn/column.jelly | 2 +- .../views/LastStableColumn/column.jelly | 2 +- .../views/LastSuccessColumn/column.jelly | 2 +- .../js/templates/plugin-manager/available.hbs | 2 +- war/src/main/scss/abstracts/_mixins.scss | 2 +- war/src/main/scss/components/_badges.scss | 31 +++++++++++++++---- war/src/main/scss/components/_table.scss | 7 +++++ war/src/main/scss/pages/_plugin-manager.scss | 10 +++--- 9 files changed, 42 insertions(+), 18 deletions(-) diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly index d4163fb7cfbe..cdc36179c987 100644 --- a/core/src/main/resources/hudson/PluginManager/updates.jelly +++ b/core/src/main/resources/hudson/PluginManager/updates.jelly @@ -123,7 +123,7 @@ THE SOFTWARE. + class="jenkins-badge"> ${app.updateCenter.getCategoryDisplayName(label)} diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly index cfecd8389b02..caac61b80a70 100644 --- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lfBuild.timestampString} - ${lfBuild.displayName} + ${lfBuild.displayName} ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly index 7bbc2dcc0868..73100d7013f1 100644 --- a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lstBuild.timestampString} - ${lstBuild.displayName} + ${lstBuild.displayName} ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly index 7b951f4a1296..c0e141a176d0 100644 --- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lsBuild.timestampString} - ${lsBuild.displayName} + ${lsBuild.displayName} ${%N/A} diff --git a/war/src/main/js/templates/plugin-manager/available.hbs b/war/src/main/js/templates/plugin-manager/available.hbs index 115a7b4d8e21..7affb0a4ea73 100644 --- a/war/src/main/js/templates/plugin-manager/available.hbs +++ b/war/src/main/js/templates/plugin-manager/available.hbs @@ -19,7 +19,7 @@ {{#if this.categories }}
{{#each this.categories }} - + {{ this }} {{/each}} diff --git a/war/src/main/scss/abstracts/_mixins.scss b/war/src/main/scss/abstracts/_mixins.scss index 63a963f698c6..c5897fb01aed 100644 --- a/war/src/main/scss/abstracts/_mixins.scss +++ b/war/src/main/scss/abstracts/_mixins.scss @@ -73,7 +73,7 @@ } &::before { - background-color: transparent; + background-color: var(--item-background); } &::after { diff --git a/war/src/main/scss/components/_badges.scss b/war/src/main/scss/components/_badges.scss index 0b5917d87034..ec0d72ccff26 100644 --- a/war/src/main/scss/components/_badges.scss +++ b/war/src/main/scss/components/_badges.scss @@ -1,5 +1,7 @@ +@use "../abstracts/mixins"; + .jenkins-badge { - display: flex; + display: inline-flex; align-items: center; justify-content: center; border-radius: 100px; @@ -8,9 +10,26 @@ min-height: 20px; min-width: 20px; padding: 0 0.4rem; - background: color-mix(in sRGB, var(--color, var(--accent-color)) 85%, transparent); - box-shadow: inset 0 -1px 2px var(--color, var(--accent-color)); - color: var(--white) !important; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); - backdrop-filter: blur(2.5px); + background: color-mix(in sRGB, var(--text-color-secondary) 12.5%, transparent); + + &[href] { + @include mixins.item; + + --item-background: color-mix(in sRGB, currentColor 5%, transparent); + --item-background--hover: color-mix(in sRGB, currentColor 10%, transparent); + --item-background--active: color-mix(in sRGB, currentColor 15%, transparent); + --item-box-shadow--focus: var(--item-background); + + text-decoration: none; + background: transparent; + border-radius: 100px; + } + + &[class*="color"] { + background: color-mix(in sRGB, var(--color) 85%, transparent); + color: var(--white) !important; + box-shadow: inset 0 -1px 2px var(--color, var(--text-color-secondary)); + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1); + backdrop-filter: blur(2.5px); + } } diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss index 7d8b9e274f6e..c553964f8632 100644 --- a/war/src/main/scss/components/_table.scss +++ b/war/src/main/scss/components/_table.scss @@ -282,6 +282,13 @@ } } + .jenkins-badge { + font-size: 0.8125rem; + padding: 0.1rem 0.55rem; + margin-left: 0.45rem; + } + + // Deprecated - use .jenkins-badge &__badge { margin-left: 1rem !important; diff --git a/war/src/main/scss/pages/_plugin-manager.scss b/war/src/main/scss/pages/_plugin-manager.scss index 6fb61e570b51..7981b3eeb299 100644 --- a/war/src/main/scss/pages/_plugin-manager.scss +++ b/war/src/main/scss/pages/_plugin-manager.scss @@ -1,11 +1,9 @@ #plugins { .app-plugin-manager__categories { - margin: 0.5rem 0; - - a { - margin: 0 1.25rem 0 0 !important; - font-size: 0.75rem; - } + display: flex; + flex-wrap: wrap; + gap: 0.5rem; + margin: 0.5rem -1rem; } tr.already-upgraded { From dd49cbafa0a5d2623fd47bf9123504609c2de16e Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:06:45 +0100 Subject: [PATCH 04/11] Update _plugin-manager.scss --- war/src/main/scss/pages/_plugin-manager.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/war/src/main/scss/pages/_plugin-manager.scss b/war/src/main/scss/pages/_plugin-manager.scss index 7981b3eeb299..521c44df615c 100644 --- a/war/src/main/scss/pages/_plugin-manager.scss +++ b/war/src/main/scss/pages/_plugin-manager.scss @@ -3,7 +3,11 @@ display: flex; flex-wrap: wrap; gap: 0.5rem; - margin: 0.5rem -1rem; + margin: 0.5rem -0.55rem; + + .jenkins-badge { + margin: 0 !important; + } } tr.already-upgraded { From b70767531e814cf1453183b8453aa530457ec4d0 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 15:45:21 +0100 Subject: [PATCH 05/11] Update _checkbox.scss --- war/src/main/scss/form/_checkbox.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/war/src/main/scss/form/_checkbox.scss b/war/src/main/scss/form/_checkbox.scss index ff756788ff6e..6e5633dd991f 100644 --- a/war/src/main/scss/form/_checkbox.scss +++ b/war/src/main/scss/form/_checkbox.scss @@ -187,9 +187,7 @@ } .jenkins-checkbox__description { - //margin-top: 0.3rem; margin-left: 34px; - //margin-bottom: 1rem; color: var(--text-color-secondary); line-height: 1.66; } From a54539288496a4ce9ebb28886e3352393a303746 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:22:24 +0100 Subject: [PATCH 06/11] Reset files --- .../main/resources/hudson/PluginManager/updates.jelly | 2 +- .../hudson/views/LastFailureColumn/column.jelly | 2 +- .../hudson/views/LastStableColumn/column.jelly | 2 +- .../hudson/views/LastSuccessColumn/column.jelly | 2 +- war/src/main/js/templates/plugin-manager/available.hbs | 2 +- war/src/main/scss/abstracts/_mixins.scss | 2 +- war/src/main/scss/components/_table.scss | 7 ------- war/src/main/scss/pages/_plugin-manager.scss | 10 ++++------ 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/core/src/main/resources/hudson/PluginManager/updates.jelly b/core/src/main/resources/hudson/PluginManager/updates.jelly index cdc36179c987..d4163fb7cfbe 100644 --- a/core/src/main/resources/hudson/PluginManager/updates.jelly +++ b/core/src/main/resources/hudson/PluginManager/updates.jelly @@ -123,7 +123,7 @@ THE SOFTWARE. + class="jenkins-table__link jenkins-table__badge"> ${app.updateCenter.getCategoryDisplayName(label)} diff --git a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly index caac61b80a70..cfecd8389b02 100644 --- a/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastFailureColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lfBuild.timestampString} - ${lfBuild.displayName} + ${lfBuild.displayName} ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly index 73100d7013f1..7bbc2dcc0868 100644 --- a/core/src/main/resources/hudson/views/LastStableColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastStableColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lstBuild.timestampString} - ${lstBuild.displayName} + ${lstBuild.displayName} ${%N/A} diff --git a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly index c0e141a176d0..7b951f4a1296 100644 --- a/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly +++ b/core/src/main/resources/hudson/views/LastSuccessColumn/column.jelly @@ -29,7 +29,7 @@ THE SOFTWARE. ${lsBuild.timestampString} - ${lsBuild.displayName} + ${lsBuild.displayName} ${%N/A} diff --git a/war/src/main/js/templates/plugin-manager/available.hbs b/war/src/main/js/templates/plugin-manager/available.hbs index 7affb0a4ea73..115a7b4d8e21 100644 --- a/war/src/main/js/templates/plugin-manager/available.hbs +++ b/war/src/main/js/templates/plugin-manager/available.hbs @@ -19,7 +19,7 @@ {{#if this.categories }}
{{#each this.categories }} - + {{ this }} {{/each}} diff --git a/war/src/main/scss/abstracts/_mixins.scss b/war/src/main/scss/abstracts/_mixins.scss index c5897fb01aed..63a963f698c6 100644 --- a/war/src/main/scss/abstracts/_mixins.scss +++ b/war/src/main/scss/abstracts/_mixins.scss @@ -73,7 +73,7 @@ } &::before { - background-color: var(--item-background); + background-color: transparent; } &::after { diff --git a/war/src/main/scss/components/_table.scss b/war/src/main/scss/components/_table.scss index c553964f8632..7d8b9e274f6e 100644 --- a/war/src/main/scss/components/_table.scss +++ b/war/src/main/scss/components/_table.scss @@ -282,13 +282,6 @@ } } - .jenkins-badge { - font-size: 0.8125rem; - padding: 0.1rem 0.55rem; - margin-left: 0.45rem; - } - - // Deprecated - use .jenkins-badge &__badge { margin-left: 1rem !important; diff --git a/war/src/main/scss/pages/_plugin-manager.scss b/war/src/main/scss/pages/_plugin-manager.scss index 521c44df615c..6fb61e570b51 100644 --- a/war/src/main/scss/pages/_plugin-manager.scss +++ b/war/src/main/scss/pages/_plugin-manager.scss @@ -1,12 +1,10 @@ #plugins { .app-plugin-manager__categories { - display: flex; - flex-wrap: wrap; - gap: 0.5rem; - margin: 0.5rem -0.55rem; + margin: 0.5rem 0; - .jenkins-badge { - margin: 0 !important; + a { + margin: 0 1.25rem 0 0 !important; + font-size: 0.75rem; } } From 02ccece67c69c860b2c50ccaca61ad69a8ffdd62 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:22:42 +0100 Subject: [PATCH 07/11] Update _badges.scss --- war/src/main/scss/components/_badges.scss | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/war/src/main/scss/components/_badges.scss b/war/src/main/scss/components/_badges.scss index ec0d72ccff26..98dc9116612b 100644 --- a/war/src/main/scss/components/_badges.scss +++ b/war/src/main/scss/components/_badges.scss @@ -12,19 +12,6 @@ padding: 0 0.4rem; background: color-mix(in sRGB, var(--text-color-secondary) 12.5%, transparent); - &[href] { - @include mixins.item; - - --item-background: color-mix(in sRGB, currentColor 5%, transparent); - --item-background--hover: color-mix(in sRGB, currentColor 10%, transparent); - --item-background--active: color-mix(in sRGB, currentColor 15%, transparent); - --item-box-shadow--focus: var(--item-background); - - text-decoration: none; - background: transparent; - border-radius: 100px; - } - &[class*="color"] { background: color-mix(in sRGB, var(--color) 85%, transparent); color: var(--white) !important; From b9b651b480e88537481f4e8aa22c6e4662ca7bc4 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:23:21 +0100 Subject: [PATCH 08/11] Update _badges.scss --- war/src/main/scss/components/_badges.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/war/src/main/scss/components/_badges.scss b/war/src/main/scss/components/_badges.scss index 98dc9116612b..c2f3e4c8c609 100644 --- a/war/src/main/scss/components/_badges.scss +++ b/war/src/main/scss/components/_badges.scss @@ -1,5 +1,3 @@ -@use "../abstracts/mixins"; - .jenkins-badge { display: inline-flex; align-items: center; From 2b9b8caa7cc9464952d30b055a64b88a87a4bec9 Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:26:18 +0100 Subject: [PATCH 09/11] Update _theme.scss --- war/src/main/scss/abstracts/_theme.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/war/src/main/scss/abstracts/_theme.scss b/war/src/main/scss/abstracts/_theme.scss index c108634f7c85..0558369c9ac3 100644 --- a/war/src/main/scss/abstracts/_theme.scss +++ b/war/src/main/scss/abstracts/_theme.scss @@ -331,12 +331,6 @@ $semantics: ( // Plugin manager --plugin-manager-bg-color-already-upgraded: var(--light-grey); - --plugin-manager-category-link-bg-color: var(--very-light-grey); - --plugin-manager-category-link-bg-color--hover: #f2f2f2; - --plugin-manager-category-link-border-color: var(--medium-grey); - --plugin-manager-category-link-border-color--hover: var(--black); - --plugin-manager-category-text-color: var(--text-color); - --plugin-manager-category-link-color--hover: var(--text-color); // Auto complete --auto-complete-bg-color--prehighlight: #b3d4ff; From 554b80793acc9d65f5715d3d0287caf0366eb81f Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:29:47 +0100 Subject: [PATCH 10/11] Remove label --- .../AdministrativeMonitorsConfiguration/config.groovy | 2 +- .../AdministrativeMonitorsConfiguration/config_it.properties | 1 - .../AdministrativeMonitorsConfiguration/config_ru.properties | 1 - .../AdministrativeMonitorsConfiguration/config_sv_SE.properties | 1 - .../AdministrativeMonitorsConfiguration/config_tr.properties | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy index e94c51f9b2b8..78b82d5a5021 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config.groovy @@ -31,7 +31,7 @@ st = namespace("jelly:stapler") f.section(title: _("Administrative monitors"), description: _("blurb")) { f.advanced(title: _("Administrative monitors")) { - f.entry(title: _("Enabled administrative monitors")) { + f.entry() { for (AdministrativeMonitor am : new ArrayList<>(AdministrativeMonitor.all()) .sort({ o1, o2 -> o1.getDisplayName() <=> o2.getDisplayName() })) { div(style: "margin-bottom: 0.625rem") { diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties index 1af9898ec0d7..e6a4cda88b8d 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_it.properties @@ -27,4 +27,3 @@ blurb=I monitor amministrativi sono avvisi visualizzati agli amministratori \ caldamente consigliato mantenere tutti i monitor amministrativi abilitati, \ ma se non si è interessati a ricevere specifici avvisi, li si deselezioni \ qui per nasconderli permanentemente. -Enabled\ administrative\ monitors=Monitor amministrativi abilitati diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties index 71d48a0c418e..fc794e82e30f 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_ru.properties @@ -24,4 +24,3 @@ Administrative\ monitors=Мониторы администрирования blurb=Мониторы администрирования - это предупреждения о состоянии экземпляра Jenkins, которые показываются \ администраторам Jenkins. Обычно настоятельно рекомендуется оставить все мониторы администрирования включёнными, но \ если некоторые предупреждения вас не интересуют, отключите их здесь, чтобы навсегда скрыть их. -Enabled\ administrative\ monitors=Включённые мониторы администрирования diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties index e98561120936..4d20f2a9ff9b 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_sv_SE.properties @@ -4,4 +4,3 @@ blurb=Administrativa övervakningar är varningar som visas för Jenkins-adminis inte är intresserad av specifika varningar kan du avmarkera dem här för att \ dölja dem permanent. Administrative\ monitors=Administrativa övervakningar -Enabled\ administrative\ monitors=Aktiverade administrativa övervakningar \ No newline at end of file diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties index ba08a86733df..63b7ff3612b0 100644 --- a/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties +++ b/core/src/main/resources/jenkins/management/AdministrativeMonitorsConfiguration/config_tr.properties @@ -1,3 +1,2 @@ Administrative\ monitors=İdari monitörler -Enabled\ administrative\ monitors=Aktif idari monitörler blurb=İdari monitörler, Jenkins yöneticilerine Jenkins örneğinin durumu hakkında gösterilen uyarılardır. Genel olarak tüm yönetim monitörlerini etkin tutmanız şiddetle tavsiye edilir, ancak belirli uyarılarla ilgilenmiyorsanız, kalıcı olarak gizlemek için buradaki işaretlerini kaldırın. From 9cdf2e8f5b9c0720569d24643a0e8ab2d0c2f328 Mon Sep 17 00:00:00 2001 From: Tim Jacomb Date: Mon, 16 Sep 2024 16:59:59 +0100 Subject: [PATCH 11/11] Fix lint --- war/src/main/scss/components/_badges.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/war/src/main/scss/components/_badges.scss b/war/src/main/scss/components/_badges.scss index c2f3e4c8c609..45fc8b9dc803 100644 --- a/war/src/main/scss/components/_badges.scss +++ b/war/src/main/scss/components/_badges.scss @@ -8,7 +8,11 @@ min-height: 20px; min-width: 20px; padding: 0 0.4rem; - background: color-mix(in sRGB, var(--text-color-secondary) 12.5%, transparent); + background: color-mix( + in sRGB, + var(--text-color-secondary) 12.5%, + transparent + ); &[class*="color"] { background: color-mix(in sRGB, var(--color) 85%, transparent);