From 5bcd1aea8cc1a34808ff6bef14fc7db75c8cde41 Mon Sep 17 00:00:00 2001 From: Jordy Kommeren Date: Tue, 2 Oct 2018 14:11:47 +0200 Subject: [PATCH] Added font-family variable on buttons it inherits the default primary font-family --- README.md | 19 +++++++++++++++++++ src/scss/boilerplate/_buttons.scss | 1 + src/scss/boilerplate/_variables.scss | 1 + 3 files changed, 21 insertions(+) diff --git a/README.md b/README.md index 3f0c933..a6b540f 100644 --- a/README.md +++ b/README.md @@ -423,12 +423,20 @@ For example: `$font-default-font-size: 18px;` | `$menu-bar-menu-item-font-weight` | Menu bar item font-weight, accepted value's: 100-800 or a variable containing it. | `$menu-bar-menu-item-font-size` | Menu bar item font-size. | `$menu-bar-menu-item-color` | Menu bar item text-color, accepted formats: HEX, RGB, RGBA or a variable containing one of these. +| `$menu-bar-menu-item-hover-background` | Menu bar item hover-state background-color. | `$menu-bar-menu-item-hover-color` | Menu bar item hover-state text-color, accepted formats: HEX, RGB, RGBA or a variable containing one of these. | `$menu-bar-menu-item-hover-default-border` | Menu bar item hover-state default border. | `$menu-bar-menu-item-hover-border-top` | Menu bar item hover-state border-top. | `$menu-bar-menu-item-hover-border-right` | Menu bar item hover-state border-right. | `$menu-bar-menu-item-hover-border-bottom` | Menu bar item hover-state border-bottom. | `$menu-bar-menu-item-hover-border-left` | Menu bar item hover-state border-left. +| `$menu-bar-menu-item-active-background` | Menu bar item active-state background-color. +| `$menu-bar-menu-item-active-color` | Menu bar item active-sate color. +| `$menu-bar-menu-item-active-default-border` | Menu bar item active-state default-border. +| `$menu-bar-menu-item-active-border-top` | Menu bar item active-sate border-top. +| `$menu-bar-menu-item-active-border-right` | Menu bar item active-state border-right. +| `$menu-bar-menu-item-active-border-bottom` | Menu bar item active-state border-bottom. +| `$menu-bar-menu-item-active-border-left` | Menu bar item active-state border-left. ###### Fieldset | Variable | Description @@ -467,6 +475,17 @@ For example: `$font-default-font-size: 18px;` | `$form-fieldset-field-label-font-weight` | Form fieldset label font-weight, accepted value's: 100-800 or a variable containing it. | `$form-fieldset-field-choice-label-margin` | Form fieldset choice label margin. +###### Toolbar +| Variable | Description +|----------------------------------------------|------------------------- +| `$toolbar-modes-mode-background` | Toolbar Mode background. +| `$toolbar-modes-mode-border` | Toolbar Mode border. +| `$toolbar-modes-mode-color` | Toolbar Mode color. +| `$toolbar-modes-mode-padding` | Toolbar Mode padding. +| `$toolbar-modes-mode-hover-background` | Toolbar Mode hover-state background. +| `$toolbar-modes-mode-hover-border` | Toolbar Mode hover-state border. +| `$toolbar-modes-mode-hover-color` | Toolbar Mode hover-state color + ###### Detail tab | Variable | Description |----------------------------------------------|------------------------- diff --git a/src/scss/boilerplate/_buttons.scss b/src/scss/boilerplate/_buttons.scss index 65c5bf0..eb1b4bf 100644 --- a/src/scss/boilerplate/_buttons.scss +++ b/src/scss/boilerplate/_buttons.scss @@ -11,6 +11,7 @@ button { border-radius: $button-default-border-radius; transition: $button-default-transition; color: $button-default-color; + font-family: $button-default-font-family; font-size: $button-default-font-size; font-weight: $button-default-font-weight; transition: $button-default-transition; diff --git a/src/scss/boilerplate/_variables.scss b/src/scss/boilerplate/_variables.scss index 6591b91..114f836 100644 --- a/src/scss/boilerplate/_variables.scss +++ b/src/scss/boilerplate/_variables.scss @@ -147,6 +147,7 @@ $button-default-background-color: $color-boilerplate-blue !default; $button-default-border: 1px solid $color-boilerplate-blue !default; $button-default-border-radius: 3px !default; $button-default-color: $color-boilerplate-light-gray !default; +$button-default-font-family: $font-default-font-family-primary !default; $button-default-font-size: 1.4rem !default; $button-default-font-weight: 400 !default; $button-default-transition: all .34s ease-in-out !default;