Skip to content

Commit 28150ef

Browse files
fix margin-bottom of jenkins-form-item (#385)
Co-authored-by: Kris Stern <krisstern@outlook.com>
1 parent 5601ba3 commit 28150ef

File tree

3 files changed

+18
-28
lines changed

3 files changed

+18
-28
lines changed

src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -104,32 +104,15 @@
104104
<div class="jenkins-dialog__title">Order your ice cream</div>
105105
<div class="jenkins-dialog__contents">
106106
<div width="100%">
107-
<div class="jenkins-form-item tr ">
108-
<div class="jenkins-form-label help-sibling">Name</div>
109-
<div class="setting-main">
110-
<input name="name" placeholder="" type="text" class="jenkins-input " value=""/>
111-
</div>
112-
<div class="validation-error-area"></div>
113-
</div>
114-
<div class="jenkins-form-item tr ">
115-
<div class="jenkins-form-label help-sibling">Quantity</div>
116-
<div class="setting-main">
117-
<input min="1" max="9" name="quantity" type="number" class="jenkins-input " value="1"/>
118-
</div>
119-
<div class="validation-error-area"></div>
120-
</div>
121-
<div class="jenkins-form-item tr ">
122-
<div class="jenkins-form-label help-sibling">Choose flavor</div>
123-
<div class="setting-main">
124-
<div class="jenkins-select">
125-
<select
126-
fillurl="${rootURL}/descriptorByName/io.jenkins.plugins.designlibrary.Dialogs/fillFlavorItems"
127-
name="_.flavor" class="jenkins-select__input select" value="">
128-
</select>
129-
</div>
130-
</div>
131-
<div class="validation-error-area"></div>
132-
</div>
107+
<f:entry title="${%Name}">
108+
<f:textbox name="name"/>
109+
</f:entry>
110+
<f:entry title="${%Quantity}">
111+
<f:number name="quantity" min="1" max="9"/>
112+
</f:entry>
113+
<f:entry title="${%Choose flavor}" class="jdl-dialog-form--last">
114+
<f:select field="flavor"/>
115+
</f:entry>
133116
</div>
134117
<div class="jenkins-buttons-row jenkins-buttons-row--equal-width jenkins-dialog__buttons">
135118
<button data-id="ok" type="submit" class="jenkins-button jenkins-button--primary ">Order</button>

src/main/resources/scss/components/_component-sample.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,13 @@
3535
}
3636

3737
.jenkins-form-item, .jenkins-search-container {
38-
margin-bottom: 0;
3938
min-width: 300px;
4039
}
4140

41+
:nth-last-child(1 of .jenkins-form-item) {
42+
margin-bottom: 0;
43+
}
44+
4245
.repeated-container {
4346
min-width: 600px;
4447
}
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
#toggle-switch-formsubmit {
22
width: 100%;
3-
}
3+
}
4+
5+
.jdl-dialog-form--last {
6+
margin-bottom: var(--section-padding) !important;
7+
}

0 commit comments

Comments
 (0)