diff options
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/sass/_primer.scss | 51 | ||||
| -rw-r--r-- | assets/sass/_var.scss | 16 | ||||
| -rw-r--r-- | assets/sass/custom.scss | 1 | ||||
| -rw-r--r-- | assets/sass/main.scss | 3 |
4 files changed, 28 insertions, 43 deletions
diff --git a/assets/sass/_primer.scss b/assets/sass/_primer.scss index e6b99fc..cfea983 100644 --- a/assets/sass/_primer.scss +++ b/assets/sass/_primer.scss @@ -1,50 +1,31 @@ @font-face { - font-family: 'Product Sans'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Product Sans'), local('ProductSans-Regular'), - url('https://cdn.jsdelivr.net/gh/amzrk2/web-font-archive@1.0.0/product-sans/product-sans.woff2') format('woff2'); -} - -@font-face { - font-family: 'Product Sans'; + font-family: "Product Sans"; font-style: normal; font-weight: 700; font-display: swap; - src: local('Product Sans Bold'), local('ProductSans-Bold'), - url('https://cdn.jsdelivr.net/gh/amzrk2/web-font-archive@1.0.0/product-sans/product-sans-bold.woff2') format('woff2'); -} - -@font-face { - font-family: 'Cascadia Code'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Cascadia Code'), local('Cascadia Mono'), - url('https://cdn.jsdelivr.net/gh/amzrk2/web-font-archive@1.0.0/cascadia-code/cascadia.woff2') format('woff2'), + src: local("Product Sans Bold"), local("ProductSans-Bold"), + url("https://cdn.jsdelivr.net/gh/amzrk2/web-font-archive@1.0.0/product-sans/product-sans-bold.woff2") format("woff2"); } @font-face { - font-family: 'PingFang SC Web'; + font-family: "Cascadia Code"; font-style: normal; font-weight: 400; font-display: swap; - src: local('PingFang SC Medium'), - /* Modern Browsers */ - url('https://cdn.jsdelivr.net/gh/amzrk2/web-font-archive@1.0.0/pingfang/pingfang-medium.woff2') format('woff2'), + src: local("Cascadia Code"), local("Cascadia Mono"), + url("https://cdn.jsdelivr.net/gh/amzrk2/web-font-archive@1.0.0/cascadia-code/cascadia.woff2") format("woff2"), } // @primer/css/support/variables/layout.scss -// Fixed-width container variables -$container-width: 900px; -// Large screen / desktop (900 + (16 * 2)) <= container + gutters -$width-lg: 932px; +// fixed-width container variables +$container-width: 900px !default; +// large screen / desktop (900 + (16 * 2)) <= container + gutters +$width-lg: 932px !default; // @primer/css/support/variables/typography.scss -// Font stacks -$body-font: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Hiragino Sans GB', 'WenQuanYi Micro Hei', 'Source Han Sans SC', 'Source Han Sans CN', 'Source Han Sans', 'Microsoft YaHei', sans-serif; -// Monospace font stack -$mono-font: 'Cascadia Code', 'SFMono-Regular', 'Consolas', $body-font; -// The base body size -$body-font-size: 16px;
\ No newline at end of file +// font stacks +$body-font: -apple-system, BlinkMacSystemFont, "SF Pro Text", "Helvetica Neue", "Helvetica", "Arial", "PingFang SC", "Hiragino Sans GB", "Source Han Sans CN", "Source Han Sans SC", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif !default; +// monospace font stack +$mono-font: "Cascadia Code", "SF Mono", "Fira Code", "Consolas", $body-font !default; +// the base text size +$body-font-size: $font-size-l4 !default;
\ No newline at end of file diff --git a/assets/sass/_var.scss b/assets/sass/_var.scss index 41a87aa..a7a792f 100644 --- a/assets/sass/_var.scss +++ b/assets/sass/_var.scss @@ -5,15 +5,15 @@ $color-secondary: #8F82BC !default; // https://irocore.com/fujimurasaki/ $color-mute: #9EA1A3 !default; // https://irocore.com/suzu-iro/ $color-spliter: #E5E2E4 !default; // https://irocore.com/komachinezu/ -// spliter css -$spliter: 1px solid $color-spliter; - // font size list -$font-size-logo: 2.5em; // Logo Only -$font-size-l1: 1.75em; // Primer CSS H1 -$font-size-l2: 1.5em; // Primer CSS H2 -$font-size-l3: 1.25em; // Primer CSS H3 -$font-size-l4: 1em; // Primer CSS H4 & Normal Text +$font-size-logo: 2.5em !default; // Logo Only +$font-size-l1: 1.75em !default; // Primer CSS H1 +$font-size-l2: 1.5em !default; // Primer CSS H2 +$font-size-l3: 1.25em !default; // Primer CSS H3 +$font-size-l4: 1em !default; // Primer CSS H4 & Normal Text + +// divider css +$spliter: 1px solid $color-spliter !default; // link color mixin @mixin link-primary { diff --git a/assets/sass/custom.scss b/assets/sass/custom.scss new file mode 100644 index 0000000..5fbfdcd --- /dev/null +++ b/assets/sass/custom.scss @@ -0,0 +1 @@ +// to be covered by exampleSite/assets/sass/custom.sass diff --git a/assets/sass/main.scss b/assets/sass/main.scss index ac5cb92..8a6120d 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -1,3 +1,6 @@ +// custom variables +@import "custom"; + //variables @import "_var"; |