_layout.scss in titon-toolkit-1.0.0.rc1

- old
+ new

@@ -1,18 +1,6 @@
 
-$padding: .75rem !default;
-$margin: 1.25rem !default;
-
-$small-size: .7rem !default;
-$small-padding: .5rem !default;
-
-$medium-size: inherit !default;
-$medium-padding: $padding !default;
-
-$large-size: 1.3rem !default;
-$large-padding: 1rem !default;
-
 // Container clear fix for floats
 @mixin clear-fix {
     &:after {
         content: "";
         display: block;
@@ -60,20 +48,21 @@
     padding: $large-padding;
 }
 
 //-------------------- States --------------------//
 
-// Contains hover and active styles (on self or inherited from parent)
+// Contains active styles (on self or inherited from parent)
 @mixin active-state {
     .is-active > &,
-    &:hover,
+    .is-active > li > &,
     &.is-active,
     &.is-active:hover { @content; }
 }
 
 // Contains disabled styles (on self or inherited from parent)
 @mixin disabled-state {
     .is-disabled > &,
+    .is-disabled > li > &,
     &.is-disabled,
     &.is-disabled:hover,
     &[disabled],
     &[disabled]:hover { @content; }
 }
\ No newline at end of file