_mixins.scss in bootstrap-sass-rails-2.0.4.0

- old
+ new

@@ -79,16 +79,19 @@
 }
 
 // Placeholder text
 // -------------------------
 @mixin placeholder($color: $placeholderText) {
-  :-moz-placeholder {
+  &:-moz-placeholder {
     color: $color;
   }
-  ::-webkit-input-placeholder {
+  &:-ms-input-placeholder {
     color: $color;
   }
+  &::-webkit-input-placeholder {
+    color: $color;
+  }
 }
 
 // Text overflow
 // -------------------------
 // Requires inline-block or block for proper styling
@@ -162,10 +165,12 @@
   .help-block,
   .help-inline {
     color: $textColor;
   }
   // Style inputs accordingly
+  .checkbox,
+  .radio,
   input,
   select,
   textarea {
     color: $textColor;
     border-color: $borderColor;
@@ -307,10 +312,19 @@
           column-count: $columnCount;
   -webkit-column-gap: $columnGap;
      -moz-column-gap: $columnGap;
           column-gap: $columnGap;
 }
+// Optional hyphenation
+@mixin hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode;
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
 
 // Opacity
 @mixin opacity($opacity) {
   opacity: $opacity / 100;
   filter: alpha(opacity=$opacity);
@@ -409,21 +423,21 @@
 // --------------------------------------------------
 
 // Horizontal dividers
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
-@mixin nav-divider() {
+@mixin nav-divider($top: #e5e5e5, $bottom: $white) {
   // IE7 needs a set width since we gave a height. Restricting just
   // to IE7 to keep the 1px left/right space in other browsers.
   // It is unclear where IE is getting the extra space that we need
   // to negative-margin away, but so it goes.
   *width: 100%;
   height: 1px;
   margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
   *margin: -5px 0 5px;
   overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid $white;
+  background-color: $top;
+  border-bottom: 1px solid $bottom;
 }
 
 // Button backgrounds
 // ------------------
 @mixin buttonBackground($startColor, $endColor) {