Merge pull request #246 from edx/talbs/UXPL-15

Correcting Styling for Disabled Enhanced Radio Button
edx · Dec 30, 2015 · d88ecee · d88ecee
2 parents a452c60 + 3ec6f3a
commit d88ecee
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ Nothing yet
 
 - - -
 
+## 0.7.4 (2015-12-29)
+* correcting styling for disabled enhanced radio button
+
+- - -
+
 ## 0.7.3 (2015-12-22)
 * adding transparent options to base and utility color palettes and remove unused colors partial
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "edx-pattern-library",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "authors": [
     "edX UX Team <[email protected]>"
   ],

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

diff --git a/pattern-library/css/edx-pattern-library-ltr.css b/pattern-library/css/edx-pattern-library-ltr.css
diff --git a/pattern-library/css/edx-pattern-library-ltr.min.css b/pattern-library/css/edx-pattern-library-ltr.min.css
diff --git a/pattern-library/css/edx-pattern-library-rtl.css b/pattern-library/css/edx-pattern-library-rtl.css
diff --git a/pattern-library/css/edx-pattern-library-rtl.min.css b/pattern-library/css/edx-pattern-library-rtl.min.css
diff --git a/pattern-library/sass/patterns/_forms.scss b/pattern-library/sass/patterns/_forms.scss
@@ -427,10 +427,10 @@ $field-required-color:                      $label-color !default;
         &.replace-checkbox {
 
             & + .field-input-label {
+                // disabled state of replaced checkboxes
                 color: palette(grayscale, base);
 
                 &:before {
-                    // disabled state of replaced checkboxes
                     & + .field-input-label:before {
                         @include input-radio-checkbox-disabled();
                     }
@@ -445,10 +445,7 @@ $field-required-color:                      $label-color !default;
                 color: palette(grayscale, base);
 
                 &:before {
-                    // disabled state of replaced checkboxes
-                    & + .field-input-label:before {
-                        @include input-radio-checkbox-disabled();
-                    }
+                    @include input-radio-checkbox-disabled();
                 }
             }
         }

diff --git a/public/css/demo-ltr.css b/public/css/demo-ltr.css
diff --git a/public/css/demo-ltr.min.css b/public/css/demo-ltr.min.css
diff --git a/public/css/demo-rtl.css b/public/css/demo-rtl.css
diff --git a/public/css/demo-rtl.min.css b/public/css/demo-rtl.min.css
diff --git a/public/css/main-ltr.css b/public/css/main-ltr.css
diff --git a/public/css/main-ltr.min.css b/public/css/main-ltr.min.css
diff --git a/public/css/main-rtl.css b/public/css/main-rtl.css
diff --git a/public/css/main-rtl.min.css b/public/css/main-rtl.min.css