Skip to content

Commit a103b79

Browse files
silverwindGiteaBot
andauthored
Rework label colors (#24790)
Introduce `--color-label-fg`, `--color-label-bg` and `--color-label-hover-bg`, decoupling the label styles from other color variables. I've set the colors so that non-interactive labels like on tabs are dark-on-light on light theme, which imho looks better than previous light-on-dark. In the screenshot below, the leftmost label has hover, the second one has active. <img width="786" alt="Screenshot 2023-05-18 at 12 48 26" src="https://github.com/go-gitea/gitea/assets/115237/d989bb68-504a-4406-b5f6-419ed9609f90"> <img width="789" alt="Screenshot 2023-05-18 at 13 04 07" src="https://github.com/go-gitea/gitea/assets/115237/689a281a-a2b7-45e8-a5ee-dafb7a35e105"> --------- Co-authored-by: Giteabot <[email protected]>
1 parent acde12a commit a103b79

File tree

2 files changed

+29
-21
lines changed

2 files changed

+29
-21
lines changed

web_src/css/base.css

+23-20
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,13 @@
180180
--color-caret: var(--color-text-dark);
181181
--color-reaction-bg: #0000000a;
182182
--color-reaction-active-bg: var(--color-primary-alpha-20);
183-
--color-tooltip-bg: #000000f0;
184183
--color-tooltip-text: #ffffff;
184+
--color-tooltip-bg: #000000f0;
185185
--color-header-bar: #ffffff;
186-
--color-label-active-bg: #d0d0d0;
186+
--color-label-text: #232323;
187+
--color-label-bg: #cacaca5b;
188+
--color-label-hover-bg: #cacacaa0;
189+
--color-label-active-bg: #cacacaff;
187190
--color-accent: var(--color-primary-light-1);
188191
--color-small-accent: var(--color-primary-light-6);
189192
--color-active-line: #fffbdd;
@@ -820,16 +823,6 @@ a.label,
820823
margin-right: 0.35em;
821824
}
822825

823-
.ui.menu .item > .label {
824-
background: var(--color-grey);
825-
}
826-
827-
.ui.active.label {
828-
background: var(--color-label-active-bg);
829-
border-color: var(--color-label-active-bg);
830-
color: var(--color-text-dark);
831-
}
832-
833826
.ui.menu .dropdown.item:hover,
834827
.ui.menu a.item:hover {
835828
color: var(--color-text);
@@ -1976,22 +1969,32 @@ i.icon.centerlock {
19761969

19771970
.ui.label {
19781971
padding: 0.3em 0.5em;
1979-
background: var(--color-light);
1980-
color: var(--color-text-light);
1972+
}
1973+
1974+
.ui.label,
1975+
.ui.menu .item > .label {
1976+
background: var(--color-label-bg);
1977+
color: var(--color-label-text);
1978+
}
1979+
1980+
.ui.active.label {
1981+
background: var(--color-label-active-bg);
1982+
border-color: var(--color-label-active-bg);
1983+
color: var(--color-label-text);
19811984
}
19821985

19831986
.ui.labels a.label:hover,
19841987
a.ui.label:hover {
1985-
background: var(--color-hover);
1986-
border-color: var(--color-hover);
1987-
color: var(--color-text);
1988+
background: var(--color-label-hover-bg);
1989+
border-color: var(--color-label-hover-bg);
1990+
color: var(--color-label-text);
19881991
}
19891992

19901993
.ui.labels a.active.label:hover,
19911994
a.ui.active.label:hover {
1992-
background: var(--color-active);
1993-
border-color: var(--color-active);
1994-
color: var(--color-text);
1995+
background: var(--color-label-active-bg);
1996+
border-color: var(--color-label-active-bg);
1997+
color: var(--color-label-text);
19951998
}
19961999

19972000
.ui.label > .detail .icons {

web_src/css/themes/theme-arc-green.css

+6-1
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,13 @@
165165
--color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */
166166
--color-reaction-bg: #ffffff12;
167167
--color-reaction-active-bg: var(--color-primary-alpha-40);
168+
--color-tooltip-text: #ffffff;
169+
--color-tooltip-bg: #000000f0;
168170
--color-header-bar: #2e323e;
169-
--color-label-active-bg: #4c525e;
171+
--color-label-text: #dfe3ec;
172+
--color-label-bg: #7c84974b;
173+
--color-label-hover-bg: #7c8497a0;
174+
--color-label-active-bg: #7c8497ff;
170175
--color-accent: var(--color-primary-light-1);
171176
--color-small-accent: var(--color-primary-light-5);
172177
--color-active-line: #534d1b;

0 commit comments

Comments
 (0)