diff --git a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly index 276ecde22964..c9c9179303b5 100644 --- a/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly +++ b/core/src/main/resources/hudson/diagnosis/OldDataMonitor/manage.jelly @@ -28,42 +28,58 @@ THE SOFTWARE.

${%Manage Old Data}

-

${%blurb.1}

-

${%blurb.2}

- - - - - - - - - - - +

${%blurb.1}

+

${%blurb.2}

+ +

${%TODO} ${it.data.size()}

+ + +
${%Type}${%Name}${%Version}${%Error}
+ - - - - - + + + + - - - - - - -
${obj.class.name}${obj.fullName?:obj.fullDisplayName?:obj.displayName?:obj.name} - - - ${item.value} - - - ${item.value} - - - ${item.value.extra}${%Type}${%Name}${%Version}${%Error}
+ + + + + + + + ${obj.class.name} + + ${obj.fullName?:obj.fullDisplayName?:obj.displayName?:obj.name} + + + + ${item.value} + + + ${item.value} + + + + ${item.value.extra} + + + + + + + + + + + +

${%No old data was found.}

+
+ + +

${%TODO Version stuff?} ${it.data.size()}

+ @@ -83,31 +99,35 @@ THE SOFTWARE. - ${%No old data was found.} +

${%No old data was found.}

+ -

${%Unreadable Data}

-

${%blurb.6}

- - +

${%blurb.6}

+
+ + - - - - - - - - - - - + + + + + + + + + + + + + +
${%Type} ${%Name} ${%Error}
${obj.class.name}${obj.fullName?:obj.fullDisplayName?:obj.displayName?:obj.name}${item.value.extra}
${obj.class.name}${obj.fullName?:obj.fullDisplayName?:obj.displayName?:obj.name}${item.value.extra}
-
+
diff --git a/war/src/main/less/base/typography.less b/war/src/main/less/base/typography.less index e1d0c754babd..c6cea98695d7 100644 --- a/war/src/main/less/base/typography.less +++ b/war/src/main/less/base/typography.less @@ -51,24 +51,8 @@ h6, line-height: var(--line-height-heading); font-weight: bold; display: block; - margin-top: 0.5rem; - margin-bottom: 0.5rem; -} - -h1, -.h1, -h2, -.h2, -h3, -.h3, -h4, -.h4, -h5, -.h5, -h6, -.h6 { margin-top: 0; - margin-bottom: 2rem; + margin-bottom: var(--section-padding); } h1, diff --git a/war/src/main/less/modules/app-bar.less b/war/src/main/less/modules/app-bar.less index 3469d31e25d1..dba61ad8aab5 100644 --- a/war/src/main/less/modules/app-bar.less +++ b/war/src/main/less/modules/app-bar.less @@ -2,7 +2,7 @@ display: flex; align-items: center; justify-content: space-between; - margin-bottom: 2rem; + margin-bottom: var(--section-padding); .jenkins-app-bar__content { display: flex; @@ -16,7 +16,7 @@ display: flex; align-items: center; justify-content: center; - margin-left: 2rem; + margin-left: var(--section-padding); min-height: 36px; .jenkins-search { @@ -25,8 +25,8 @@ } &--border { - margin-bottom: 2rem; - padding-bottom: 2rem; + margin-bottom: var(--section-padding); + padding-bottom: var(--section-padding); border-bottom: 2px solid var(--panel-border-color); } diff --git a/war/src/main/less/modules/table.less b/war/src/main/less/modules/table.less index ea50d2b716a2..65aff30aa69c 100644 --- a/war/src/main/less/modules/table.less +++ b/war/src/main/less/modules/table.less @@ -5,7 +5,7 @@ border-radius: 6px; overflow: hidden; box-shadow: 0 0 0 5px var(--table-background); - margin: 5px; + margin: 5px 5px calc(var(--section-padding) + 5px); --table-padding: 0.55rem; * {