atualizando branch master

.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)
@@ -15,6 +19,11 @@
 - Added color variations on toggles
 - 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

@@ -216,7 +216,7 @@ module.exports = function(grunt) {
       },
       less: {
         files:["less/**/*.less"],
-        tasks: ["default"]
+        tasks: ["material:less"]
       },
       livereload: {
         options: {
@@ -295,12 +295,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", [
@@ -325,6 +321,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

@@ -188,6 +188,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/material.js

@@ -47,7 +47,7 @@
       $((selector) ? selector : this.options.checkboxElements)
       .filter(":notmdproc")
       .data("mdproc", true)
-      .after("<span class=ripple></span><span class=check></span>");
+      .after("<span class=checkbox-material><span class=check></span></span>");
     },
     "togglebutton": function(selector) {
       // Add fake-checkbox to material checkboxes

dist/js/material.min.js

@@ -1,2 +1,2 @@
-!function(a){function b(a){return"undefined"==typeof a.which?!0:"number"==typeof a.which&&a.which>0?!a.ctrlKey&&!a.metaKey&&!a.altKey&&8!=a.which&&9!=a.which:!1}a.expr[":"].notmdproc=function(b){return a(b).data("mdproc")?!1:!0},a.material={options:{input:!0,ripples:!0,checkbox:!0,togglebutton:!0,radio:!0,arrive:!0,autofill:!1,withRipples:[".btn:not(.btn-link)",".card-image",".navbar a:not(.withoutripple)",".dropdown-menu a",".nav-tabs a:not(.withoutripple)",".withripple"].join(","),inputElements:"input.form-control, textarea.form-control, select.form-control",checkboxElements:".checkbox > label > input[type=checkbox]",togglebuttonElements:".togglebutton > label > input[type=checkbox]",radioElements:".radio > label > input[type=radio]"},checkbox:function(b){a(b?b:this.options.checkboxElements).filter(":notmdproc").data("mdproc",!0).after("<span class=ripple></span><span class=check></span>")},togglebutton:function(b){a(b?b:this.options.togglebuttonElements).filter(":notmdproc").data("mdproc",!0).after("<span class=toggle></span>")},radio:function(b){a(b?b:this.options.radioElements).filter(":notmdproc").data("mdproc",!0).after("<span class=circle></span><span class=check></span>")},input:function(c){a(c?c:this.options.inputElements).filter(":notmdproc").data("mdproc",!0).each(function(){var b=a(this);if(a(this).attr("data-hint")||b.hasClass("floating-label")){if(b.wrap("<div class=form-control-wrapper></div>"),b.after("<span class=material-input></span>"),b.hasClass("floating-label")){var c=b.attr("placeholder");b.attr("placeholder",null).removeClass("floating-label"),b.after("<div class=floating-label>"+c+"</div>")}if(b.attr("data-hint")&&b.after("<div class=hint>"+b.attr("data-hint")+"</div>"),(null===b.val()||"undefined"==b.val()||""===b.val())&&b.addClass("empty"),b.parent().next().is("[type=file]")){b.parent().addClass("fileinput");var d=b.parent().next().detach();b.after(d)}}}),a(document).on("change",".checkbox input[type=checkbox]",function(){a(this).blur()}).on("keydown paste",".form-control",function(c){b(c)&&a(this).removeClass("empty")}).on("keyup change",".form-control",function(){var b=a(this);""===b.val()&&"undefined"!=typeof b[0].checkValidity&&b[0].checkValidity()?b.addClass("empty"):b.removeClass("empty")}).on("focus",".form-control-wrapper.fileinput",function(){a(this).find("input").addClass("focus")}).on("blur",".form-control-wrapper.fileinput",function(){a(this).find("input").removeClass("focus")}).on("change",".form-control-wrapper.fileinput [type=file]",function(){var b="";a.each(a(this)[0].files,function(a,c){b+=c.name+", "}),b=b.substring(0,b.length-2),b?a(this).prev().removeClass("empty"):a(this).prev().addClass("empty"),a(this).prev().val(b)})},ripples:function(b){a(b?b:this.options.withRipples).ripples()},autofill:function(){var b=setInterval(function(){a("input[type!=checkbox]").each(function(){a(this).val()&&a(this).val()!==a(this).attr("value")&&a(this).trigger("change")})},100);setTimeout(function(){clearInterval(b)},1e4);var c;a(document).on("focus","input",function(){var b=a(this).parents("form").find("input").not("[type=file]");c=setInterval(function(){b.each(function(){a(this).val()!==a(this).attr("value")&&a(this).trigger("change")})},100)}).on("blur","input",function(){clearInterval(c)})},init:function(){a.fn.ripples&&this.options.ripples&&this.ripples(),this.options.input&&this.input(),this.options.checkbox&&this.checkbox(),this.options.togglebutton&&this.togglebutton(),this.options.radio&&this.radio(),this.options.autofill&&this.autofill(),document.arrive&&this.options.arrive&&(a.fn.ripples&&this.options.ripples&&a(document).arrive(this.options.withRipples,function(){a.material.ripples(a(this))}),this.options.input&&a(document).arrive(this.options.inputElements,function(){a.material.input(a(this))}),this.options.checkbox&&a(document).arrive(this.options.checkboxElements,function(){a.material.checkbox(a(this))}),this.options.radio&&a(document).arrive(this.options.radioElements,function(){a.material.radio(a(this))}),this.options.togglebutton&&a(document).arrive(this.options.togglebuttonElements,function(){a.material.togglebutton(a(this))}))}}}(jQuery);
+!function(a){function b(a){return"undefined"==typeof a.which?!0:"number"==typeof a.which&&a.which>0?!a.ctrlKey&&!a.metaKey&&!a.altKey&&8!=a.which&&9!=a.which:!1}a.expr[":"].notmdproc=function(b){return a(b).data("mdproc")?!1:!0},a.material={options:{input:!0,ripples:!0,checkbox:!0,togglebutton:!0,radio:!0,arrive:!0,autofill:!1,withRipples:[".btn:not(.btn-link)",".card-image",".navbar a:not(.withoutripple)",".dropdown-menu a",".nav-tabs a:not(.withoutripple)",".withripple"].join(","),inputElements:"input.form-control, textarea.form-control, select.form-control",checkboxElements:".checkbox > label > input[type=checkbox]",togglebuttonElements:".togglebutton > label > input[type=checkbox]",radioElements:".radio > label > input[type=radio]"},checkbox:function(b){a(b?b:this.options.checkboxElements).filter(":notmdproc").data("mdproc",!0).after("<span class=checkbox-material><span class=check></span></span>")},togglebutton:function(b){a(b?b:this.options.togglebuttonElements).filter(":notmdproc").data("mdproc",!0).after("<span class=toggle></span>")},radio:function(b){a(b?b:this.options.radioElements).filter(":notmdproc").data("mdproc",!0).after("<span class=circle></span><span class=check></span>")},input:function(c){a(c?c:this.options.inputElements).filter(":notmdproc").data("mdproc",!0).each(function(){var b=a(this);if(a(this).attr("data-hint")||b.hasClass("floating-label")){if(b.wrap("<div class=form-control-wrapper></div>"),b.after("<span class=material-input></span>"),b.hasClass("floating-label")){var c=b.attr("placeholder");b.attr("placeholder",null).removeClass("floating-label"),b.after("<div class=floating-label>"+c+"</div>")}if(b.attr("data-hint")&&b.after("<div class=hint>"+b.attr("data-hint")+"</div>"),(null===b.val()||"undefined"==b.val()||""===b.val())&&b.addClass("empty"),b.parent().next().is("[type=file]")){b.parent().addClass("fileinput");var d=b.parent().next().detach();b.after(d)}}}),a(document).on("change",".checkbox input[type=checkbox]",function(){a(this).blur()}).on("keydown paste",".form-control",function(c){b(c)&&a(this).removeClass("empty")}).on("keyup change",".form-control",function(){var b=a(this);""===b.val()&&"undefined"!=typeof b[0].checkValidity&&b[0].checkValidity()?b.addClass("empty"):b.removeClass("empty")}).on("focus",".form-control-wrapper.fileinput",function(){a(this).find("input").addClass("focus")}).on("blur",".form-control-wrapper.fileinput",function(){a(this).find("input").removeClass("focus")}).on("change",".form-control-wrapper.fileinput [type=file]",function(){var b="";a.each(a(this)[0].files,function(a,c){b+=c.name+", "}),b=b.substring(0,b.length-2),b?a(this).prev().removeClass("empty"):a(this).prev().addClass("empty"),a(this).prev().val(b)})},ripples:function(b){a(b?b:this.options.withRipples).ripples()},autofill:function(){var b=setInterval(function(){a("input[type!=checkbox]").each(function(){a(this).val()&&a(this).val()!==a(this).attr("value")&&a(this).trigger("change")})},100);setTimeout(function(){clearInterval(b)},1e4);var c;a(document).on("focus","input",function(){var b=a(this).parents("form").find("input").not("[type=file]");c=setInterval(function(){b.each(function(){a(this).val()!==a(this).attr("value")&&a(this).trigger("change")})},100)}).on("blur","input",function(){clearInterval(c)})},init:function(){a.fn.ripples&&this.options.ripples&&this.ripples(),this.options.input&&this.input(),this.options.checkbox&&this.checkbox(),this.options.togglebutton&&this.togglebutton(),this.options.radio&&this.radio(),this.options.autofill&&this.autofill(),document.arrive&&this.options.arrive&&(a.fn.ripples&&this.options.ripples&&a(document).arrive(this.options.withRipples,function(){a.material.ripples(a(this))}),this.options.input&&a(document).arrive(this.options.inputElements,function(){a.material.input(a(this))}),this.options.checkbox&&a(document).arrive(this.options.checkboxElements,function(){a.material.checkbox(a(this))}),this.options.radio&&a(document).arrive(this.options.radioElements,function(){a.material.radio(a(this))}),this.options.togglebutton&&a(document).arrive(this.options.togglebuttonElements,function(){a.material.togglebutton(a(this))}))}}}(jQuery);
 //# sourceMappingURL=material.min.js.map

dist/js/material.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"material.min.js","sources":["material.js"],"names":["$","_isChar","evt","which","ctrlKey","metaKey","altKey","expr","notmdproc","obj","data","material","options","input","ripples","checkbox","togglebutton","radio","arrive","autofill","withRipples","join","inputElements","checkboxElements","togglebuttonElements","radioElements","selector","this","filter","after","each","$this","attr","hasClass","wrap","placeholder","removeClass","val","addClass","parent","next","is","$input","detach","document","on","blur","e","checkValidity","find","value","files","i","file","name","substring","length","prev","loading","setInterval","trigger","setTimeout","clearInterval","focused","$inputs","parents","not","init","fn","jQuery"],"mappings":"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"}
+{"version":3,"file":"material.min.js","sources":["material.js"],"names":["$","_isChar","evt","which","ctrlKey","metaKey","altKey","expr","notmdproc","obj","data","material","options","input","ripples","checkbox","togglebutton","radio","arrive","autofill","withRipples","join","inputElements","checkboxElements","togglebuttonElements","radioElements","selector","this","filter","after","each","$this","attr","hasClass","wrap","placeholder","removeClass","val","addClass","parent","next","is","$input","detach","document","on","blur","e","checkValidity","find","value","files","i","file","name","substring","length","prev","loading","setInterval","trigger","setTimeout","clearInterval","focused","$inputs","parents","not","init","fn","jQuery"],"mappings":"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"}

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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"}

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();
     }
@@ -77,8 +86,9 @@
         &.btn-fab-mini {
             width: 40px;
             height: 40px;
-      padding: 13px;
+            padding: 13px 9px;
             font-size: 15px;
+            box-sizing: border-box;
         }
         i {
             position: relative;

less/_checkboxes.less

@@ -2,63 +2,53 @@
   padding-top: 20px;
 }
 .checkbox {
+  transform: translateZ(0); // Force 3d rendering
   label {
-        padding-left: 10px;
     cursor: pointer;
-        position: relative;
+    padding-left: 0; // Reset for Bootstrap rule
-        span {
-            display: block;
-            position: absolute;
-            left: 0px;
-            transition-duration: 0.2s;
   }
-        .ripple {
+
+  // Hide native checkbox
+  input[type=checkbox] {
+    opacity: 0;
+    position: absolute;
+    margin: 0;
+    z-index: -1;
+    width: 0;
+    height: 0;
+    overflow: hidden;
+    left: 0;
+    pointer-events: none;
+  }
+
+  .checkbox-material {
+    vertical-align: middle;
+    position: relative;
+    top: 3px;
+    &:before {
       display: block;
       position: absolute;
+      left: 0;
       content: "";
       background-color: rgba(0,0,0,.84);
-            left: -8px;
+      height: @checkbox-size;
-            top: -11px;
+      width: @checkbox-size;
-            height: 50px;
-            width: 50px;
       border-radius: 100%;
       z-index: 1;
       opacity: 0;
       margin: 0;
-        }
+      transform: scale3d(2.3, 2.3, 1);
-
-        input[type=checkbox]:not(:checked) ~ .ripple {
-            animation: rippleOff 500ms;
-        }
-        input[type=checkbox]:checked ~ .ripple {
-            animation: rippleOn 500ms;
     }
 
     .check {
+      position: relative;
       display: inline-block;
-            width: 20px;
+      width: @checkbox-size;
-            height: 20px;
+      height: @checkbox-size;
       border: 2px solid;
       border-radius: 2px;
       overflow: hidden;
-            position: relative;
-            top: 5px;
-            left: -3px;
-            margin-right: 11px;
-        }
-        .check:after {
-            display: block;
-            position: absolute;
-            content: "";
-            background-color: @lightbg-text;
-            left: -5px;
-            top: -15px;
-            height: 50px;
-            width: 50px;
-            border-radius: 100%;
       z-index: 1;
-            opacity: 0;
-            margin: 0;
     }
     .check:before {
       position: absolute;
@@ -76,23 +66,15 @@
         0 0 0 0,
         0 0 0 0,
         0 0 0 0,
-                0px 0px 0 0px inset;
+        0 0 0 0 inset;
-            animation: checkbox-off 0.3s linear forwards;
+      animation: checkbox-off @checkbox-animation-check forwards;
     }
   }
 
-
+  input[type=checkbox]:focus + .checkbox-material .check:after {
-    // Hide native checkbox
-    input[type=checkbox] { opacity: 0; }
-
-
-    input[type=checkbox]:focus ~ .check:after {
     opacity: 0.2;
   }
-
+  input[type=checkbox]:checked + .checkbox-material .check:before {
-    input[type=checkbox]:checked ~ .check {
-    }
-    input[type=checkbox]:checked ~ .check:before {
     box-shadow:
       0 0 0 10px,
       10px -10px 0 10px,
@@ -100,37 +82,37 @@
       0px 32px 0 20px,
       -5px 5px 0 10px,
       20px -12px 0 11px;
-        animation: checkbox-on 0.3s linear forwards;
+    animation: checkbox-on @checkbox-animation-check forwards;
+  }
+
+  input[type=checkbox]:not(:checked) + .checkbox-material:before {
+    animation: rippleOff @checkbox-animation-ripple;
+  }
+  input[type=checkbox]:checked + .checkbox-material:before {
+    animation: rippleOn @checkbox-animation-ripple;
   }
 
   // Ripple effect on click
-    input[type=checkbox]:not(:checked) ~ .check:after {
+  input[type=checkbox]:not(:checked) + .checkbox-material .check:after {
-        animation: rippleOff 500ms linear forwards;
+    animation: rippleOff @checkbox-animation-ripple forwards;
-    }
-    input[type=checkbox]:checked ~ .check:after {
-        animation: rippleOn 500ms linear forwards;
-    }
-
-    // Make animate quickly when not hover
-    &:not(:hover) input[type=checkbox] ~ .check {
-        &:before, &:after {
-            animation-duration: 1ms;
   }
+  input[type=checkbox]:checked + .checkbox-material .check:after {
+    animation: rippleOn @checkbox-animation-ripple forwards;
   }
 
   // Style for disabled inputs
-    input[type=checkbox][disabled]:not(:checked) ~ .check:before,
+  input[type=checkbox][disabled]:not(:checked) ~ .checkbox-material .check:before,
-    input[type=checkbox][disabled] ~ .circle {
+  input[type=checkbox][disabled] + .circle {
     opacity: 0.5;
   }
-    input[type=checkbox][disabled] ~ .check:after {
+  input[type=checkbox][disabled] + .checkbox-material .check:after {
     background-color: @lightbg-text;
     transform: rotate(-45deg);
   }
 
-    .variations(~" input[type=checkbox]:checked ~ .check:after", background-color, @success);
+  .variations(~" input[type=checkbox]:checked + .checkbox-material .check:after", background-color, @success);
-    .variations(~" input[type=checkbox]:checked ~ .check:before", color, #4caf50);
+  .variations(~" input[type=checkbox]:checked + .checkbox-material .check:before", color, #4caf50);
-    .variations(~" input[type=checkbox]:checked ~ .check", color, #4caf50);
+  .variations(~" input[type=checkbox]:checked + .checkbox-material .check", color, #4caf50);
 }
 
 

less/_dialogs.less

@@ -2,10 +2,48 @@
 // Modals
 // Material Design element Dialogs
 // --------------------------------------------------
+/*
+.modal-dialog {
+    position: relative;
+    width: auto;
+    margin: 2%;
+    max-height: 94%;
+    box-sizing: border-box;
+    overflow: auto;
+
+    *
+      *Scroll
+      
+    &::-webkit-scrollbar {
+        width: 8px;
+        border-radius: 5px;
+
+    }
+     Fundo da barra de rolagem 
+    &::-webkit-scrollbar-track-piece {
+        background-color: #EEE;
+        border-radius: 0px 5px 5px 0px;
+    }
+
+     Cor do indicador de rolagem 
+    &::-webkit-scrollbar-thumb:vertical,
+        &::-webkit-scrollbar-thumb:horizontal {
+        background-color: #CCC;
+        border-radius: 5px;
+    }
+
+     Cor do indicador de rolagem - ao passar o mouse 
+    &::-webkit-scrollbar-thumb:vertical:hover,
+        &::-webkit-scrollbar-thumb:horizontal:hover {
+        background-color: #ccc
+    }
+}*/
+
 .modal-content {
     .shadow-z-5();
     border-radius: 2px;
     border: none;
+    box-sizing: border-box;
     // Modal header
     // Top section of the modal w/ title and dismiss
     .modal-header {
@@ -18,10 +56,11 @@
     // Modal body
     // Where all modal content resides (sibling of .modal-header and .modal-footer)
     .modal-body {
-    padding-top:    0px;
+        padding-top: 24px;
         padding-right: 24px;
         padding-bottom: 16px;
         padding-left: 24px;
+        box-sizing: border-box;
     }
     // Footer (for actions)
     .modal-footer {

less/_icons.less

@@ -3,3 +3,21 @@
     line-height: inherit;
     vertical-align: bottom;
 }
+
+.btn:not(.btn-fab) {
+    [class^=mdi-],  
+    [class*=mdi-] {
+        position: relative;
+        float: left;        
+        top: 50%;
+        margin-right: 5px;
+        margin-left: -12px;
+        margin-top: -3px;
+
+        &.icon-right{
+            float: right;
+            margin-right: -12px;
+            margin-left: 5px;
+        }
+    }  
+}

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,24 +26,41 @@ 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);
+  &::-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;
   box-shadow: none;
   background-size: 0 2px, 100% 1px;
@@ -51,30 +71,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;
     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 +148,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 +161,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 +173,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 +185,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 +197,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);
 
 }
 

less/_lists.less

@@ -5,16 +5,7 @@
     overflow: hidden;
     border: 0;
     border-radius: 0;
-    /* padding: 0 16px; */
+    padding: 0 16px;
-    &.baseline {
-      border-bottom: 1px solid #cecece;
-      margin-bottom: 1px;
-      
-      &:last-child {
-        border-bottom: none;
-      }
-    }
-
     .row-picture, .row-action-primary {
       float: left;
       display: inline-block;
@@ -44,6 +35,9 @@
         margin-right: -7px;
         margin-top: 5px;
         margin-bottom: -5px;
+        .checkbox-material {
+          left: -10px;
+        }
       }
     }
     .row-content {

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, {
-    background-color: fade(@material-color, 10%);
+    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;
@@ -86,3 +82,16 @@
 
 @text-disabled: #a8a8a8;
 @background-disabled: #eaeaea;
+
+// Checkboxes
+@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": {

sass/_buttons.scss

@@ -34,6 +34,9 @@
         @extend .shadow-z-3;
     }
     outline: none !important;
+
+
+
 }
 // This is needed to style buttons which has not a variation suffix (they must stiled as btn-default)
 .btn-link, .btn:not([class^="btn btn-"]), .btn-default {
@@ -101,8 +104,9 @@
     &.btn-mini {
         width: 40px;
         height: 40px;
-        padding: 13px;
+        padding: 13px 9px;
         font-size: 15px;
+        box-sizing: border-box;
     }
 }
 

scripts/material.js

@@ -47,7 +47,7 @@
       $((selector) ? selector : this.options.checkboxElements)
       .filter(":notmdproc")
       .data("mdproc", true)
-      .after("<span class=ripple></span><span class=check></span>");
+      .after("<span class=checkbox-material><span class=check></span></span>");
     },
     "togglebutton": function(selector) {
       // Add fake-checkbox to material checkboxes

scripts/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;
       }
 
 

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();
-    });
-});