Skip to content

Commit 0bdcab0

Browse files
committed
Init
1 parent db744cc commit 0bdcab0

File tree

14 files changed

+72
-48
lines changed

14 files changed

+72
-48
lines changed

core/src/main/resources/lib/layout/search-bar.jelly

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ THE SOFTWARE.
4848
</div>
4949
<input value="${attrs.value}"
5050
id="${attrs.id}"
51-
class="jenkins-search__input"
51+
class="jenkins-input jenkins-search__input"
5252
placeholder="${attrs.placeholder ?: '%Search'}"
5353
type="search"
5454
autofocus="${attrs.autofocus == 'true' ? 'true' : null}"

src/main/scss/abstracts/_mixins.scss

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575

7676
&::before {
7777
background-color: transparent;
78+
border: var(--jenkins-border);
7879
}
7980

8081
&::after {

src/main/scss/abstracts/_theme.scss

+11-1
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,16 @@ $semantics: (
169169
--btn-link-color--active: var(--primary-active);
170170
--btn-link-bg--active: var(--light-grey);
171171

172+
173+
--jenkins-border-width: 1.5px;
174+
--jenkins-border: var(--jenkins-border-width) solid color-mix(in srgb, currentColor 1%, transparent);
175+
//--jenkins-border: var(--jenkins-border-width) solid var(--red);
176+
// hsla(240, 25%, 75%, 0.25)
177+
178+
@media (prefers-contrast: more) {
179+
--jenkins-border: var(--jenkins-border-width) solid currentColor;
180+
}
181+
172182
// Table
173183
--table-background: var(--panel-header-bg-color);
174184
--table-header-foreground: var(--text-color);
@@ -260,7 +270,7 @@ $semantics: (
260270
--card-border-color: hsla(240, 25%, 75%, 0.25);
261271
--card-border-color--hover: hsla(240, 25%, 75%, 0.5);
262272
--card-border-color--active: hsla(240, 25%, 75%, 0.75);
263-
--card-border-width: 2px;
273+
--card-border-width: var(--jenkins-border-width);
264274

265275
// Tab bar
266276
--tabs-background: var(--panel-header-bg-color);

src/main/scss/components/_alert.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
font-size: var(--font-size-sm);
44
padding: 15px;
55
margin-bottom: 20px;
6-
border: 1px solid transparent;
6+
border: var(--jenkins-border-width) solid transparent;
77
border-radius: 10px;
88

99
strong {

src/main/scss/components/_buttons.scss

+6
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
&::before {
8080
background: transparent;
8181
}
82+
83+
&:not(:hover, &:active, &:focus) {
84+
&::before {
85+
border-color: transparent;
86+
}
87+
}
8288
}
8389

8490
// Support for custom colors

src/main/scss/components/_side-panel-tasks.scss

+6
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,10 @@ $background-outset: 0.7rem;
116116
box-shadow: none !important;
117117
}
118118
}
119+
120+
&:not(:hover, &:active, &:focus, &--active) {
121+
&::before {
122+
border-color: transparent;
123+
}
124+
}
119125
}

src/main/scss/components/_table.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
position: relative;
77
width: 100%;
88
background: var(--table-background);
9-
border-radius: calc(var(--table-border-radius) + 4px);
10-
border: 4px solid var(--table-background);
11-
border-bottom-width: 2px;
12-
border-spacing: 0 2px;
9+
border-radius: calc(var(--table-border-radius) + (var(--card-border-width) * 2));
10+
border: calc(var(--card-border-width) * 2) solid var(--table-background);
11+
border-bottom-width: var(--card-border-width);
12+
border-spacing: 0 var(--card-border-width);
1313
background-clip: padding-box;
1414
margin-bottom: var(--section-padding);
1515

src/main/scss/components/_tooltips.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
position: absolute;
3838
inset: 0;
3939
border-radius: 0.375rem;
40-
border: 0.1rem solid var(--text-color-secondary);
40+
border: var(--jenkins-border-width) solid var(--text-color-secondary);
4141
opacity: 0.3;
4242
mask-image: linear-gradient(
4343
-45deg,
@@ -102,8 +102,8 @@
102102
position: absolute;
103103
inset: 0;
104104
border-radius: 0.375rem;
105-
border: 0.1rem solid var(--text-color-secondary);
106-
opacity: 0.3;
105+
border: var(--jenkins-border-width) solid var(--text-color-secondary);
106+
opacity: 0.2;
107107
}
108108

109109
svg {

src/main/scss/form/_checkbox.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
margin-right: 11px;
140140
box-shadow:
141141
0 0 0 10px transparent,
142-
inset 0 0 0 2px var(--input-border);
142+
inset 0 0 0 var(--jenkins-border-width) var(--input-border);
143143
background: var(--input-color);
144144
}
145145

src/main/scss/form/_codemirror.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.CodeMirror {
22
display: block;
33
background: var(--input-color);
4-
border: 2px solid var(--input-border);
4+
border: var(--jenkins-border-width) solid var(--input-border);
55
border-radius: var(--form-input-border-radius);
66
width: 100%;
77
box-shadow: var(--form-input-glow);

src/main/scss/form/_input.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.jenkins-input {
22
display: block;
33
background: var(--input-color);
4-
border: 2px solid var(--input-border);
4+
border: var(--jenkins-border-width) solid var(--input-border);
55
padding: var(--form-input-padding);
66
border-radius: var(--form-input-border-radius);
77
width: 100%;

src/main/scss/form/_radio.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$jenkins-radio-size: 1.375rem;
2-
$jenkins-radio-border-size: 0.125rem;
2+
$jenkins-radio-border-size: 1.5px;
33
$jenkins-radio-border-hover-size: 0.3125rem;
44
$jenkins-radio-border-active-size: 0.5rem;
55
$jenkins-radio-border-checked-size: 0.4rem;

src/main/scss/form/_search-bar.scss

+33-32
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@
88
position: relative;
99

1010
&__input {
11-
appearance: none;
12-
background: var(--item-background--hover);
13-
border: none;
14-
outline: none;
15-
border-radius: 0.625rem;
16-
width: 100%;
17-
margin: 0;
18-
padding: 0 0.5rem 0 var(--search-bar-height);
11+
//appearance: none;
12+
////background: var(--item-background--hover);
13+
////border: none;
14+
//outline: none;
15+
//border-radius: 0.625rem;
16+
//border: var(--jenkins-border-width) solid var(--input-border);
17+
//width: 100%;
18+
//margin: 0;
19+
padding: 0 0.5rem 0 34px;
1920
line-height: 1;
20-
box-shadow:
21-
0 0 0 2px transparent,
22-
0 0 0 12px transparent;
23-
transition: var(--standard-transition);
21+
//box-shadow:
22+
// 0 0 0 2px transparent,
23+
// 0 0 0 12px transparent;
24+
//transition: var(--standard-transition);
2425
height: var(--search-bar-height);
2526

2627
&::placeholder {
@@ -58,17 +59,17 @@
5859
}
5960

6061
&:not(:disabled) {
61-
&:hover {
62-
background: var(--item-background--active);
63-
}
62+
//&:hover {
63+
// background: var(--item-background--active);
64+
//}
6465

6566
&:active,
6667
&:focus {
67-
outline: none;
68-
background: var(--item-background--active);
69-
box-shadow:
70-
0 0 0 2px var(--focus-input-border),
71-
0 0 0 7px var(--focus-input-glow);
68+
//outline: none;
69+
////background: var(--item-background--active);
70+
//box-shadow:
71+
// 0 0 0 2px var(--focus-input-border),
72+
// 0 0 0 7px var(--focus-input-glow);
7273

7374
&::-webkit-search-cancel-button {
7475
opacity: 0.5;
@@ -80,11 +81,11 @@
8081

8182
&:active,
8283
&:focus {
83-
outline: none;
84-
background: var(--item-background--active);
85-
box-shadow:
86-
0 0 0 2px var(--focus-input-border),
87-
0 0 0 7px var(--focus-input-glow);
84+
//outline: none;
85+
//background: var(--item-background--active);
86+
//box-shadow:
87+
// 0 0 0 2px var(--focus-input-border),
88+
// 0 0 0 7px var(--focus-input-glow);
8889

8990
&::-webkit-search-cancel-button {
9091
opacity: 1;
@@ -93,9 +94,9 @@
9394
}
9495
}
9596

96-
&:disabled {
97-
cursor: not-allowed;
98-
}
97+
//&:disabled {
98+
// cursor: not-allowed;
99+
//}
99100
}
100101

101102
&__icon {
@@ -108,10 +109,10 @@
108109
pointer-events: none;
109110

110111
svg {
111-
width: 45%;
112-
height: 45%;
113-
max-width: 1.1rem;
114-
max-height: 1.1rem;
112+
width: 1rem;
113+
height: 1rem;
114+
max-width: 1rem;
115+
max-height: 1rem;
115116
grid-column-start: 1;
116117
grid-row-start: 1;
117118
place-self: center center;

src/main/scss/form/_select.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
&__input {
2121
appearance: none;
2222
display: block;
23-
border: 2px solid var(--input-border);
23+
border: var(--jenkins-border-width) solid var(--input-border);
2424
padding: var(--form-input-padding);
2525
width: 100% !important; // TODO remove important after https://github.com/jenkinsci/credentials-plugin/pull/255
2626
max-width: 100% !important; // TODO remove important after https://github.com/jenkinsci/credentials-plugin/pull/255
@@ -49,7 +49,7 @@
4949
.jenkins-multi-select {
5050
position: relative;
5151
width: 100%;
52-
border: 2px solid var(--input-border);
52+
border: var(--jenkins-border-width) solid var(--input-border);
5353
border-radius: var(--form-input-border-radius);
5454
box-shadow: 0 0 0 10px transparent;
5555
transition: var(--standard-transition);

0 commit comments

Comments
 (0)