Skip to content

Commit ee21d54

Browse files
authored
Move all remaining colors into CSS variables (#21903)
This should eliminate all non-variable color usage in the styles, making gitea fully themeable via CSS variables. Also, it adds a linter to enforce variables for colors.
1 parent 68e934a commit ee21d54

8 files changed

+199
-43
lines changed

.stylelintrc.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
extends: stylelint-config-standard
22

3+
plugins:
4+
- stylelint-declaration-strict-value
5+
36
overrides:
47
- files: ["**/*.less"]
58
customSyntax: postcss-less
9+
- files: ["**/*.less"]
10+
rules:
11+
scale-unlimited/declaration-strict-value: [color, {
12+
ignoreValues: /^(inherit|transparent|unset|initial)$/
13+
}]
14+
- files: ["**/chroma/*", "**/codemirror/*", "**/standalone/*", "**/console/*"]
15+
rules:
16+
scale-unlimited/declaration-strict-value: null
617

718
rules:
819
alpha-value-notation: null

package-lock.json

Lines changed: 120 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
"postcss-less": "6.0.0",
6666
"stylelint": "14.15.0",
6767
"stylelint-config-standard": "29.0.0",
68+
"stylelint-declaration-strict-value": "1.9.1",
6869
"svgo": "3.0.2",
6970
"updates": "13.2.1",
7071
"vitest": "0.25.2"

web_src/less/_base.less

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,20 @@
118118
--color-info-border: #a9d5de;
119119
--color-info-bg: #f8ffff;
120120
--color-info-text: #276f86;
121+
--color-red-badge: #db2828;
122+
--color-red-badge-bg: #db28281a;
123+
--color-red-badge-hover-bg: #db28284d;
124+
--color-green-badge: #21ba45;
125+
--color-green-badge-bg: #21ba451a;
126+
--color-green-badge-hover-bg: #21ba454d;
127+
--color-yellow-badge: #fbbd08;
128+
--color-yellow-badge-bg: #fbbd081a;
129+
--color-yellow-badge-hover-bg: #fbbd084d;
130+
--color-orange-badge: #f2711c;
131+
--color-orange-badge-bg: #f2711c1a;
132+
--color-orange-badge-hover-bg: #f2711c4d;
133+
--color-git: #f05133;
134+
/* target-based colors */
121135
--color-body: #ffffff;
122136
--color-text-dark: #080808;
123137
--color-text: #212121;
@@ -1196,11 +1210,7 @@ a.ui.card:hover,
11961210
}
11971211

11981212
.searchbox {
1199-
background-color: #f4f4f4 !important;
1200-
1201-
&:focus {
1202-
background-color: #e9e9e9 !important;
1203-
}
1213+
background-color: var(--color-input-background) !important;
12041214
}
12051215

12061216
.text .svg {
@@ -1932,7 +1942,7 @@ footer {
19321942
}
19331943

19341944
.archived-icon {
1935-
color: lighten(#000000, 70%) !important;
1945+
color: var(--color-secondary-dark-2) !important;
19361946
}
19371947

19381948
.oauth2-authorize-application-box {
@@ -2085,7 +2095,7 @@ a.ui.label:hover {
20852095
.lines-commit {
20862096
&:extend(.unselectable);
20872097
vertical-align: top;
2088-
color: #999999;
2098+
color: var(--color-grey);
20892099
padding: 0 !important;
20902100
background: var(--color-code-sidebar-bg);
20912101
width: 1%;
@@ -2161,6 +2171,7 @@ a.ui.label:hover {
21612171
color: var(--color-text);
21622172
}
21632173

2174+
.ui.active.button,
21642175
.ui.button:active,
21652176
.ui.active.button:active,
21662177
.ui.active.button:hover {
@@ -2312,7 +2323,7 @@ a.ui.basic.label:hover {
23122323
}
23132324

23142325
.migrate .svg.gitea-git {
2315-
color: #f05133; /* from https://upload.wikimedia.org/wikipedia/commons/e/e0/Git-logo.svg */
2326+
color: var(--color-git);
23162327
}
23172328

23182329
.color-icon {

web_src/less/_dashboard.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
}
184184

185185
#privateFilterCheckbox .svg {
186-
color: #888888;
186+
color: var(--color-grey);
187187
margin-right: .25rem;
188188
}
189189

web_src/less/_install.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
.reinstall-message {
6060
width: 70%;
6161
margin: 20px auto;
62-
color: red;
62+
color: var(--color-red);
6363
text-align: left;
6464
font-weight: bold;
6565
}

0 commit comments

Comments
 (0)