From a894e6ca5f9759d68b1180d49d46f590c5c13fd9 Mon Sep 17 00:00:00 2001 From: Patrice Chalin Date: Fri, 5 Mar 2021 17:21:27 -0500 Subject: [PATCH] Fix the relative import order of variables and variables_project (#702) --- .cspell.json | 1 + assets/scss/_variables_project.scss | 15 ++++++++++----- themes/docsy | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.cspell.json b/.cspell.json index ce3fcaf..63f16c7 100644 --- a/.cspell.json +++ b/.cspell.json @@ -12,6 +12,7 @@ "Disqus", "Dockerfiles", "Docsy", + "Docsy's", "favicons", "flatbuffers", "getenv", diff --git a/assets/scss/_variables_project.scss b/assets/scss/_variables_project.scss index 635ecfb..c23ab15 100644 --- a/assets/scss/_variables_project.scss +++ b/assets/scss/_variables_project.scss @@ -4,11 +4,16 @@ $secondary: #5ac5c5; $info: #379c9c; $gray-100: #fafafa; -// Display styles: prefer Bootstrap defaults to docsy's overrides -$display1-weight: $font-weight-light; -$display2-weight: $font-weight-light; -$display3-weight: $font-weight-light; -$display4-weight: $font-weight-light; +// Forward definitions of Bootstrap and Docsy variables +// TODO: add value checks later in the import chain + +$_font-weight-light: 300; + +// Display styles: prefer Bootstrap defaults to Docsy's overrides +$display1-weight: $_font-weight-light; +$display2-weight: $_font-weight-light; +$display3-weight: $_font-weight-light; +$display4-weight: $_font-weight-light; $link-color: #379c9c; diff --git a/themes/docsy b/themes/docsy index efb6ddc..727ff48 160000 --- a/themes/docsy +++ b/themes/docsy @@ -1 +1 @@ -Subproject commit efb6ddcaecd00eb771ff748c5aa06c37530b24bb +Subproject commit 727ff484730222d2bc2d3a593d97f96c22b6d39c