Skip to content

Commit cd3b151

Browse files
authored
Adjust form label padding (jenkinsci#7962)
* Init * Update textarea.scss
1 parent 9d6f074 commit cd3b151

File tree

6 files changed

+21
-20
lines changed

6 files changed

+21
-20
lines changed

core/src/main/resources/lib/form/textarea.jelly

+4-5
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,13 @@ THE SOFTWARE.
108108
<j:if test="${attrs.previewEndpoint!=null and !readOnlyMode}">
109109
<div class="textarea-preview-container">
110110
<j:if test="${attrs.previewEndpoint == '/markupFormatter/previewDescription'}">
111-
[${app.markupFormatter.descriptor.displayName}]<st:nbsp/>
111+
${app.markupFormatter.descriptor.displayName}
112112
</j:if>
113113
<a href="#" class="textarea-show-preview" previewEndpoint="${attrs.previewEndpoint}">${%Preview}</a>
114-
<st:nbsp/>
115114
<a href="#" class="textarea-hide-preview">${%Hide preview}</a>
116-
<div class="textarea-preview">
117-
<!-- div for preview -->
118-
</div>
115+
</div>
116+
<div class="textarea-preview">
117+
<!-- div for preview -->
119118
</div>
120119
</j:if>
121120
</j:jelly>

core/src/main/resources/lib/form/textarea/textarea.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Behaviour.specify(
3939
"textarea",
4040
100,
4141
function (e) {
42-
var previewDiv = e.querySelector(".textarea-preview");
42+
var previewDiv = e.nextSibling;
4343
var showPreview = e.querySelector(".textarea-show-preview");
4444
var hidePreview = e.querySelector(".textarea-hide-preview");
4545
hidePreview.style.display = "none";

war/src/main/scss/base/style.scss

-12
Original file line numberDiff line numberDiff line change
@@ -1223,18 +1223,6 @@ table.progress-bar.red td.progress-bar-done {
12231223
font-size: 1.9em;
12241224
}
12251225

1226-
/* ========================= textarea.jelly ================== */
1227-
1228-
.textarea-preview-container {
1229-
text-align: left;
1230-
}
1231-
1232-
.textarea-preview {
1233-
background-color: var(--very-light-grey);
1234-
padding: 0.5em;
1235-
border-radius: 10px;
1236-
}
1237-
12381226
/* ========================= logRecords.jelly ================== */
12391227

12401228
.logrecord-container {

war/src/main/scss/form/layout.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
align-items: center;
4545
font-weight: var(--form-label-font-weight);
4646
margin-top: 0;
47-
margin-bottom: 0.75rem;
47+
margin-bottom: 0.5rem;
4848
padding-inline-start: 0;
4949
padding-inline-end: 0;
5050
}
5151

5252
.jenkins-form-description {
5353
display: block;
5454
// Tweaked margin so that it appears visually centred when placed next to `.jenkins-form-label`
55-
margin: -0.2rem 0 0.8rem;
55+
margin: -0.2rem 0 0.5rem;
5656
color: var(--text-color-secondary);
5757
line-height: 1.66;
5858
}

war/src/main/scss/form/textarea.scss

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
.textarea-preview-container {
2+
display: flex;
3+
gap: 0.5rem;
4+
margin-top: 0.5rem;
5+
color: var(--text-color-secondary);
6+
}
7+
8+
.textarea-preview {
9+
background-color: var(--very-light-grey);
10+
padding: var(--form-input-padding);
11+
margin-top: 0.5rem;
12+
border-radius: 10px;
13+
}

war/src/main/scss/styles.scss

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
@use "./form/reorderable-list";
1717
@use "./form/search-bar";
1818
@use "./form/select";
19+
@use "./form/textarea";
1920
@use "./form/toggle-switch";
2021
@use "./form/validation";
2122
@use "./modules/app-bar";

0 commit comments

Comments
 (0)