From 974805b46afd8ba4c55765746ce139200bdd3723 Mon Sep 17 00:00:00 2001 From: Jeremy Thomas Date: Thu, 21 Apr 2016 21:39:57 +0100 Subject: [PATCH] Add weight variable, Remove inline-flex, Fix link button --- sass/base/generic.sass | 2 ++ sass/elements/button.sass | 1 + sass/elements/controls.sass | 3 +-- sass/elements/elements.sass | 3 +-- sass/utilities/variables.sass | 2 ++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sass/base/generic.sass b/sass/base/generic.sass index 9356c573..f9cb55a4 100644 --- a/sass/base/generic.sass +++ b/sass/base/generic.sass @@ -37,6 +37,7 @@ pre body color: $text font-size: 1rem + font-weight: $weight-normal line-height: 1.428571428571429 // Inline @@ -72,6 +73,7 @@ small strong color: $text-strong + font-weight: $weight-bold // Block diff --git a/sass/elements/button.sass b/sass/elements/button.sass index ee4231f4..82fe7ce1 100644 --- a/sass/elements/button.sass +++ b/sass/elements/button.sass @@ -79,6 +79,7 @@ border-color: darken($color, 10%) color: darken($color, 10%) &.is-link + background: transparent border-color: transparent color: $text text-decoration: underline diff --git a/sass/elements/controls.sass b/sass/elements/controls.sass index d8c762f2..15d13d09 100644 --- a/sass/elements/controls.sass +++ b/sass/elements/controls.sass @@ -1,12 +1,11 @@ =control -moz-appearance: none -webkit-appearance: none - align-items: center background: $control-background border: 1px solid $control-border border-radius: $radius color: $control - display: inline-flex + display: inline-block font-size: $size-normal height: 32px line-height: 24px diff --git a/sass/elements/elements.sass b/sass/elements/elements.sass index 74b96334..052ab3bb 100644 --- a/sass/elements/elements.sass +++ b/sass/elements/elements.sass @@ -146,11 +146,10 @@ vertical-align: top .tag - align-items: center background: $background border-radius: 290486px color: $text - display: inline-flex + display: inline-block font-size: 12px height: 24px justify-content: center diff --git a/sass/utilities/variables.sass b/sass/utilities/variables.sass index 5a997451..f6212acc 100644 --- a/sass/utilities/variables.sass +++ b/sass/utilities/variables.sass @@ -30,6 +30,8 @@ $size-6: 14px !default $size-7: 11px !default +$weight-normal: 400 !default +$weight-bold: 700 !default $weight-title-normal: 300 !default $weight-title-bold: 500 !default