Merge pull request #4 from FezVrasta/master

Updating fork

.versions

@@ -0,0 +1,27 @@
+application-configuration@1.0.4
+base64@1.0.2
+binary-heap@1.0.2
+callback-hook@1.0.2
+check@1.0.4
+ddp@1.0.14
+ejson@1.0.5
+fezvrasta:bootstrap-material-design@0.3.0-dev
+follower-livedata@1.0.3
+geojson-utils@1.0.2
+http@1.0.10
+id-map@1.0.2
+jquery@1.11.3
+json@1.0.2
+local-test:fezvrasta:bootstrap-material-design@0.3.0-dev
+logging@1.0.6
+meteor@1.1.4
+minimongo@1.0.6
+mongo@1.0.11
+ordered-dict@1.0.2
+random@1.0.2
+retry@1.0.2
+tinytest@1.0.4
+tracker@1.0.5
+twbs:bootstrap@3.3.1
+underscore@1.0.2
+url@1.0.3

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## v 0.3.0 dev
+## v 0.3.1-dev
+
+- Fixed #504 (input-lg and input-sm classes now work)
+
+## v 0.3.0
 
 - Implemented full color palette from Material Design specifications (thanks @korgan00)
 - Reformat of `ripples.js` (thanks @grvcoelho)
@@ -16,6 +20,10 @@
 - Improved shadows to better fit Material Design specs
 - Improved hover state of buttons
 - Material Checkboxes now are a single inline element `.checkbox-material`, this helps when you need to vertical align them
+- Fixed Material Design icons (thanks @jmillspaysbills and @GradyD)
+- Fixed behavior of floating labels and inputs
+- Fixed several bugs
+- Updated Meteor packages
 
 ## v 0.2.1
 

Gruntfile.js

@@ -294,12 +294,8 @@ module.exports = function(grunt) {
     "uglify:ripples"
   ]);
 
-  grunt.registerTask("build", function(target) {
+  grunt.registerTask("build", function() {
-    var buildType = "default";
+    grunt.task.run(["newer:jshint", "default"]);
-    if (target && target === "scss") {
-      buildType = "scss";
-    }
-    grunt.task.run(["newer:jshint", "jasmine:scripts", buildType]);
   });
 
   grunt.registerTask("test", [
@@ -324,6 +320,6 @@ module.exports = function(grunt) {
   grunt.registerTask("meteor-publish", ["exec:meteor-init", "exec:meteor-publish", "exec:meteor-cleanup"]);
   grunt.registerTask("meteor", ["exec:meteor-init", "exec:meteor-test", "exec:meteor-publish", "exec:meteor-cleanup"]);
 
-  grunt.registerTask("cibuild", ["newer:jshint", "jasmine:scripts", "meteor-test"]);
+  grunt.registerTask("cibuild", ["newer:jshint", "meteor-test"]);
 
 };

README.md

@@ -125,6 +125,50 @@ The syntax to add a Material icon is:
 
      <i class="icon icon-material-favorite"></i>
 
+### Cards 
+
+A card will expand to fill all of the available width (e.g. column's width). Card's height will be automatically resized to match width.
+
+Here is an example on how to use it:
+
+    <div class="card">
+
+        <div class="card-height-indicator"></div>
+
+        <div class="card-content">
+
+            <div class="card-image">
+                <img src="./image.jpg" alt="Loading image...">
+                <h3 class="card-image-headline">Lorem Ipsum Dolor</h3>
+            </div>
+
+            <div class="card-body">
+                <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry.</p>
+            </div>
+
+            <footer class="card-footer">
+                <button class="btn btn-flat">Share</button>
+                <button class="btn btn-flat btn-warning">Learn More</button>
+            </footer>
+
+        </div>
+
+    </div>
+Cards will adapt to column's width. The card below will have width equal to col-lg-6:
+
+    <div class="row">
+        <div class="col-lg-3"></div>
+
+        <div class="col-lg-6">
+            <div class="card">
+                ...
+            </div>
+        </div>
+
+        <div class="col-lg-3"></div>
+    </div>
+
+
 ## Material.js
 
 `Material.js` is a jQuery plugin that adds some magic to your markup and allows Material Design for Bootstrap to style some elements like inputs, checkboxes, radios etc.
@@ -188,6 +232,11 @@ Read more about [Dropdown.js here](https://github.com/FezVrasta/dropdown.js).
 Transform select and multi-select inputs into advanced text inputs. Material Design for BS provides a full replacement of the plugin's CSS, so don't include it.
 Read more about [selectize.js](http://brianreavis.github.io/selectize.js/).
 
+### Bootstrap Material Datepicker
+
+A Material Design datepicker created to be used with Material Design for Bootstrap.  
+Read more about [Bootstrap Material Datepicker](https://github.com/T00rk/bootstrap-material-datepicker)
+
 ## Compatibility
 
 Currently, Material Design for Bootstrap supports Google Chrome (tested v37+), Mozilla Firefox (tested 30+), and Internet Explorer (tested 11+). Mobile browsers are not currently tested but they may work.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-material-design",
-  "version": "0.2.0",
+  "version": "0.3.1-dev",
   "homepage": "http://fezvrasta.github.io/bootstrap-material-design",
   "authors": [
     "Federico Zivolo <info@mywebexpression.com>"

dist/js/ripples.js

@@ -51,7 +51,7 @@
        * Verify if the user is just touching on a device and return if so
        */
       if(self.isTouch() && event.type === "mousedown") {
-        return false;
+        return;
       }
 
 

dist/js/ripples.min.js

@@ -1,2 +1,2 @@
-!function(a,b,c,d){"use strict";function e(b,c){g=this,this.element=a(b),this.options=a.extend({},h,c),this._defaults=h,this._name=f,this.init()}var f="ripples",g=null,h={};e.prototype.init=function(){var c=this.element;c.on("mousedown touchstart",function(d){if(g.isTouch()&&"mousedown"===d.type)return!1;c.find(".ripple-wrapper").length||c.append('<div class="ripple-wrapper"></div>');var e=c.children(".ripple-wrapper"),f=g.getRelY(e,d),h=g.getRelX(e,d);if(f||h){var i=g.getRipplesColor(c),j=a("<div></div>");j.addClass("ripple").css({left:h,top:f,"background-color":i}),e.append(j),function(){return b.getComputedStyle(j[0]).opacity}(),g.rippleOn(c,j),setTimeout(function(){g.rippleEnd(j)},500),c.on("mouseup mouseleave touchend",function(){j.data("mousedown","off"),"off"===j.data("animating")&&g.rippleOut(j)})}})},e.prototype.getNewSize=function(a,b){return Math.max(a.outerWidth(),a.outerHeight())/b.outerWidth()*2.5},e.prototype.getRelX=function(a,b){var c=a.offset();return g.isTouch()?(b=b.originalEvent,1!==b.touches.length?b.touches[0].pageX-c.left:!1):b.pageX-c.left},e.prototype.getRelY=function(a,b){var c=a.offset();return g.isTouch()?(b=b.originalEvent,1!==b.touches.length?b.touches[0].pageY-c.top:!1):b.pageY-c.top},e.prototype.getRipplesColor=function(a){var c=a.data("ripple-color")?a.data("ripple-color"):b.getComputedStyle(a[0]).color;return c},e.prototype.hasTransitionSupport=function(){var a=c.body||c.documentElement,b=a.style,e=b.transition!==d||b.WebkitTransition!==d||b.MozTransition!==d||b.MsTransition!==d||b.OTransition!==d;return e},e.prototype.isTouch=function(){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)},e.prototype.rippleEnd=function(a){a.data("animating","off"),"off"===a.data("mousedown")&&g.rippleOut(a)},e.prototype.rippleOut=function(a){a.off(),g.hasTransitionSupport()?a.addClass("ripple-out"):a.animate({opacity:0},100,function(){a.trigger("transitionend")}),a.on("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd",function(){a.remove()})},e.prototype.rippleOn=function(a,b){var c=g.getNewSize(a,b);g.hasTransitionSupport()?b.css({"-ms-transform":"scale("+c+")","-moz-transform":"scale("+c+")","-webkit-transform":"scale("+c+")",transform:"scale("+c+")"}).addClass("ripple-on").data("animating","on").data("mousedown","on"):b.animate({width:2*Math.max(a.outerWidth(),a.outerHeight()),height:2*Math.max(a.outerWidth(),a.outerHeight()),"margin-left":-1*Math.max(a.outerWidth(),a.outerHeight()),"margin-top":-1*Math.max(a.outerWidth(),a.outerHeight()),opacity:.2},500,function(){b.trigger("transitionend")})},a.fn.ripples=function(b){return this.each(function(){a.data(this,"plugin_"+f)||a.data(this,"plugin_"+f,new e(this,b))})}}(jQuery,window,document);
+!function(a,b,c,d){"use strict";function e(b,c){g=this,this.element=a(b),this.options=a.extend({},h,c),this._defaults=h,this._name=f,this.init()}var f="ripples",g=null,h={};e.prototype.init=function(){var c=this.element;c.on("mousedown touchstart",function(d){if(!g.isTouch()||"mousedown"!==d.type){c.find(".ripple-wrapper").length||c.append('<div class="ripple-wrapper"></div>');var e=c.children(".ripple-wrapper"),f=g.getRelY(e,d),h=g.getRelX(e,d);if(f||h){var i=g.getRipplesColor(c),j=a("<div></div>");j.addClass("ripple").css({left:h,top:f,"background-color":i}),e.append(j),function(){return b.getComputedStyle(j[0]).opacity}(),g.rippleOn(c,j),setTimeout(function(){g.rippleEnd(j)},500),c.on("mouseup mouseleave touchend",function(){j.data("mousedown","off"),"off"===j.data("animating")&&g.rippleOut(j)})}}})},e.prototype.getNewSize=function(a,b){return Math.max(a.outerWidth(),a.outerHeight())/b.outerWidth()*2.5},e.prototype.getRelX=function(a,b){var c=a.offset();return g.isTouch()?(b=b.originalEvent,1!==b.touches.length?b.touches[0].pageX-c.left:!1):b.pageX-c.left},e.prototype.getRelY=function(a,b){var c=a.offset();return g.isTouch()?(b=b.originalEvent,1!==b.touches.length?b.touches[0].pageY-c.top:!1):b.pageY-c.top},e.prototype.getRipplesColor=function(a){var c=a.data("ripple-color")?a.data("ripple-color"):b.getComputedStyle(a[0]).color;return c},e.prototype.hasTransitionSupport=function(){var a=c.body||c.documentElement,b=a.style,e=b.transition!==d||b.WebkitTransition!==d||b.MozTransition!==d||b.MsTransition!==d||b.OTransition!==d;return e},e.prototype.isTouch=function(){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)},e.prototype.rippleEnd=function(a){a.data("animating","off"),"off"===a.data("mousedown")&&g.rippleOut(a)},e.prototype.rippleOut=function(a){a.off(),g.hasTransitionSupport()?a.addClass("ripple-out"):a.animate({opacity:0},100,function(){a.trigger("transitionend")}),a.on("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd",function(){a.remove()})},e.prototype.rippleOn=function(a,b){var c=g.getNewSize(a,b);g.hasTransitionSupport()?b.css({"-ms-transform":"scale("+c+")","-moz-transform":"scale("+c+")","-webkit-transform":"scale("+c+")",transform:"scale("+c+")"}).addClass("ripple-on").data("animating","on").data("mousedown","on"):b.animate({width:2*Math.max(a.outerWidth(),a.outerHeight()),height:2*Math.max(a.outerWidth(),a.outerHeight()),"margin-left":-1*Math.max(a.outerWidth(),a.outerHeight()),"margin-top":-1*Math.max(a.outerWidth(),a.outerHeight()),opacity:.2},500,function(){b.trigger("transitionend")})},a.fn.ripples=function(b){return this.each(function(){a.data(this,"plugin_"+f)||a.data(this,"plugin_"+f,new e(this,b))})}}(jQuery,window,document);
 //# sourceMappingURL=ripples.min.js.map

dist/js/ripples.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"ripples.min.js","sources":["ripples.js"],"names":["$","window","document","undefined","Ripples","element","options","self","this","extend","defaults","_defaults","_name","ripples","init","prototype","$element","on","event","isTouch","type","find","append","$wrapper","children","relY","getRelY","relX","getRelX","rippleColor","getRipplesColor","$ripple","addClass","css","left","top","background-color","getComputedStyle","opacity","rippleOn","setTimeout","rippleEnd","data","rippleOut","getNewSize","Math","max","outerWidth","outerHeight","wrapperOffset","offset","originalEvent","touches","length","pageX","pageY","color","hasTransitionSupport","thisBody","body","documentElement","thisStyle","style","support","transition","WebkitTransition","MozTransition","MsTransition","OTransition","test","navigator","userAgent","off","animate","trigger","remove","size","-ms-transform","-moz-transform","-webkit-transform","transform","width","height","margin-left","margin-top","fn","each","jQuery"],"mappings":"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"}
+{"version":3,"file":"ripples.min.js","sources":["ripples.js"],"names":["$","window","document","undefined","Ripples","element","options","self","this","extend","defaults","_defaults","_name","ripples","init","prototype","$element","on","event","isTouch","type","find","append","$wrapper","children","relY","getRelY","relX","getRelX","rippleColor","getRipplesColor","$ripple","addClass","css","left","top","background-color","getComputedStyle","opacity","rippleOn","setTimeout","rippleEnd","data","rippleOut","getNewSize","Math","max","outerWidth","outerHeight","wrapperOffset","offset","originalEvent","touches","length","pageX","pageY","color","hasTransitionSupport","thisBody","body","documentElement","thisStyle","style","support","transition","WebkitTransition","MozTransition","MsTransition","OTransition","test","navigator","userAgent","off","animate","trigger","remove","size","-ms-transform","-moz-transform","-webkit-transform","transform","width","height","margin-left","margin-top","fn","each","jQuery"],"mappings":"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"}

index.html

@@ -175,11 +175,24 @@
               <br>
               <p>If you want support the development of this project please consider donate something:</p>
               <a href="https://www.gratipay.com/FezVrasta/" target="_blank" class="btn btn-primary">Donate with Gratipay</a>
-              <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank" style="display: inline-block;">
+              <form action="https://www.paypal.com/cgi-bin/webscr" id="paypal" method="post" target="_blank" style="display: inline-block;">
                 <input type="hidden" name="cmd" value="_s-xclick">
-                <input type="hidden" name="hosted_button_id" value="ZLAZFNZVV5QL6">
+                <div class="btn btn-primary">
-                <input type="submit" class="btn btn-primary" value="Donate with PayPal" name="submit">
+                  <select name="hosted_button_id" title="I can't accept less than 5 euro due to accounting troubles">
+                    <option value="DAAK965W2DKYE">&euro; 5,00</option>
+                    <option value="28PH77JK5QWFE">&euro; 10,00</option>
+                    <option value="6B6TJAJ2R99HS">&euro; 15,00</option>
+                    <option value="GJCEKCQFMBVHA">&euro; 20,00</option>
+                    <option value="U7QXM95C8RJ9W">&euro; 25,00</option>
+                    <option value="55S3VBB3U4NAS">&euro; 50,00</option>
+                  </select>
+                  <input type="submit" value="DONATE WITH PAYPAL" name="submit">
+                </div>
               </form>
+              <style>
+                #paypal .btn { padding: 5px 30px 6px 30px; }
+                #paypal input { background: transparent; border: 0; }
+              </style>
               <p>Thanks to all the people that donate me weekly on Gratipay and all the ones which has donated on PayPal! You are great guys!</p>
 
               <br>

less/_buttons.less

@@ -52,6 +52,15 @@
     }
   }
 
+  // Size variations
+  &.btn-sm {
+    padding: 5px 20px;
+  }
+  &.btn-xs {
+    padding: 4px 15px;
+    font-size: 10px;
+  }
+
   &.btn-raised {
     .btn-shadow();
   }

less/_checkboxes.less

@@ -37,7 +37,7 @@
       z-index: 1;
       opacity: 0;
       margin: 0;
-      transform: scale(2.3);
+      transform: scale3d(2.3, 2.3, 1);
     }
 
     .check {

less/_inputs.less

@@ -1,8 +1,5 @@
-fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-control {
+fieldset[disabled] .form-control, .form-control {
   &, &:focus, &.focus {
-    &:not(textarea) {
-      height: 28px;
-    }
     padding: 0;
     float: none;
     border: 0;
@@ -15,6 +12,12 @@ fieldset[disabled] .form-control, .form-control-wrapper .form-control, .form-con
   }
 }
 
+fieldset[disabled] .form-control, .form-control {
+  &:textarea {
+    height: 40px;
+  }
+}
+
 select[multiple].form-control {
   &, &:focus, &.focus {
     height: 85px;
@@ -23,27 +26,45 @@ select[multiple].form-control {
 
 .form-control {
   border: 0;
-  background-image: linear-gradient(@primary, @primary), linear-gradient(#D2D2D2, #D2D2D2);
+  background-image: linear-gradient(@primary, @primary), linear-gradient(@input-underline-color, @input-underline-color);
   background-size: 0 2px, 100% 1px;
   background-repeat: no-repeat;
   background-position: center bottom, center calc(~"100% - 1px");
   background-color: transparent;
   background-color: rgba(0,0,0,0);
+  transition: background 0 ease-out;
+  &::-webkit-input-placeholder {
+    color: @input-placeholder-color;
+  }
+  &::-moz-placeholder {
+    color: @input-placeholder-color; 
+  }
+  &:-ms-input-placeholder {  
+    color: @input-placeholder-color;
+  }
 }
 .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
   background-color: transparent;
   background-color: rgba(0,0,0,0);
 }
-fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:disabled, .form-control:disabled, fieldset[disabled] .form-control:focus:disabled, .form-control-wrapper .form-control:focus:disabled, .form-control:focus:disabled, fieldset[disabled] .form-control.focus:disabled, .form-control-wrapper .form-control.focus:disabled, .form-control.focus:disabled {
+fieldset[disabled] .form-control:disabled, 
-  border: 0;
+.form-control-wrapper .form-control:disabled, 
+.form-control:disabled, 
+fieldset[disabled] .form-control:focus:disabled, 
+.form-control-wrapper .form-control:focus:disabled, 
+.form-control:focus:disabled, 
+fieldset[disabled] .form-control.focus:disabled, 
+.form-control-wrapper .form-control.focus:disabled, 
+.form-control.focus:disabled {
+  border: 0; // Ugly override of Bootstrap border
 }
 
 .form-control:focus, .form-control.focus {
   outline: none;
-  background-image: linear-gradient(@primary, @primary), linear-gradient(#D2D2D2, #D2D2D2);
+  background-image: linear-gradient(@primary, @primary), linear-gradient(@input-underline-color, @input-underline-color);
-  animation: input-highlight 0.5s forwards;
+  background-size: 100% 2px, 100% 1px;
   box-shadow: none;
-  background-size: 0 2px, 100% 1px;
+  transition-duration: 0.3s;
 }
 
 
@@ -51,30 +72,60 @@ fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:d
   position: relative;
 
   .floating-label {
-    color: #7E7E7E;
+    color: @input-placeholder-color;
-    font-size: 14px;
     position: absolute;
     pointer-events: none;
     left: 0px;
     top: 5px;
-    transition: 0.2s ease all;
+    transition: 0.3s ease all;
     opacity: 0;
-  }
+    .form-control:focus ~ &,
-  .form-control:not(.empty) ~ .floating-label {
+    .form-control:not(.empty) ~ & {
-    top: -10px;
-    font-size: 10px;
       opacity: 1;
     }
-  .form-control:focus:invalid ~ .floating-label, .form-control.focus:invalid ~ .floating-label {
+  }
+
+  // Input sizes
+  .floating-label { // base
+    font-size: @font-size-base;
+  }
+  .form-control:focus ~ .floating-label,
+  .form-control:not(.empty) ~ .floating-label {
+    top: @floating-label-size-ratio * -@font-size-base;
+    font-size: @floating-label-size-ratio * @font-size-base;
+  }
+
+  .input-sm + .floating-label { // small
+    font-size: @font-size-small;
+    top: 7px;
+  }
+  .form-control.input-sm:focus ~ .floating-label,
+  .form-control.input-sm:not(.empty) ~.floating-label {
+    top: @floating-label-size-ratio * -@font-size-small;
+    font-size: @floating-label-size-ratio * @font-size-small;
+  }
+
+  .input-lg + .floating-label {
+    font-size: @font-size-large;
+    top: 10px;
+  }
+  .form-control.input-lg:focus ~ .floating-label,
+  .form-control.input-lg:not(.empty) ~ .floating-label {
+    top: @floating-label-size-ratio * -@font-size-large;
+    font-size: @floating-label-size-ratio * @font-size-large;
+  }
+
+  .form-control:focus ~ .floating-label {
+    color: @primary;
+  }
+  .form-control:not(.empty):invalid ~ .floating-label, .form-control.focus:invalid ~ .floating-label {
     color: @input-danger;
   }
   .form-control:focus ~ .material-input:after, .form-control.focus ~ .material-input:after {
     background-color: @input-default;
   }
-  .form-control:focus:invalid ~ .material-input, .form-control.focus:invalid ~ .material-input {
+  .form-control:invalid {
-    &:before, &:after  {
+    background-image: linear-gradient(@input-danger, @input-danger), linear-gradient(@input-underline-color, @input-underline-color);
-      background-color: @input-danger;
-    }
   }
   .form-control.empty ~ .floating-label  {
     opacity: 1;
@@ -98,6 +149,11 @@ fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:d
     display: none;
   }
 
+  // Fix for OS X
+  select {
+    appearance: none;
+  }
+
 }
 
 .form-group {
@@ -106,10 +162,10 @@ fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:d
       box-shadow: none;
     }
     .material-input:focus, .form-control:focus, .form-control.focus {
-      background-image: linear-gradient(@input-warning, @input-warning), linear-gradient(#D2D2D2, #D2D2D2);
+      background-image: linear-gradient(@input-warning, @input-warning), linear-gradient(@input-underline-color, @input-underline-color);
       box-shadow: none;
     }
-    .control-label, input.form-control:not(.empty) ~ .floating-label {
+    .control-label, input.form-control:focus ~ .floating-label {
       color: @input-warning;
     }
   }
@@ -118,10 +174,10 @@ fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:d
       box-shadow: none;
     }
     .material-input:focus, .form-control:focus, .form-control.focus {
-      background-image: linear-gradient(@input-danger, @input-danger), linear-gradient(#D2D2D2, #D2D2D2);
+      background-image: linear-gradient(@input-danger, @input-danger), linear-gradient(@input-underline-color, @input-underline-color);
       box-shadow: none;
     }
-    .control-label, input.form-control:not(.empty) ~ .floating-label {
+    .control-label, input.form-control:focus ~ .floating-label {
       color: @input-danger;
     }
   }
@@ -130,10 +186,10 @@ fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:d
       box-shadow: none;
     }
     .material-input:focus, .form-control:focus, .form-control.focus {
-      background-image: linear-gradient(@input-success, @input-success), linear-gradient(#D2D2D2, #D2D2D2);
+      background-image: linear-gradient(@input-success, @input-success), linear-gradient(@input-underline-color, @input-underline-color);
       box-shadow: none;
     }
-    .control-label, input.form-control:not(.empty) ~ .floating-label {
+    .control-label, input.form-control:focus ~ .floating-label {
       color: @input-success;
     }
   }
@@ -142,21 +198,21 @@ fieldset[disabled] .form-control:disabled, .form-control-wrapper .form-control:d
       box-shadow: none;
     }
     .material-input:focus, .form-control:focus, .form-control.focus {
-      background-image: linear-gradient(@input-info, @input-info), linear-gradient(#D2D2D2, #D2D2D2);
+      background-image: linear-gradient(@input-info, @input-info), linear-gradient(@input-underline-color, @input-underline-color);
       box-shadow: none;
     }
-    .control-label, input.form-control:not(.empty) ~ .floating-label {
+    .control-label, input.form-control:focus ~ .floating-label {
       color: @input-info;
     }
   }
   .generic-variations(~" .form-control:focus", @primary, {
-    background-image: linear-gradient(@material-color, @material-color), linear-gradient(#D2D2D2, #D2D2D2);
+    background-image: linear-gradient(@material-color, @material-color), linear-gradient(@input-underline-color, @input-underline-color);
   });
   .generic-variations(~" .form-control.focus", @primary, {
-    background-image: linear-gradient(@material-color, @material-color), linear-gradient(#D2D2D2, #D2D2D2);
+    background-image: linear-gradient(@material-color, @material-color), linear-gradient(@input-underline-color, @input-underline-color);
   });
   .variations(~" .control-label", color, @lightbg-text);
-  .variations(~" input.form-control:not(.empty) ~ .floating-label", color, @input-default);
+  .variations(~" input.form-control:focus ~ .floating-label", color, @input-default);
 
 }
 
@@ -188,16 +244,6 @@ select.form-control {
   }
 }
 
-@keyframes input-highlight {
-  0% {
-    background-size: 0 2px, 100% 1px;
-  }
-
-  100% {
-    background-size: 100% 2px, 100% 1px;
-  }
-}
-
 // Input files (kinda hack)
 .form-control-wrapper input[type=file] {
   opacity: 0;

less/_panels.less

@@ -2,7 +2,7 @@
   border-radius: 2px;
   border: 0;
 
-  .variations(~" > .panel-heading", background-color, @lightgrey);
+  .variations(~" > .panel-heading", background-color, @grey-200);
   .shadow-z-1;
 }
 
@@ -17,5 +17,5 @@
   }
 }
 .panel-footer {
-  background-color: @lightgrey;
+  background-color: @grey-200;
 }

less/_plugin-nouislider.less

@@ -89,7 +89,7 @@
     display: inline-block;
 }
 .noUi-handle.noUi-active {
-    transform: scale(2.5);
+    transform: scale3d(2.5, 2.5, 1);
 }
 [disabled].noUi-slider{
     opacity: 0.5;

less/_popups.less

@@ -1,8 +1,10 @@
 .popover, .tooltip-inner {
-    background: #323232;
+  color: @popover-color;
-    color: #FFF;
+  line-height: 1em;
-    border-radius: 2px;
+  background: @popover-background;
-
+  border: none;
+  border-radius: @material-border-radius;
+  .shadow-z-1();
 }
 
 .tooltip, .tooltip.in {
@@ -10,16 +12,7 @@
 }
 
 .popover, .tooltip {
-    &.left .arrow:after, &.left .tooltip-arrow {
+  .arrow, .tooltip-arrow {
-        border-left-color: #323232;
+    display: none;
-    }
-    &.right .arrow:after, &.right .tooltip-arrow {
-        border-right-color: #323232;
-    }
-    &.top .arrow:after, &.top .tooltip-arrow {
-        border-top-color: #323232;
-    }
-    &.bottom .arrow:after, &.bottom .tooltip-arrow {
-        border-bottom-color: #323232;
   }
 }

less/_radios.less

@@ -24,7 +24,7 @@
       width: 15px;
       border-radius: 100%;
       background-color: @radio-default;
-      transform: scale(0);
+      transform: scale3d(0, 0, 0);
     }
     .check:after {
       display: block;
@@ -39,7 +39,7 @@
       z-index: 1;
       opacity: 0;
       margin: 0;
-      transform: scale(1.5);
+      transform: scale3d(1.5, 1.5, 1);
     }
     input[type=radio]:not(:checked) ~ .check:after {
       animation: rippleOff 500ms;
@@ -64,7 +64,7 @@
     overflow: hidden;
   }
   input[type=radio]:checked ~ .check {
-    transform: scale(0.55);
+    transform: scale3d(0.55, 0.55, 1);
   }
   input[type=radio][disabled] ~ .circle {
     border-color: @lightbg-text;

less/_togglebutton.less

@@ -7,14 +7,14 @@
     font-weight: 400;
     cursor: pointer;
     // Hide original checkbox
-    input[type=checkbox]:first-of-type {
+    input[type=checkbox] {
       opacity: 0;
       width: 0;
       height:0;
     }
     // Switch bg off and disabled
     .toggle,
-    input[type=checkbox][disabled]:first-of-type + .toggle {
+    input[type=checkbox][disabled] + .toggle {
       content: "";
       display: inline-block;
       width: 30px;
@@ -40,28 +40,28 @@
       transition: left 0.3s ease, background 0.3s ease, box-shadow 0.1s ease;
     }
     // Handle disabled
-    input[type=checkbox][disabled]:first-of-type + .toggle:after,
+    input[type=checkbox][disabled] + .toggle:after,
-    input[type=checkbox][disabled]:checked:first-of-type + .toggle:after{
+    input[type=checkbox][disabled]:checked + .toggle:after{
       background-color: #BDBDBD;
     }
     // Ripple off and disabled
-    input[type=checkbox]:first-of-type ~ .toggle:active:after,
+    input[type=checkbox] + .toggle:active:after,
-    input[type=checkbox][disabled]:first-of-type ~ .toggle:active:after {
+    input[type=checkbox][disabled] + .toggle:active:after {
       box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px rgba(0, 0, 0, 0.1);
     }
-    input[type=checkbox]:first-of-type:checked + .toggle:after {
+    input[type=checkbox]:checked + .toggle:after {
       left: 15px;
     }
   }
 
   // Switch bg on
-  .generic-variations(~" label input[type=checkbox]:first-of-type:checked + .toggle", @primary, {
+  .generic-variations(~" label input[type=checkbox]:checked + .toggle", @primary, {
     background-color: fade(@material-color, 50%);
   });
   // Handle on
-  .variations(~" label input[type=checkbox]:first-of-type:checked + .toggle:after", background-color, @primary);
+  .variations(~" label input[type=checkbox]:checked + .toggle:after", background-color, @primary);
   // Ripple on
-  .generic-variations(~" label input[type=checkbox]:first-of-type:checked ~ .toggle:active:after", @primary, {
+  .generic-variations(~" label input[type=checkbox]:checked + .toggle:active:after", @primary, {
     box-shadow: 0 1px 3px 1px rgba(0,0,0,0.4), 0 0 0 15px fade(@material-color, 10%);
   });
 }

less/_variables.less

@@ -1,33 +1,19 @@
 // material icons path
 @material-font-path: "../fonts";
 
-// Material colors palette
-@red: #F44336;
-@pink: #E91E63;
-@purple: #9C27B0;
-@deeppurple: #673AB7;
-@indigo: #3F51B5;
-@blue: #4285f4;
-@lightblue: #03A9F4;
-@cyan: #00BCD4;
-@teal: #009688;
-@lightgreen: #8BC34A;
-@lime: #CDDC39;
-@lightyellow: #FFEB3B;
-@orange: #FF9800;
-@deeporange: #FF5722;
-@grey: #9E9E9E;
-@bluegrey: #607D8B;
-@brown: #795548;
-@lightgrey: #ECECEC;
-
 // Bootstrap shades
-@primary: #009587;
+@primary: @teal;
-@success: #0F9D58;
+@success: @green;
-@info: @lightblue;
+@info: @light-blue;
-@warning: @deeporange;
+@warning: @deep-orange;
 @danger: @red;
 
+@brand-primary: @primary;
+@brand-success: @success;
+@brand-danger: @danger;
+@brand-warning: @warning;
+@brand-info: @info;
+
 // Typography elements for Material
 @darkbg-text: rgba(255,255,255,0.84);
 @lightbg-text: rgba(0,0,0,0.84);
@@ -35,6 +21,8 @@
 
 
 // Bootstrap variables
+@body-bg: #EEEEEE;
+
 @btn-default: transparent;
 @btn-default-text: @lightbg-text;
 
@@ -79,6 +67,14 @@
 @progress-warning: @warning;
 @progress-danger: @danger;
 
+@font-size-base: 14px;
+@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
+
+// Global Material variables
+@material-border-radius: 2px;
+@input-underline-color: #D2D2D2;
+
 // Card
 @card-body-text: @lightbg-text;
 @card-body-background: #fff;
@@ -91,3 +87,11 @@
 @checkbox-size: 20px;
 @checkbox-animation-ripple: 500ms;
 @checkbox-animation-check: 0.3s;
+
+// Popovers and Popups
+@popover-background: rgba(101, 101, 101, 0.9);
+@popover-color: #ececec;
+
+// Inputs
+@input-placeholder-color: #BDBDBD;
+@floating-label-size-ratio: 70 / 100;

less/_welljumbo.less

@@ -1,58 +1,11 @@
 body, .container, .container-fluid {
 
-  .well, .well:not([class^="well well-material-"]) {
-    &, .form-control {
-      color: @lightbg-text;
-    }
-    .floating-label {
-      color: #7e7e7e;
-    }
-    .form-control {
-      &::-webkit-input-placeholder {
-        color: #7e7e7e;
-      }
-      &::-moz-placeholder {
-        color: #7e7e7e;
-        opacity: 1;
-      }
-      &:-ms-input-placeholder {
-        color: #7e7e7e;
-      }
-    }
-    .option, .create {
-      color: @lightbg-text;
-    }
-  }
   .well.well-sm {
     padding: 10px;
   }
   .well.well-lg {
     padding: 26px;
   }
-
-  [class^="well well-material-"] {
-    &, .form-control, .floating-label {
-      color: @darkbg-text;
-    }
-    .form-control {
-      border-bottom-color: @darkbg-text;
-      &::-webkit-input-placeholder {
-        color: @darkbg-text;
-      }
-      &::-moz-placeholder {
-        color: @darkbg-text;
-        opacity: 1;
-      }
-      &:-ms-input-placeholder {
-        color: @darkbg-text;
-      }
-    }
-    // Rule to fix selectize plugin
-    .option, .create {
-      color: @lightbg-text;
-    }
-  }
-
   .well, .jumbotron {
 
     background-color: #fff;
@@ -64,7 +17,6 @@ body, .container, .container-fluid {
     p {
       font-weight: 300;
     }
-
     .variations(~"", background-color, #FFF);
   }
 }

less/material.less

@@ -2,15 +2,24 @@
 @import "_colors.less";
 @import "_mixins.less";
 @import "_icons-material-design.less";
-@import "_shadows.less";
 
 body {
-  background-color: #EEEEEE;
+  background-color: @body-bg;
   &.inverse {
     background: #333333;
     &, .form-control {
       color: @darkbg-text;
     }
+    .modal,
+    .panel-default,
+    .card {
+      &,
+      .form-control {
+        background-color: initial;
+        color: initial;
+      }
+    }
+
   }
 }
 
@@ -127,3 +136,7 @@ legend {
 @import "_plugin-nouislider.less";
 @import "_plugin-selectize.less";
 @import "_plugin-dropdownjs.less";
+
+// Material shadows
+// Place them on bottom of stylesheet to increase the importance of it and override other same-specificity selectors
+@import "_shadows.less";

meteor/example/packages/bootstrap-material-design

@@ -1 +0,0 @@
-../../../

meteor/package-fullpalette.js

@@ -0,0 +1,39 @@
+// package metadata file for Meteor.js
+'use strict';
+
+var packageName = 'fezvrasta:bootstrap-material-design-fullpalette';  // https://atmospherejs.com/fezvrasta/bootstrap-material-design-fullpalette
+var where = 'client';  // where to install: 'client' or 'server'. For both, pass nothing.
+
+var packageJson = JSON.parse(Npm.require("fs").readFileSync('package.json'));
+
+Package.describe({
+  name: packageName,
+  summary: 'FezVrasta\'s Bootstrap theme implementing Google\'s Material (Paper) Design',
+  version: packageJson.version,
+  git: 'https://github.com/fezvrasta/bootstrap-material-design.git'
+});
+
+Package.onUse(function (api) {
+  api.versionsFrom(['METEOR@0.9.0', 'METEOR@1.0']);
+  api.use('twbs:bootstrap@3.3.1');
+  api.use('jquery');
+  api.addFiles([
+    // we bundle all font files, but the client will request only one of them via the CSS @font-face rule
+    'dist/fonts/Material-Design-Icons.eot',  // IE8 or older
+    'dist/fonts/Material-Design-Icons.svg',  // SVG fallback for iOS < 5 - http://caniuse.com/#feat=svg-fonts, http://stackoverflow.com/a/11002874/126903
+    'dist/fonts/Material-Design-Icons.ttf',  // Android Browers 4.1, 4.3 - http://caniuse.com/#feat=ttf
+    'dist/fonts/Material-Design-Icons.woff', // Supported by all modern browsers
+    'dist/css/material-fullpalette.css',
+    'dist/css/ripples.css',
+    'dist/js/material.js',
+    'dist/js/ripples.js',
+    'meteor/init.js'
+  ], where);
+});
+
+Package.onTest(function (api) {
+  api.use(packageName, where);
+  api.use(['tinytest', 'http'], where);
+
+  api.addFiles('meteor/test.js', where);
+});

meteor/package-noglyph.js

@@ -23,7 +23,7 @@ Package.onUse(function (api) {
     'dist/fonts/Material-Design-Icons.svg',  // SVG fallback for iOS < 5 - http://caniuse.com/#feat=svg-fonts, http://stackoverflow.com/a/11002874/126903
     'dist/fonts/Material-Design-Icons.ttf',  // Android Browers 4.1, 4.3 - http://caniuse.com/#feat=ttf
     'dist/fonts/Material-Design-Icons.woff', // Supported by all modern browsers
-    'dist/css/material-wfont.css',           // includes @font-face rules to load the Roboto font
+    'dist/css/material.css',           // includes @font-face rules to load the Roboto font
     'dist/css/ripples.css',
     'dist/js/material.js',
     'dist/js/ripples.js',

meteor/package-noicons.js

@@ -18,7 +18,7 @@ Package.onUse(function (api) {
   api.use('twbs:bootstrap-noglyph@3.3.1');
   api.use('jquery');
   api.addFiles([
-    'dist/css/material-wfont.css',           // includes @font-face rules to load the Roboto font
+    'dist/css/material.css',           // includes @font-face rules to load the Roboto font
     'dist/css/ripples.css',
     'dist/js/material.js',
     'dist/js/ripples.js',

meteor/package.js

@@ -23,7 +23,7 @@ Package.onUse(function (api) {
     'dist/fonts/Material-Design-Icons.svg',  // SVG fallback for iOS < 5 - http://caniuse.com/#feat=svg-fonts, http://stackoverflow.com/a/11002874/126903
     'dist/fonts/Material-Design-Icons.ttf',  // Android Browers 4.1, 4.3 - http://caniuse.com/#feat=ttf
     'dist/fonts/Material-Design-Icons.woff', // Supported by all modern browsers
-    'dist/css/material.css',                 // includes only the primary color variations
+    'dist/css/material.css',
     'dist/css/ripples.css',
     'dist/js/material.js',
     'dist/js/ripples.js',

package.js

@@ -1,21 +1,21 @@
 // package metadata file for Meteor.js
 'use strict';
 
-var packageName = 'fezvrasta:bootstrap-material-design-noglyph';  // https://atmospherejs.com/fezvrasta/bootstrap-material-design-noglyph
+var packageName = 'fezvrasta:bootstrap-material-design';  // https://atmospherejs.com/fezvrasta/bootstrap-material-design
 var where = 'client';  // where to install: 'client' or 'server'. For both, pass nothing.
 
 var packageJson = JSON.parse(Npm.require("fs").readFileSync('package.json'));
 
 Package.describe({
   name: packageName,
-  summary: 'FezVrasta\'s Bootstrap Google Material Design theme. Material icons instead of Bootstrap glyphicons.',
+  summary: 'FezVrasta\'s Bootstrap theme implementing Google\'s Material (Paper) Design',
   version: packageJson.version,
   git: 'https://github.com/fezvrasta/bootstrap-material-design.git'
 });
 
 Package.onUse(function (api) {
   api.versionsFrom(['METEOR@0.9.0', 'METEOR@1.0']);
-  api.use('twbs:bootstrap-noglyph@3.3.1');
+  api.use('twbs:bootstrap@3.3.1');
   api.use('jquery');
   api.addFiles([
     // we bundle all font files, but the client will request only one of them via the CSS @font-face rule
@@ -23,7 +23,7 @@ Package.onUse(function (api) {
     'dist/fonts/Material-Design-Icons.svg',  // SVG fallback for iOS < 5 - http://caniuse.com/#feat=svg-fonts, http://stackoverflow.com/a/11002874/126903
     'dist/fonts/Material-Design-Icons.ttf',  // Android Browers 4.1, 4.3 - http://caniuse.com/#feat=ttf
     'dist/fonts/Material-Design-Icons.woff', // Supported by all modern browsers
-    'dist/css/material-wfont.css',           // includes @font-face rules to load the Roboto font
+    'dist/css/material.css',
     'dist/css/ripples.css',
     'dist/js/material.js',
     'dist/js/ripples.js',
@@ -35,5 +35,5 @@ Package.onTest(function (api) {
   api.use(packageName, where);
   api.use(['tinytest', 'http'], where);
 
-  api.addFiles('meteor/test.js', where);  // same test because we don't test the glyphicons in particular (that's the job of twbs:bootstrap)
+  api.addFiles('meteor/test.js', where);
 });

package.json

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

test/materialSpec.js

@@ -1,9 +0,0 @@
-'use strict';
-
-describe('Material', function (){
-
-    //Dummy test just to ensure tests are accurately configured
-    it('jquery should be loaded', function () {
-        //expect($).toBeDefined();
-    });
-});