Skip to content

Commit a894e6c

Browse files
authored
Fix the relative import order of variables and variables_project (grpc#702)
1 parent 03aef4d commit a894e6c

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.cspell.json

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"Disqus",
1313
"Dockerfiles",
1414
"Docsy",
15+
"Docsy's",
1516
"favicons",
1617
"flatbuffers",
1718
"getenv",

assets/scss/_variables_project.scss

+10-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ $secondary: #5ac5c5;
44
$info: #379c9c;
55
$gray-100: #fafafa;
66

7-
// Display styles: prefer Bootstrap defaults to docsy's overrides
8-
$display1-weight: $font-weight-light;
9-
$display2-weight: $font-weight-light;
10-
$display3-weight: $font-weight-light;
11-
$display4-weight: $font-weight-light;
7+
// Forward definitions of Bootstrap and Docsy variables
8+
// TODO: add value checks later in the import chain
9+
10+
$_font-weight-light: 300;
11+
12+
// Display styles: prefer Bootstrap defaults to Docsy's overrides
13+
$display1-weight: $_font-weight-light;
14+
$display2-weight: $_font-weight-light;
15+
$display3-weight: $_font-weight-light;
16+
$display4-weight: $_font-weight-light;
1217

1318
$link-color: #379c9c;
1419

themes/docsy

0 commit comments

Comments
 (0)