Skip to content

Commit c68dabb

Browse files
Nemo157Joshua Nelson
authored and
Joshua Nelson
committed
Move all colours to CSS variables
1 parent fe468bf commit c68dabb

File tree

5 files changed

+90
-85
lines changed

5 files changed

+90
-85
lines changed

templates/style/_navbar.scss

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ div.nav-container {
55
// Nothing is supposed to be over or hovering the top navbar. Maybe add a few others '('? :)
66
z-index: 999;
77
height: $top-navbar-height;
8-
border-bottom: 1px solid $color-border;
9-
background-color: #fff;
8+
border-bottom: 1px solid var(--color-border);
9+
background-color: var(--color-background);
1010
left: 0;
1111
right: 0;
1212
top: 0;
1313
position: fixed;
1414

1515
li {
16-
border-left: 1px solid $color-border;
16+
border-left: 1px solid var(--color-border);
1717
}
1818

1919
.pure-menu-has-children > .pure-menu-link:after {
@@ -25,7 +25,7 @@ div.nav-container {
2525
font-weight: 400;
2626

2727
&:hover {
28-
color: $color-standard;
28+
color: var(--color-standard);
2929
background-color: inherit;
3030
}
3131
}
@@ -41,7 +41,7 @@ div.nav-container {
4141
float: right;
4242
max-width: 150px;
4343
display: none;
44-
border-left: 1px solid $color-border;
44+
border-left: 1px solid var(--color-border);
4545

4646
@media #{$media-sm} {
4747
display: block;
@@ -52,7 +52,7 @@ div.nav-container {
5252
}
5353

5454
label {
55-
color: #777;
55+
color: var(--color-navbar-standard);
5656
cursor: pointer;
5757
padding-left: 0.5rem;
5858
font-size: 0.8em;
@@ -63,7 +63,7 @@ div.nav-container {
6363
margin: 0 1em 0 0;
6464
font-size: 0.8em;
6565
box-shadow: none;
66-
background-color: #fff;
66+
background-color: var(--color-background);
6767
height: 31px;
6868
}
6969
}
@@ -74,7 +74,7 @@ div.nav-container {
7474
}
7575

7676
.pure-menu-children {
77-
border: 1px solid $color-border;
77+
border: 1px solid var(--color-border);
7878
border-radius: 0 0 2px 2px;
7979
margin-left: -1px;
8080

@@ -86,19 +86,19 @@ div.nav-container {
8686
// used for latest version warning
8787
.warn,
8888
.warn:hover {
89-
color: $color-type;
89+
color: var(--color-warn);
9090
}
9191

9292
a.warn:hover {
93-
color: darken($color-type, 10%);
93+
color: var(--color-warn-hover);
9494
}
9595

9696
// used for global alerts
9797
.error {
98-
color: $color-red;
98+
color: var(--color-error);
9999

100100
&:hover {
101-
color: darken($color-red, 10%);
101+
color: var(--color-error-hover);
102102
}
103103
}
104104

@@ -142,7 +142,7 @@ div.nav-container {
142142
p.description {
143143
font-family: $font-family-sans;
144144
font-size: 0.8em;
145-
color: #777; // color from pure
145+
color: var(--color-navbar-standard);
146146
padding: 0.5em 1em;
147147
margin: 0;
148148
}
@@ -152,7 +152,7 @@ div.nav-container {
152152
}
153153

154154
div.right-border {
155-
border-right: 1px solid $color-border;
155+
border-right: 1px solid var(--color-border);
156156
}
157157

158158
a.pure-menu-link {

templates/style/_themes.scss

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Standard white theme
2+
body {
3+
--color-background-code: #f5f5f5;
4+
--color-background: #fff;
5+
--color-border-light: lighten(#ddd, 5%);
6+
--color-border: #ddd;
7+
--color-doc-link-background: #333;
8+
--color-doc-link-hover: #3061f3;
9+
--color-error-hover: darken(#d93d3d, 10%);
10+
--color-error: #d93d3d;
11+
--color-macro: #068000;
12+
--color-menu-border: #cdcdcd;
13+
--color-menu-header-background: #e0e0e0;
14+
--color-navbar-standard: #777;
15+
--color-standard: #000;
16+
--color-struct: #df3600;
17+
--color-type: #e57300;
18+
--color-url: #4d76ae;
19+
--color-warn-background: lighten(#e57300, 45%);
20+
--color-warn-hover: darken(#e57300, 10%);
21+
--color-warn: #e57300;
22+
}

templates/style/_utils.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ div {
66
.info {
77
font-family: $font-family-sans;
88
border-radius: 4px;
9-
background-color: $color-background-code;
9+
background-color: var(--color-background-code);
1010
padding: 0.4em 1em;
1111
text-align: center;
1212
margin-bottom: 10px;
1313

1414
a {
15-
color: $color-url;
15+
color: var(--color-url);
1616
text-decoration: underline;
1717
}
1818
}
1919

2020
.warning {
2121
@extend .info;
2222

23-
background-color: lighten($color-type, 45%);
23+
background-color: var(--color-warn-background);
2424
}
2525
}

templates/style/_vars.scss

-16
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,6 @@ $font-family-sans: "Fira Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
55
$font-family-serif: "Source Serif Pro", Georgia, Times, "Times New Roman", serif;
66
$font-family-mono: "Source Code Pro", Menlo, Monaco, Consolas, "DejaVu Sans Mono", Inconsolata, monospace;
77

8-
// Colors
9-
$color-standard: #000; // pure black
10-
$color-url: #4d76ae; // blue
11-
$color-macro: #068000; // green
12-
$color-struct: #df3600; // red
13-
$color-enum: #5e9766; // light green
14-
$color-type: #e57300; // orange
15-
$color-keyword: #8959A8; // purple
16-
$color-string: #718C00; // greenish
17-
$color-macro-in-code: #3E999F; // blueish
18-
$color-lifetime-incode: #B76514; // orangish
19-
$color-comment-in-code: #8E908C; // light gray
20-
$color-background-code: #F5F5F5; // lighter gray
21-
$color-border: #ddd; // gray
22-
$color-red: #d93d3d; // red
23-
248
// Sizes
259
$top-navbar-height: 32px; // height of the floating top navbar
2610

0 commit comments

Comments
 (0)