Skip to content

Commit e38e35c

Browse files
authored
Refine header, app bar, and side panel alignment (#10806)
2 parents be395d4 + 68cd238 commit e38e35c

File tree

4 files changed

+68
-63
lines changed

4 files changed

+68
-63
lines changed

core/src/main/resources/lib/layout/skeleton/skeleton.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@
6969
gap: 0.125rem;
7070

7171
& > div {
72-
margin: 0 -0.7rem;
72+
margin: 0 0 0 -0.5rem;
73+
74+
&:not(:first-of-type) {
75+
opacity: 0.5;
76+
}
7377
}
7478
}
7579

src/main/scss/components/_app-bar.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
h1,
8181
h2 {
8282
margin: 0;
83-
font-size: 1.5rem;
83+
font-size: 1.3125rem;
8484
}
8585

8686
&__subtitle {
@@ -94,19 +94,20 @@
9494
flex-direction: row !important;
9595
align-items: center;
9696
justify-content: start !important;
97-
gap: 1rem;
97+
gap: 0.875rem;
9898
max-width: 1200px;
99-
overflow: hidden;
10099
text-overflow: ellipsis;
101100

102101
svg {
103102
width: 2rem !important;
104103
height: 2rem !important;
104+
margin-left: -0.1875rem;
105105
}
106106

107107
img {
108108
width: 2.375rem;
109109
height: 2.375rem;
110+
margin-left: -0.375rem;
110111
}
111112
}
112113

src/main/scss/components/_page-header.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
align-items: center;
4949
justify-content: center;
5050
align-self: center;
51-
gap: 1rem;
51+
gap: 0.875rem;
5252
color: var(--header-color);
5353
transition: opacity var(--standard-transition);
5454

@@ -79,8 +79,7 @@
7979
}
8080

8181
#jenkins-head-icon {
82-
height: 2.125rem;
83-
margin-left: 0.15rem;
82+
width: 1.625rem;
8483
}
8584
}
8685

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

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@use "../abstracts/mixins";
22
@use "../base/breakpoints";
33

4-
$background-outset: 0.7rem;
4+
$background-outset: 0.5rem;
55

66
#tasks,
77
.tasks,
@@ -32,83 +32,84 @@ $background-outset: 0.7rem;
3232
}
3333

3434
& > #tasks > .jenkins-search-container {
35-
margin: 0 #{-$background-outset} 1rem;
35+
margin: 0 0 1rem #{-$background-outset};
3636

3737
.jenkins-search__icon {
38-
width: 2.8rem;
38+
width: 2.625rem;
3939
aspect-ratio: unset;
4040
}
4141

4242
.jenkins-search__input {
43-
padding-left: 2.6rem;
43+
padding-left: 2.5rem;
4444
}
4545
}
4646
}
4747

48+
#tasks .task {
49+
margin: 0 0 0 calc($background-outset * -1);
50+
}
51+
4852
#tasks,
4953
.tasks {
50-
.task {
51-
margin: 0 calc($background-outset * -1);
52-
53-
.task-link {
54-
@include mixins.item;
55-
56-
display: flex;
57-
align-items: center;
58-
justify-content: flex-start;
59-
padding: 0.5rem $background-outset;
60-
gap: 0.65rem;
61-
width: 100%;
62-
font-size: var(--font-size-sm);
63-
color: var(--text-color);
64-
margin: 0;
65-
transition: opacity var(--standard-transition);
66-
67-
.task-icon-link {
68-
display: inline-flex;
69-
70-
svg,
71-
img {
72-
width: 1.375rem !important;
73-
height: 1.375rem !important;
74-
color: var(--text-color);
75-
76-
* {
77-
transition: stroke-width var(--standard-transition);
78-
}
54+
.task .task-link {
55+
@include mixins.item;
56+
57+
display: flex;
58+
align-items: center;
59+
justify-content: flex-start;
60+
padding: 0.5rem 0.6875rem;
61+
gap: 0.625rem;
62+
width: 100%;
63+
font-size: var(--font-size-sm);
64+
color: var(--text-color);
65+
margin: 0;
66+
transition: opacity var(--standard-transition);
67+
min-height: 2.375rem;
68+
69+
.task-icon-link {
70+
display: inline-flex;
71+
72+
svg,
73+
img {
74+
width: 1.25rem !important;
75+
height: 1.25rem !important;
76+
color: var(--text-color);
77+
78+
* {
79+
transition: stroke-width var(--standard-transition);
7980
}
8081
}
82+
}
8183

82-
.task-icon-badge {
83-
margin-left: auto;
84-
}
84+
.task-icon-badge {
85+
margin-left: auto;
86+
}
8587

86-
.task-link-text {
87-
display: contents;
88-
word-break: word-break;
89-
}
88+
.task-link-text {
89+
display: contents;
90+
word-break: word-break;
91+
}
9092

91-
&--active {
92-
font-weight: 450;
93-
cursor: default;
93+
&--active {
94+
font-weight: var(--font-bold-weight);
95+
cursor: default;
9496

95-
svg * {
96-
stroke-width: 35px;
97-
}
97+
svg * {
98+
stroke-width: 35px;
99+
}
98100

99-
&::before {
100-
background-color: var(--item-background--active) !important;
101-
}
101+
&::before {
102+
background-color: var(--item-background--active) !important;
103+
}
102104

103-
&::after {
104-
box-shadow: none !important;
105-
}
105+
&::after {
106+
box-shadow: none !important;
106107
}
108+
}
107109

108-
&:not(:hover, &:active, &:focus, &--active) {
109-
&::before {
110-
border-color: transparent;
111-
}
110+
&:not(:hover, &:active, &:focus, &--active) {
111+
&::before {
112+
border-color: transparent;
112113
}
113114
}
114115
}

0 commit comments

Comments
 (0)