From 2f3ab823237af0b0cbca512c64096a07597ed952 Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 15 Dec 2019 23:10:42 +0100 Subject: [PATCH] `font-weight` unify --- scss/_variables.scss | 11 ++++++----- scss/mixins/_mixins.scss | 2 +- scss/ui/_forms.scss | 2 +- scss/ui/_highlight.scss | 2 +- scss/ui/_lists.scss | 4 ++-- scss/ui/_nav.scss | 2 +- scss/ui/_ribbons.scss | 2 +- scss/ui/_stamps.scss | 2 +- scss/ui/_steps.scss | 2 +- scss/ui/_typo.scss | 2 +- scss/vendor/_apexcharts.scss | 4 ++-- scss/vendor/_fullcalendar.scss | 4 ++-- 12 files changed, 20 insertions(+), 19 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 1942b420..47ce5e53 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -5,7 +5,7 @@ $enable-extra-colors: true !default; $enable-gradients: false !default; // FONTS -$google-font: "Nunito" !default; +$google-font: "Source Sans Pro" !default; $font-family-sans-serif: $google-font, -apple-system, blinkmacsystemfont, segoe ui, helvetica, arial, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol !default; $font-family-serif: "Georgia", "Times New Roman", times, serif !default; @@ -110,6 +110,7 @@ $avatar-sizes: ( //Fonts $font-size-base: .9375rem !default; +$font-weight-bold: 600 !default; $line-height-base: 1.6 !default; $body-letter-spacing: null !default; @@ -118,7 +119,7 @@ $border-width-wide: 2px !default; $border-radius: 3px !default; //Typography -$headings-font-weight: 600 !default; +$headings-font-weight: $font-weight-bold !default; $small-font-size: 87.5% !default; @@ -182,7 +183,7 @@ $container-max-widths: ( ) !default; //alerts -$alert-link-font-weight: 600 !default; +$alert-link-font-weight: $font-weight-bold !default; //breadcrumb $breadcrumb-variants: ( @@ -192,7 +193,7 @@ $breadcrumb-variants: ( ) !default; //badges -$badge-font-weight: 500 !default; +$badge-font-weight: $font-weight-bold !default; $badge-empty-size: .5rem !default; //buttons @@ -212,7 +213,7 @@ $input-height-sm: null !default; $input-height-lg: null !default; $btn-padding-x: 1rem !default; -$btn-font-weight: 500 !default; +$btn-font-weight: $font-weight-bold !default; $btn-border-radius: 3px !default; //cards diff --git a/scss/mixins/_mixins.scss b/scss/mixins/_mixins.scss index 6764bdcc..9e63baae 100644 --- a/scss/mixins/_mixins.scss +++ b/scss/mixins/_mixins.scss @@ -1,6 +1,6 @@ @mixin subheader($include-color: true) { font-size: $h6-font-size; - font-weight: 600; + font-weight: $font-weight-bold; text-transform: uppercase; letter-spacing: .04em; diff --git a/scss/ui/_forms.scss b/scss/ui/_forms.scss index 14adf51f..666791ab 100644 --- a/scss/ui/_forms.scss +++ b/scss/ui/_forms.scss @@ -6,7 +6,7 @@ textarea { .form-label { font-size: $h4-font-size; - font-weight: 600; + font-weight: $font-weight-bold; display: block; margin-bottom: .5rem; } diff --git a/scss/ui/_highlight.scss b/scss/ui/_highlight.scss index c3fabe4e..b9ff09e1 100644 --- a/scss/ui/_highlight.scss +++ b/scss/ui/_highlight.scss @@ -232,7 +232,7 @@ .c1 { color: #75715e; } /* Comment.Single */ .cs { color: #75715e; } /* Comment.Special */ .ge { font-style: italic; } /* Generic.Emph */ - .gs { font-weight: 700; } /* Generic.Strong */ + .gs { font-weight: $font-weight-bold; } /* Generic.Strong */ .kc { color: #66d9ef; } /* Keyword.Constant */ .kd { color: #66d9ef; } /* Keyword.Declaration */ .kn { color: #f92672; } /* Keyword.Namespace */ diff --git a/scss/ui/_lists.scss b/scss/ui/_lists.scss index cfc870e9..cdbffa0a 100644 --- a/scss/ui/_lists.scss +++ b/scss/ui/_lists.scss @@ -93,7 +93,7 @@ .list-timeline-title { margin: 0; - font-weight: 600; + font-weight: $font-weight-bold; } .list-timeline-content { @@ -154,7 +154,7 @@ } &.active { - font-weight: 600; + font-weight: $font-weight-bold; color: $primary; background: rgba($primary, .06); diff --git a/scss/ui/_nav.scss b/scss/ui/_nav.scss index 6cf38727..9009a713 100644 --- a/scss/ui/_nav.scss +++ b/scss/ui/_nav.scss @@ -34,7 +34,7 @@ .nav-tabs-alt { .nav-link { font-size: 13px; - font-weight: 600; + font-weight: $font-weight-bold; text-transform: uppercase; } } diff --git a/scss/ui/_ribbons.scss b/scss/ui/_ribbons.scss index 33ad5fba..471288c1 100644 --- a/scss/ui/_ribbons.scss +++ b/scss/ui/_ribbons.scss @@ -7,7 +7,7 @@ z-index: 1; padding: .25rem .75rem; font-size: $h6-font-size; - font-weight: 700; + font-weight: $font-weight-bold; line-height: 1.5rem; color: #fff; text-align: center; diff --git a/scss/ui/_stamps.scss b/scss/ui/_stamps.scss index f8f2a379..59faea61 100644 --- a/scss/ui/_stamps.scss +++ b/scss/ui/_stamps.scss @@ -9,7 +9,7 @@ padding: 0 .25rem; font-size: $font-size-base; - font-weight: 600; + font-weight: $font-weight-bold; color: $text-muted; text-align: center; background: $gray-200; diff --git a/scss/ui/_steps.scss b/scss/ui/_steps.scss index 0176ced0..5323bd14 100644 --- a/scss/ui/_steps.scss +++ b/scss/ui/_steps.scss @@ -87,7 +87,7 @@ } &.active { - font-weight: 600; + font-weight: $font-weight-bold; &::before { background: #fff; diff --git a/scss/ui/_typo.scss b/scss/ui/_typo.scss index 52d00a5e..d78b4013 100644 --- a/scss/ui/_typo.scss +++ b/scss/ui/_typo.scss @@ -28,7 +28,7 @@ h6, strong, b { - font-weight: 600; + font-weight: $font-weight-bold; } blockquote { diff --git a/scss/vendor/_apexcharts.scss b/scss/vendor/_apexcharts.scss index a403adc3..7855b70e 100644 --- a/scss/vendor/_apexcharts.scss +++ b/scss/vendor/_apexcharts.scss @@ -1,9 +1,9 @@ .apexcharts-title-text { - font-weight: 600 !important; + font-weight: $font-weight-bold !important; } .apexcharts-tooltip-title { - font-weight: 600 !important; + font-weight: $font-weight-bold !important; padding-bottom: .25rem !important; } diff --git a/scss/vendor/_fullcalendar.scss b/scss/vendor/_fullcalendar.scss index a105b4d9..9f3bd7f9 100644 --- a/scss/vendor/_fullcalendar.scss +++ b/scss/vendor/_fullcalendar.scss @@ -32,7 +32,7 @@ .fc-day-header { padding-bottom: .25rem; - font-weight: 600; + font-weight: $font-weight-bold; } &.card-calendar { @@ -51,7 +51,7 @@ } .fc-time { - font-weight: 600; + font-weight: $font-weight-bold; } .fc-event { -- GitLab