Merge branch 'master' into documentation-prototype

Gruntfile.js

@@ -95,6 +95,13 @@ module.exports = function (grunt) {
         options: {
           replacements: [
 
+            // convert bootstrap imports
+            { // https://regex101.com/r/bM6cP0/2
+              pattern: /bower_components\/(bootstrap\/less\/)/gi,
+              replacement: "bower_components\/bootstrap-sass\/assets\/stylesheets\/bootstrap\/",
+              order: 2
+            },
+
             // convert all shadow mixins
             { // https://regex101.com/r/sJ2lH4/1
               pattern: /.shadow-z-(\d+)((?:-hover)?) {/gi,

bower.json

@@ -43,6 +43,7 @@
   "license": "https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md",
   "dependencies": {
     "jquery": "~2.1.1",
-    "bootstrap": "~3.3.5"
+    "bootstrap": "~3.3.5",
+    "bootstrap-sass": "~3.3.5"
   }
 }

less/_inputs.less

@@ -1,6 +1,16 @@
 @import '_inputs-size.less';
 
-// usage: .form-group-validation-state(@input-danger);
+// must be broken out for reuse - webkit selector breaks firefox
+.label-position(@label-top, @static-font-size, @static-line-height) {
+  label.control-label {
+    top: @label-top;
+    left: 0;
+    // must repeat because the selector above is more specific than the general label sizing
+    font-size: @static-font-size;
+    line-height: @static-line-height;
+  }
+}
+
 .form-group-validation-state(@name, @color) {
 
   &.@{name} { // e.g. has-error
@@ -72,16 +82,12 @@
   // static, focused, or autofill floating labels
   &.label-static,
   &.label-floating.is-focused,
-  &.label-floating:not(.is-empty),
+  &.label-floating:not(.is-empty) {
-  &.label-floating input.form-control:-webkit-autofill {
+    .label-position(@label-top, @static-font-size, @static-line-height);
-    & ~ label.control-label, // #559 webkit chrome autofill `.form-group.label-floating input.form-control:-webkit-autofill ~ label.control-label`
+  }
-    label.control-label {
+  // #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731
-      top: @label-top;
+  &.label-floating input.form-control:-webkit-autofill ~ label.control-label {
-      left: 0;
+    .label-position(@label-top, @static-font-size, @static-line-height);
-      // must repeat because the selector above is more specific than the general label sizing
-      font-size: @static-font-size;
-      line-height: @static-line-height;
-    }
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-material-design",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "Material Design for Bootstrap 3",
   "main": "scripts/index.js",
   "scripts": {

sass/_inputs.scss

@@ -2,7 +2,17 @@
 
 @import '_inputs-size';
 
-// usage: @include form-group-validation-state($input-danger);
+// must be broken out for reuse - webkit selector breaks firefox
+@mixin label-position($label-top, $static-font-size, $static-line-height){
+  label.control-label {
+    top: $label-top;
+    left: 0;
+    // must repeat because the selector above is more specific than the general label sizing
+    font-size: $static-font-size;
+    line-height: $static-line-height;
+  }
+}
+
 @mixin form-group-validation-state($name, $color){
 
   &.#{$name} { // e.g. has-error
@@ -75,16 +85,12 @@
   // static, focused, or autofill floating labels
   &.label-static,
   &.label-floating.is-focused,
-  &.label-floating:not(.is-empty),
+  &.label-floating:not(.is-empty) {
-  &.label-floating input.form-control:-webkit-autofill {
+    @include label-position($label-top, $static-font-size, $static-line-height);
-    & ~ label.control-label, // #559 webkit chrome autofill `.form-group.label-floating input.form-control:-webkit-autofill ~ label.control-label`
+  }
-    label.control-label {
+  // #559 Fix for webkit/chrome autofill - rule must be separate because it breaks firefox otherwise #731
-      top: $label-top;
+  &.label-floating input.form-control:-webkit-autofill ~ label.control-label {
-      left: 0;
+    @include label-position($label-top, $static-font-size, $static-line-height);
-      // must repeat because the selector above is more specific than the general label sizing
-      font-size: $static-font-size;
-      line-height: $static-line-height;
-    }
   }
 }