diff options
author | Jake Wiesler <jakewiesler@gmail.com> | 2020-07-29 12:02:52 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-29 12:02:52 +0300 |
commit | 0554b6b62992938bcf9f40a06bfea7403232b504 (patch) | |
tree | 73db2b0d9b79e413917e56f13f506394d237d168 /assets | |
parent | d0642bdebe12a9ecd36147fb9c3a04e0c9427303 (diff) |
Add overrides.scss (#85)
* feat: add overrides.scss
* docs: Update README
* refactor: fix naming
* refactor: scss vars
Diffstat (limited to 'assets')
-rw-r--r-- | assets/scss/_main.scss | 2 | ||||
-rw-r--r-- | assets/scss/overrides.scss | 4 | ||||
-rw-r--r-- | assets/scss/pages/post.scss | 1 | ||||
-rw-r--r-- | assets/scss/partials/_burger.scss | 2 | ||||
-rw-r--r-- | assets/scss/partials/_colors.scss | 7 | ||||
-rw-r--r-- | assets/scss/partials/_post-list.scss | 3 | ||||
-rw-r--r-- | assets/scss/partials/_reset.scss | 2 | ||||
-rw-r--r-- | assets/scss/partials/_screenSizes.scss | 2 | ||||
-rw-r--r-- | assets/scss/partials/_typography.scss | 2 | ||||
-rw-r--r-- | assets/scss/partials/_vars.scss | 20 |
10 files changed, 22 insertions, 23 deletions
diff --git a/assets/scss/_main.scss b/assets/scss/_main.scss index 61bdea0..971f59a 100644 --- a/assets/scss/_main.scss +++ b/assets/scss/_main.scss @@ -1,5 +1,5 @@ -@import "partials/normalize"; @import "partials/vars"; +@import "partials/normalize"; @import "partials/reset"; @import "partials/typography"; @import "partials/nav"; diff --git a/assets/scss/overrides.scss b/assets/scss/overrides.scss new file mode 100644 index 0000000..cd50bf5 --- /dev/null +++ b/assets/scss/overrides.scss @@ -0,0 +1,4 @@ +// The following variables can be overridden + +// The primary accent color can take any css color property, including hex, named props, rgba etc. +// $primary: diff --git a/assets/scss/pages/post.scss b/assets/scss/pages/post.scss index 52f6f40..5b97764 100644 --- a/assets/scss/pages/post.scss +++ b/assets/scss/pages/post.scss @@ -1,6 +1,5 @@ @import "../main"; @import "../partials/github-syntax-highlighting"; -@import "../partials/colors"; $tocBreakpoint: 1024px; diff --git a/assets/scss/partials/_burger.scss b/assets/scss/partials/_burger.scss index 4338306..2826029 100644 --- a/assets/scss/partials/_burger.scss +++ b/assets/scss/partials/_burger.scss @@ -1,5 +1,3 @@ -@import "vars"; - .burger__container { height: $burgerContainerHeight; display: flex; diff --git a/assets/scss/partials/_colors.scss b/assets/scss/partials/_colors.scss deleted file mode 100644 index 351903c..0000000 --- a/assets/scss/partials/_colors.scss +++ /dev/null @@ -1,7 +0,0 @@ -$black: #111; -$lightGrey: #f7f7f7; -$greyTableBorder: #eeeeee; -$grey: #9b9b9b; -$darkGrey: #717171; -$white: #fff; -$primary: #9013fe; diff --git a/assets/scss/partials/_post-list.scss b/assets/scss/partials/_post-list.scss index 53fc67b..544bf70 100644 --- a/assets/scss/partials/_post-list.scss +++ b/assets/scss/partials/_post-list.scss @@ -1,6 +1,3 @@ -@import "colors"; -@import "vars"; - .post-list__container { margin: 0 auto; max-width: 1200px; diff --git a/assets/scss/partials/_reset.scss b/assets/scss/partials/_reset.scss index 1c298ff..78ebe16 100644 --- a/assets/scss/partials/_reset.scss +++ b/assets/scss/partials/_reset.scss @@ -1,5 +1,3 @@ -@import "colors"; - html, body { background-color: $white; diff --git a/assets/scss/partials/_screenSizes.scss b/assets/scss/partials/_screenSizes.scss deleted file mode 100644 index 52a3d44..0000000 --- a/assets/scss/partials/_screenSizes.scss +++ /dev/null @@ -1,2 +0,0 @@ -$medium: 800px; -$large: 1400px; diff --git a/assets/scss/partials/_typography.scss b/assets/scss/partials/_typography.scss index e9fb87c..c695b00 100644 --- a/assets/scss/partials/_typography.scss +++ b/assets/scss/partials/_typography.scss @@ -1,5 +1,3 @@ -@import "vars"; - $baseFontSize: 16; $fontSizeMobile: 14; $baseLineHeight: 1.5; diff --git a/assets/scss/partials/_vars.scss b/assets/scss/partials/_vars.scss index b730615..c3c06ac 100644 --- a/assets/scss/partials/_vars.scss +++ b/assets/scss/partials/_vars.scss @@ -1,7 +1,21 @@ -@import "_colors"; -@import "_screenSizes"; - $navWidth: 100px; $meatWidth: 28px; $meatHeight: 2px; $burgerContainerHeight: 4rem; + +// colors +$black: #111; +$lightGrey: #f7f7f7; +$greyTableBorder: #eeeeee; +$grey: #9b9b9b; +$darkGrey: #717171; +$white: #fff; +$primary: #9013fe; + +// screenSizes +$medium: 800px; +$large: 1400px; + +// import site overrides after variables after +// variables have been declared +@import "../overrides"; |