Fix spacing of some elements

janfaracik · Nov 18, 2021 · 0023d7e · 0023d7e
1 parent 5228845
commit 0023d7e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 91 deletions.
diff --git a/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly b/core/src/main/resources/hudson/model/AbstractProject/configure-common.jelly
@@ -28,39 +28,37 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/hudson/project" xmlns:this="this">
-  <div class="jenkins-section">
-    <p:config-disableBuild/>
-    <p:config-concurrentBuild />
+  <p:config-disableBuild/>
+  <p:config-concurrentBuild />
 
-    <j:set var="jdks" value="${app.JDKs}" />
-    <j:if test="${jdks.size() gt 1}">
-      <!-- if there's only one JDK configured, always use that. -->
-      <f:entry title="JDK"
-               description="${%JDK to be used for this project}">
-        <select class="jenkins-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
-          <j:getStatic var="DEFAULT_NAME" className="hudson.model.JDK" field="DEFAULT_NAME"/>
-          <option>${DEFAULT_NAME}</option>
-          <j:forEach var="inst" items="${jdks}">
-            <f:option selected="${inst.name==it.JDK.name}" value="${inst.name}">${inst.name}</f:option>
-          </j:forEach>
-        </select>
-      </f:entry>
-    </j:if>
+  <j:set var="jdks" value="${app.JDKs}" />
+  <j:if test="${jdks.size() gt 1}">
+    <!-- if there's only one JDK configured, always use that. -->
+    <f:entry title="JDK"
+             description="${%JDK to be used for this project}">
+      <select class="jenkins-input validated" name="jdk" checkUrl="'${rootURL}/defaultJDKCheck?value='+this.value">
+        <j:getStatic var="DEFAULT_NAME" className="hudson.model.JDK" field="DEFAULT_NAME"/>
+        <option>${DEFAULT_NAME}</option>
+        <j:forEach var="inst" items="${jdks}">
+          <f:option selected="${inst.name==it.JDK.name}" value="${inst.name}">${inst.name}</f:option>
+        </j:forEach>
+      </select>
+    </f:entry>
+  </j:if>
 
-    <p:config-assignedLabel />
+  <p:config-assignedLabel />
 
-    <f:advanced>
-      <p:config-quietPeriod />
-      <p:config-retryCount />
-      <p:config-blockWhenUpstreamBuilding />
-      <p:config-blockWhenDownstreamBuilding />
-      <st:include page="configure-advanced.jelly" optional="true" />
-      <f:entry title="${%Display Name}" field="displayNameOrNull">
-        <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
-      </f:entry>
-      <f:optionalBlock name="keepDependencies" checked="${it.keepDependencies}" title="${%Keep the build logs of dependencies}" help="/help/tasks/fingerprint/keepDependencies.html"/>
-    </f:advanced>
-  </div>
+  <f:advanced>
+    <p:config-quietPeriod />
+    <p:config-retryCount />
+    <p:config-blockWhenUpstreamBuilding />
+    <p:config-blockWhenDownstreamBuilding />
+    <st:include page="configure-advanced.jelly" optional="true" />
+    <f:entry title="${%Display Name}" field="displayNameOrNull">
+      <f:textbox checkUrl="'${rootURL}/checkDisplayName?displayName='+encodeURIComponent(this.value)+'&amp;jobName='+encodeURIComponent('${h.jsStringEscape(it.name)}')"/>
+    </f:entry>
+    <f:optionalBlock name="keepDependencies" checked="${it.keepDependencies}" title="${%Keep the build logs of dependencies}" help="/help/tasks/fingerprint/keepDependencies.html"/>
+  </f:advanced>
 
   <this:configure-scm/>
 </j:jelly>
diff --git a/core/src/main/resources/jenkins/model/OptionalJobProperty/config.jelly b/core/src/main/resources/jenkins/model/OptionalJobProperty/config.jelly
@@ -25,9 +25,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
-    <f:block>
-        <f:optionalBlock title="${descriptor.displayName}" name="specified" checked="${instance != null}" inline="true" help="${descriptor.helpFile}">
-            <st:include page="config-details" from="${descriptor}" class="${descriptor.clazz}"/>
-        </f:optionalBlock>
-    </f:block>
+    <f:optionalBlock title="${descriptor.displayName}" name="specified" checked="${instance != null}" inline="true" help="${descriptor.helpFile}">
+        <st:include page="config-details" from="${descriptor}" class="${descriptor.clazz}"/>
+    </f:optionalBlock>
 </j:jelly>
diff --git a/core/src/main/resources/lib/form/section.jelly b/core/src/main/resources/lib/form/section.jelly
@@ -39,7 +39,7 @@ THE SOFTWARE.
   <st:adjunct includes="lib.form.section_" />
 
   <f:rowSet name="${attrs.name}">
-    <div class="jenkins-section">
+    <div class="${attrs.title!=null ? 'jenkins-section' : ''}">
       <j:if test="${attrs.title!=null}">
         <div class="jenkins-section__title">
           ${title}

diff --git a/war/src/main/js/widgets/config/model/ConfigTableMetaData.js b/war/src/main/js/widgets/config/model/ConfigTableMetaData.js
@@ -54,14 +54,13 @@ function fromConfigTable(configTable) {
     // See the next block of code.
 
     if(!firstRow.hasClass('section-header-row')){
-      var td, tr;
+      var tr;
       if (configTable[0].nodeName === 'TR') {
         tr = 'tr';
-        td = 'td';
       } else {
-        tr = td = 'div';
+        tr = 'div';
       }
-      var generalRow = $('<'+tr+' class="section-header-row insert first tr" title="General"><'+td+' colspan="4"><div class="jenkins-section__header"><a class="section-anchor">#</a>General</div></+'+td+'></'+tr+'>');
+      var generalRow = $('<'+tr+' class="section-header-row insert first tr" title="General"><div class="jenkins-section__header"><a class="section-anchor">#</a>General</div></'+tr+'>');
       firstRow.before(generalRow);
       firstRow = configTableMetadata.getFirstRow();
       var newArray = $.makeArray(topRows);
@@ -112,7 +111,6 @@ function ConfigTableMetaData(configForm, configTable) {
 
 ConfigTableMetaData.prototype.getTopRows = function() {
     var topRows = this.configTableBody.find('tr, .tr');
-    topRows.addClass('config-table-top-row');
     return topRows;
 };
 

diff --git a/war/src/main/js/widgets/config/tabbar.less b/war/src/main/js/widgets/config/tabbar.less
@@ -142,56 +142,6 @@
         border-collapse: collapse;
       }
 
-      // Input elements
-      input[type='email'].setting-input,
-      input[type='password'].setting-input,
-      input[type='text'].setting-input {
-        height: var(--input-line-height);
-        line-height: var(--input-line-height);
-        padding: 0 5px;
-        .border-radius(@border-radius);
-      }
-
-      select:not([multiple]) {
-        height: var(--input-line-height);
-        line-height: var(--input-line-height);
-      }
-
-      select:not(.select-ajax-pending) {
-        border-radius: 0;
-        background: var(--brightest-bg-color);
-      }
-
-      // Bottom buttons
-      .bottom-sticker-edge {
-        display:none;
-      }
-      .bottom-sticker-inner{
-        padding: 20px 10px 25px 20px;
-        border-top-right-radius: 10px;
-        border: 1px solid var(--configure-job-bottom-sticker-border-color);
-        background: var(--configure-job-bottom-sticker-bg-color);
-      }
-
-      .bottom-sticker,
-      #bottom-sticker{
-        width: auto;
-        margin-left: -10px;
-        overflow: hidden;
-        padding-bottom: 10px;
-        margin: 30px 30px -25px -15px;
-        z-index:9;
-
-        .cover{
-          position:absolute;
-          top:0;
-          bottom:0;
-          left:0;
-          right:0;
-          z-index:2;
-        }
-      }
-
       p,
       .help,
       .setting-description {