Merge pull request #276 from edx/talbs/fix/remove-btn-base-extend

FIX - Publishing Missing Buttons Sass Extend Solution
edx · Jan 27, 2016 · 160aace · 160aace
2 parents 0e50ddc + 4200379
commit 160aace
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ Nothing yet
 
 - - -
 
+## 0.8.12 (2016-01-26)
+* FIX- Removed unused %btn-base extend from buttons
+
+- - -
+
 ## 0.8.11 (2016-01-26)
 * Removed unused %btn-base extend from buttons
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-pattern-library",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "authors": [
     "edX UX Team <ux@edx.org>"
   ],

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-pattern-library",
-  "version": "0.8.11",
+  "version": "0.8.12",
   "author": "edX UX Team <ux@edx.org>",
   "license": "Apache-2.0",
   "description": "The (working) Visual, UI, and Front End Styleguide for edX Apps",

diff --git a/pattern-library/sass/patterns/_buttons.scss b/pattern-library/sass/patterns/_buttons.scss
@@ -167,7 +167,6 @@ $btn-inverse-disabled-focus-background:     $transparent !default;
 // ----------------------------
 %btn-default {
     @extend %btn;
-    @extend %btn-base;
     border-color: $btn-default-border-color;
     background: $btn-default-background;
     color: $btn-default-color;