Skip to content

Commit 9ea78cc

Browse files
authored
Remove old CSS variable fallbacks (#1061)
1 parent 2bdf863 commit 9ea78cc

File tree

6 files changed

+16
-49
lines changed

6 files changed

+16
-49
lines changed

src/main/frontend/common/components/status-icon.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,3 @@
2929
}
3030
}
3131
}
32-
33-
// TODO - can be removed when Jenkins >= 2.506
34-
.jenkins-\!-skipped-color {
35-
--color: var(--text-color-secondary);
36-
color: var(--color);
37-
}

src/main/frontend/pipeline-console-view/pipeline-console/main/console-log-card.scss

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,7 @@ a.console-line-number {
145145
margin-bottom: -0.375rem;
146146
margin-left: -0.375rem;
147147
margin-right: -0.375rem;
148-
// TODO - var fallback can removed after baseline is moved >= 2.496
149-
border-top: var(
150-
--jenkins-border,
151-
2px solid color-mix(in srgb, var(--text-color-secondary) 10%, transparent)
152-
);
148+
border-top: var(--jenkins-border);
153149
background-color: color-mix(in srgb, var(--accent-color) 2.5%, transparent);
154150
border-bottom-left-radius: 0.375rem;
155151
border-bottom-right-radius: 0.375rem;
@@ -183,8 +179,7 @@ div.console-output-line {
183179
var(--blue) 15%,
184180
transparent
185181
) !important;
186-
// TODO - var fallback can removed after baseline is moved >= 2.496
187-
border: var(--jenkins-border-width, 2px) solid
182+
border: var(--jenkins-border-width) solid
188183
color-mix(in srgb, var(--blue) 10%, transparent);
189184
opacity: 1;
190185
}
@@ -199,8 +194,7 @@ div.console-output-line {
199194
var(--text-color-secondary) 5%,
200195
transparent
201196
);
202-
// TODO - var fallback can removed after baseline is moved >= 2.496
203-
border: var(--jenkins-border-width, 2px) solid
197+
border: var(--jenkins-border-width) solid
204198
color-mix(in srgb, var(--text-color-secondary) 2.5%, transparent);
205199
border-radius: 0.375rem;
206200
opacity: 0;

src/main/frontend/pipeline-console-view/pipeline-console/main/data-tree-view.scss

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@ $pgv-item-padding-inline: 0.7rem;
1111
content: "";
1212
position: absolute;
1313
inset: 0;
14-
background: var(--input-color);
14+
background: var(--card-background);
15+
border: var(--card-border-width) solid var(--card-border-color);
1516
border-radius: var(--form-input-border-radius);
16-
// TODO - var fallback can removed after baseline is moved >= 2.496
17-
border: var(
18-
--jenkins-border,
19-
2px solid color-mix(in srgb, var(--text-color-secondary) 10%, transparent)
20-
);
2117
box-shadow: var(--form-input-glow);
2218
transition: var(--standard-transition);
2319
}
@@ -271,19 +267,13 @@ $pgv-item-padding-inline: 0.7rem;
271267
content: "";
272268
position: absolute;
273269
top: 0.375rem;
274-
// TODO - var fallback can removed after baseline is moved >= 2.496
275270
left: calc(
276-
$pgv-item-padding-inline + ($pgv-icon-size / 2) -
277-
(var(--jenkins-border-width, 2px) / 2)
271+
$pgv-item-padding-inline +
272+
($pgv-icon-size / 2) - var(--jenkins-border-width / 2)
278273
);
279274
bottom: 0.375rem;
280-
// TODO - var fallback can removed after baseline is moved >= 2.496
281-
background-color: var(
282-
--jenkins-border-color,
283-
color-mix(in srgb, var(--text-color-secondary) 25%, transparent)
284-
);
285-
// TODO - var fallback can removed after baseline is moved >= 2.496
286-
width: var(--jenkins-border-width, 2px);
275+
background-color: var(--jenkins-border-color);
276+
width: var(--jenkins-border-width);
287277
border-radius: var(--form-input-border-radius);
288278
}
289279
}

src/main/frontend/pipeline-console-view/pipeline-console/main/split-view.scss

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,10 @@
3333
&::after {
3434
content: "";
3535
position: absolute;
36-
// TODO - var fallback can removed after baseline is moved >= 2.496
37-
right: calc(50% - (var(--jenkins-border-width, 2px) / 2));
36+
right: calc(50% - (var(--jenkins-border-width) / 2));
3837
top: 0;
3938
bottom: 0;
40-
// TODO - var fallback can removed after baseline is moved >= 2.496
41-
width: var(--jenkins-border-width, 2px);
39+
width: var(--jenkins-border-width);
4240
border-radius: 5px;
4341
transition: var(--standard-transition);
4442
background-color: var(--text-color-secondary);
@@ -73,10 +71,8 @@
7371
right: 0;
7472
top: unset;
7573
width: unset;
76-
// TODO - var fallback can removed after baseline is moved >= 2.496
77-
bottom: calc(50% - (var(--jenkins-border-width, 2px) / 2));
78-
// TODO - var fallback can removed after baseline is moved >= 2.496
79-
height: var(--jenkins-border-width, 2px);
74+
bottom: calc(50% - (var(--jenkins-border-width) / 2));
75+
height: var(--jenkins-border-width);
8076
}
8177

8278
&:hover {

src/main/frontend/pipeline-console-view/pipeline-console/main/stage-details.scss

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
justify-content: space-between;
77
flex-wrap: wrap;
88
gap: 0 0.5rem;
9-
// TODO - var fallback can removed after baseline is moved >= 2.496
10-
padding: 0.125rem calc(1rem + var(--jenkins-border-width, 2px));
11-
padding-right: 0.7rem;
9+
padding: 0.125rem 0.7rem 0.125rem calc(1rem + var(--jenkins-border-width));
1210
border-radius: var(--form-input-border-radius);
1311
margin-bottom: 0.75rem;
1412
z-index: 101;
@@ -18,8 +16,7 @@
1816
position: absolute;
1917
inset: 0;
2018
background: oklch(from var(--bg-color) l c h / 0.075);
21-
// TODO - var fallback can removed after baseline is moved >= 2.496
22-
border: var(--jenkins-border-width, 2px) solid
19+
border: var(--jenkins-border-width) solid
2320
oklch(from var(--bg-color) l c h / 0.1);
2421
border-radius: inherit;
2522
transition: var(--standard-transition);

src/main/frontend/pipeline-console-view/pipeline-console/main/stage-steps.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22
display: flex;
33
flex-direction: column;
44
gap: 0.375rem;
5-
// TODO - var fallback can removed after baseline is moved >= 2.496
6-
border: var(
7-
--jenkins-border,
8-
2px solid color-mix(in srgb, var(--text-color-secondary) 10%, transparent)
9-
);
105
background: var(--card-background);
6+
border: var(--card-border-width) solid var(--card-border-color);
117
border-radius: var(--form-input-border-radius);
128
padding: 0.375rem;
139
}

0 commit comments

Comments
 (0)