Fix control extend

diff --git a/sass/components/pagination.sass b/sass/components/pagination.sass
index 9a21244f5b780bedc22d50892bd4104004e479b9..9b8fd036602ec960fb24d2ad118cd7a18bf948a9 100644 (file)
--- a/sass/components/pagination.sass
+++ b/sass/components/pagination.sass
@@ -54,7 +54,7 @@ $pagination-shadow-inset: inset 0 1px 2px rgba($black, 0.2)
 .pagination-next,
 .pagination-link,
 .pagination-ellipsis
-  +control
+  @extend %control
   @extend %unselectable
   font-size: 1em
   padding-left: 0.5em

diff --git a/sass/elements/button.sass b/sass/elements/button.sass
index db2885fd2b52c706d23091009fe5e99ba2dfbf40..b23cc33abc6d2520506982e1ff1a430c8bece845 100644 (file)
--- a/sass/elements/button.sass
+++ b/sass/elements/button.sass
@@ -41,7 +41,7 @@ $button-static-border-color: $grey-lighter !default
   font-size: $size-large
 
 .button
-  +control
+  @extend %control
   @extend %unselectable
   background-color: $button-background-color
   border-color: $button-border-color

diff --git a/sass/elements/form.sass b/sass/elements/form.sass
index 12708edec6be70bbafe26d6939d1b3c129340c75..8d74b859cf21bdf289b07d9329d34b441ecaa811 100644 (file)
--- a/sass/elements/form.sass
+++ b/sass/elements/form.sass
@@ -42,7 +42,7 @@ $label-weight: $weight-bold !default
 $help-size: $size-small !default
 
 =input
-  +control
+  @extend %control
   background-color: $input-background-color
   border-color: $input-border-color
   color: $input-color
@@ -363,7 +363,7 @@ $help-size: $size-small !default
 
 .file-cta,
 .file-name
-  +control
+  @extend %control
   border-color: $file-border-color
   border-radius: $file-radius
   font-size: 1em

diff --git a/sass/utilities/controls.sass b/sass/utilities/controls.sass
index 67858c1e2a381421c848904628077d1012601181..074072f3c4059396951ef12a7db7e19b7da0fb7d 100644 (file)
--- a/sass/utilities/controls.sass
+++ b/sass/utilities/controls.sass
@@ -9,7 +9,7 @@ $control-line-height: 1.5 !default
 $control-padding-vertical: calc(0.375em - #{$control-border-width}) !default
 $control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default
 
-%control
+=control
   -moz-appearance: none
   -webkit-appearance: none
   align-items: center
@@ -36,8 +36,8 @@ $control-padding-horizontal: calc(0.625em - #{$control-border-width}) !default
   &[disabled]
     cursor: not-allowed
 
-=control
-  @extend %control
+%control
+  +control
 
 // The controls sizes use mixins so they can be used at different breakpoints
 =control-small