Skip to content

Commit 320fc7a

Browse files
committed
Redmine 7.0向けにOpen Colorが導入されたことによる色調整
- 本テーマによる色の再定義は可能な範囲で削除しデフォルトテーマの色を使用 - 本テーマで再定義している色は可能な範囲でOpen Colorの色に変更
1 parent d2f1ff4 commit 320fc7a

File tree

1 file changed

+19
-43
lines changed

1 file changed

+19
-43
lines changed

stylesheets/application.css

Lines changed: 19 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
11
@import url(../../../stylesheets/application.css);
22

33
/*
4-
* color: #2A5685 -> #0c4d7f;
4+
* This theme uses CSS variables defined in open-color.css (Redmine 7.0+).
5+
* The second argument of var() specifies fallback values for older versions
6+
* of Redmine that do not include open-color.css.
57
*
6-
* color: #444 -> #222;
7-
* color: #555 -> #333;
8-
* color: #484848 -> #222;
9-
* color: #666 -> #484848;
10-
* color: #777 -> #484848;
11-
* color: #808080 -> #484848;
12-
* color: #999 -> #666;
13-
*
14-
* opacity: 0.4 -> 0.7;
8+
* Example:
9+
* color: var(--oc-gray-9, #212529);
10+
* ↑ Uses #212529 as fallback for Redmine < 7.0.
1511
*
12+
* TODO: Remove these fallback values after Redmine 6.x reaches EOL.
1613
*/
1714

1815
body {
1916
font-family: Meiryo, "Hiragino Kaku Gothic Pro", "MS PGothic", Verdana, sans-serif;
20-
color: #222;
2117
}
2218

2319
h1, h2, h3, h4 {
@@ -29,15 +25,11 @@ h1, h2, h3, h4 {
2925
}
3026

3127
#content h1, h2, h3, h4 {
32-
color: #222;
33-
}
34-
35-
#sidebar h3 {
36-
color: #484848
28+
color: var(--oc-gray-9, #212529); /* Initial value is fallbak for Redmine < 7.0 */
3729
}
3830

3931
#main-menu li a.selected, #main-menu li a.selected:hover {
40-
color: #222;
32+
color: var(--oc-gray-9, #212529);
4133
box-shadow: 3px -2px 2px rgba(0, 0, 0, 0.1);
4234
}
4335

@@ -199,20 +191,16 @@ tr.priority-lowest a {
199191
color: #559
200192
}
201193

202-
#watchers a.delete {
203-
opacity: 0.7
204-
}
205-
206194
.box {
207-
color: #222;
195+
color: var(--oc-gray-9, #212529);
208196
}
209197

210198
.issue .contextual {
211199
margin: 0;
212200
padding: 2px 3px;
213201
border-radius: 3px;
214-
background: #fffff2;
215-
border: 1px solid #e6e6cf;
202+
background: rgba(var(--oc-white-rgb, 255, 255, 255), 0.8);
203+
border: 1px solid var(--oc-gray-4, #ced4da);
216204
}
217205

218206
/* proportional でない場合にフォントを変更 */
@@ -224,10 +212,6 @@ textarea.wiki-edit {
224212
font-size: 0.875rem;
225213
}
226214

227-
div.issue {
228-
background-color: #ffffe6; /* HSV(60,10,100) */
229-
}
230-
231215
div.issue div.subject p {
232216
color: #666
233217
}
@@ -236,16 +220,8 @@ div.issue .next-prev-links {
236220
color:#666;
237221
}
238222

239-
div#activity dt .time {
240-
color: #484848
241-
}
242-
243223
div#activity dd span.description, #search-results dd span.description {
244-
color: #484848
245-
}
246-
247-
table#time-report tbody tr {
248-
color: #484848
224+
color: var(--oc-gray-7, #495057);
249225
}
250226

251227
form .attributes {
@@ -266,7 +242,7 @@ ul.projects div.root a.project {
266242
}
267243

268244
p.other-formats {
269-
color: #484848;
245+
color: var(--oc-gray-7, #495057);
270246
}
271247

272248
/***** Wiki *****/
@@ -286,11 +262,11 @@ div.wiki li {
286262

287263
/***** My page layout *****/
288264
.mypage-box {
289-
color:#222;
265+
color: var(--oc-gray-9, #212529);
290266
}
291267

292268
#top-menu #loggedas {
293-
color: #ccc;
269+
color: var(--oc-gray-4, #ced4da);
294270
}
295271

296272
#login-form input#username, #login-form input#password {
@@ -333,8 +309,8 @@ div.projects.box > ul > li > a {
333309

334310
/* journal */
335311
div.journal-content ul.journal-details {
336-
color: #444;
337-
background: #f8f9fa;
312+
color: var(--oc-gray-7, #495057);
313+
background: var(--oc-gray-0, #f8f9fa);
338314
border-radius: 3px;
339315
padding-top: 3px;
340316
padding-bottom: 3px;
@@ -358,7 +334,7 @@ body.controller-news.action-index h3 {
358334

359335
body.controller-news.action-index .author {
360336
margin-top: 0;
361-
border-bottom: 1px dotted #BBBBBB;
337+
border-bottom: 1px dotted var(--oc-gray-4, #ced4da);
362338
}
363339

364340
body.controller-news.action-index .wiki {

0 commit comments

Comments
 (0)