From ac1b0969aa6934718549726c271c180d767b372f Mon Sep 17 00:00:00 2001 From: Jan Faracik <43062514+janfaracik@users.noreply.github.com> Date: Sat, 6 Nov 2021 11:56:20 +0000 Subject: [PATCH] Cleanup --- .../LegacySecurityRealm/config.groovy | 4 +++- .../config/model/ConfigTableMetaData.js | 2 +- war/src/main/less/modules/form.less | 2 +- war/src/main/less/modules/section.less | 23 +++++++------------ 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy b/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy index 9c017edda7d4..1d0d2eb4d9cb 100644 --- a/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy +++ b/core/src/main/resources/hudson/security/LegacySecurityRealm/config.groovy @@ -7,7 +7,9 @@ import jenkins.model.Jenkins def f = namespace(lib.FormTagLib) f.entry(title: _('Unprotected URLs')) { - p(_('blurb')) + p(class: "jenkins-form-description") { + _('blurb') + } ul { for (def action : Jenkins.get().getActions().sort { x, y -> x.getUrlName() <=> y.getUrlName() }) { if (action instanceof UnprotectedRootAction) { diff --git a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js index 42cfbbad65dd..832572536824 100644 --- a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js +++ b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js @@ -26,7 +26,7 @@ function closestTR(node) { function fromConfigTable(configTable) { var $ = getJQuery(); - var sectionHeaders = $('.jenkins-section__header', configTable); + var sectionHeaders = $('.jenkins-section__title', configTable); var configForm = markConfigTableParentForm(configTable); // Mark the ancestor s of the section headers and add a title diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less index 62f477582b91..0611bfde798f 100644 --- a/war/src/main/less/modules/form.less +++ b/war/src/main/less/modules/form.less @@ -222,7 +222,7 @@ &::after { content: ""; position: absolute; - top: 14px; + top: 13px; right: 15px; width: 8px; height: 8px; diff --git a/war/src/main/less/modules/section.less b/war/src/main/less/modules/section.less index c94f353ea9fc..32b747e1bd33 100644 --- a/war/src/main/less/modules/section.less +++ b/war/src/main/less/modules/section.less @@ -1,6 +1,10 @@ +:root { + --section-padding: 2rem; +} + .jenkins-section { border-top: 2px solid var(--panel-border-color); - padding: calc(2rem) 0; + padding: var(--section-padding) 0; max-width: 1800px; &:first-of-type { @@ -17,19 +21,8 @@ } } -.jenkins-section__header { - font-weight: 600; - font-size: 1.25rem; - line-height: 1.2; - border-bottom: 1px solid #e0e0e0; - margin-bottom: 0.75rem; - margin-top: 1.5rem; - padding-bottom: 3px; - max-width: var(--form-item-max-width); -} - .jenkins-section__title { - margin: 0 0 calc(2rem) 0; + margin: 0 0 var(--section-padding) 0; font-size: 1rem; font-weight: 700; } @@ -37,7 +30,7 @@ .jenkins-section__items { display: grid; grid-template-columns: 1fr; - grid-gap: 2rem; + grid-gap: var(--section-padding); @media screen and (min-width: 800px) { grid-template-columns: 1fr 1fr; @@ -59,7 +52,7 @@ text-decoration: none; // IE11 doesn't support grid-gap, so apply margin, remove it for modern browsers - margin: 0 2rem 2rem 0; + margin: 0 var(--section-padding) var(--section-padding) 0; @supports (grid-gap: 2rem) { margin: 0; }