From 13e00c755b3f9cc5324b26b37db06d1c18aefd85 Mon Sep 17 00:00:00 2001 From: LaurelBCodin Date: Fri, 21 Apr 2017 17:04:40 -0700 Subject: [PATCH] fixed dropdown mixin issue --- _vendor/normalize-scss/sass/normalize/_normalize-mixin.scss | 2 +- docs/pages/button.md | 2 ++ scss/components/_button.scss | 2 +- tmp.txt | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 tmp.txt diff --git a/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss b/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss index edfd399a2..70a8d3d37 100644 --- a/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss +++ b/_vendor/normalize-scss/sass/normalize/_normalize-mixin.scss @@ -424,7 +424,7 @@ optgroup, select, textarea { - font-family: inherit; /* 1 */ + font-family: $base-font-family; /* 1 */ font-size: 100%; /* 1 */ @if $normalize-vertical-rhythm { line-height: ($base-line-height / $base-font-size) * 1em; /* 1 */ diff --git a/docs/pages/button.md b/docs/pages/button.md index 81b335745..e14ff7c9a 100644 --- a/docs/pages/button.md +++ b/docs/pages/button.md @@ -40,8 +40,10 @@ Additional classes can be added to your button to change its size and shape. So Large Such Expand Wow, Small Expand + ``` + --- ## Coloring diff --git a/scss/components/_button.scss b/scss/components/_button.scss index eb266c594..c85f5f951 100644 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -258,7 +258,7 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau display: inline-block; float: #{$global-right}; - margin-#{$global-left}: get-side($button-padding, right); + margin-#{$global-left}: $offset; } } diff --git a/tmp.txt b/tmp.txt new file mode 100644 index 000000000..a43b38651 --- /dev/null +++ b/tmp.txt @@ -0,0 +1,4 @@ +$button-padding: 4px; +$button-padding: 4px 2px; +$button-padding: 4px 1px 3px; +$button-padding: 4px 5px 3px 1px; -- 2.47.2