fix merge conflict with _variables.scss

2013-07-29 13:32:54 -04:00
parent 6276997180 50ef0d1c09
commit 13ca61ba7f
64 changed files with 1861 additions and 562 deletions
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -91,7 +91,7 @@

  }

-  &.disabled, &[disabled] {
+  &.disabled, &[disabled], &.is-disabled {
    cursor: default;
    pointer-events: none;
    opacity: 0.5;