Merge branch 'master' into gh-pages

CONTRIBUTING.md

@@ -9,3 +9,7 @@ It already includes every needed dependency and is based on the latest version o
 ## Grunt
 
 **Grunt!** Ok... when you edit something please run `grunt` to compile CSS and copy stuff in the correct folders. Thanks!
+
+## Before send a Pull Request
+
+We are developing in the `develop` branch, please send any PR to this branch.

README.md

@@ -1,3 +1,6 @@
+[![build status](https://travis-ci.org/FezVrasta/bootstrap-material-design.svg?branch=master)](https://travis-ci.org/FezVrasta/bootstrap-material-design)
+[![ghat status](http://mywebexpression.com:3001/status/initial/badge.png)](http://mywebexpression.com:3001/) (click to chat)
+
 [![banner](demo/imgs/banner.jpg)](#)
 
 This Bootstrap theme is an easy way to use the new [Material Design guidelines by Google](http://www.google.com/design/spec/material-design/introduction.html) in your Bootstrap 3 based application.
@@ -25,6 +28,17 @@ so this might not be true before the first stable release.
 Navigate to the `template/` folder in this repository, and you will see the `index.html` file, which has the CSS include statements, in the `head` section and the JS includes just before `body` section closes.
 You need to copy the `material/` folder to the root of your project, ensuring that all the files in your project can access the files through the relative URL, supplied in the CSS and the JS includes.
 
+## Development
+
+We are using grunt to automate the workflow and build process. Ensure you have nodejs installed and grunt-cli installed globally.
+After cloning the repo, run `npm install` to ensure you have all dev dependencies.
+
+Run the `grunt build` command to run the tests and compile the less/sass. See Gruntfile.js for details on targets.
+
+Run the `grunt test` command for browser based jasmine unit tests.
+
+Run the `grunt serve` command to build and fire up a http server with live-reload and a watch for development purposes.
+
 ## Todo
 
 - Morphing icons
@@ -116,7 +130,7 @@ Read more about [noUiSlider here](http://refreshless.com/nouislider/)
 
 ### Selectize.js
 
-Transform select and multi select inputs in advanced text inputs. Material Design for BS provides a fulle replacement of the plugin's CSS, don't include it so.
+Transform select and multi select inputs in 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/)
 
 

less/_icons-material-design.less

@@ -1,10 +1,10 @@
 @font-face {
     font-family: "Material-Design";
-    src:url("../fonts/Material-Design.eot?2u7a7w");
-    src:url("../fonts/Material-Design.eot?#iefix2u7a7w") format("embedded-opentype"),
-        url("../fonts/Material-Design.woff?2u7a7w") format("woff"),
-        url("../fonts/Material-Design.ttf?2u7a7w") format("truetype"),
-        url("../fonts/Material-Design.svg?2u7a7w#Material-Design") format("svg");
+    src:url("@{material-font-path}/Material-Design.eot?2u7a7w");
+    src:url("@{material-font-path}/Material-Design.eot?#iefix2u7a7w") format("embedded-opentype"),
+        url("@{material-font-path}/Material-Design.woff?2u7a7w") format("woff"),
+        url("@{material-font-path}/Material-Design.ttf?2u7a7w") format("truetype"),
+        url("@{material-font-path}/Material-Design.svg?2u7a7w#Material-Design") format("svg");
     font-weight: normal;
     font-style: normal;
 }

less/_variables.less

@@ -1,6 +1,7 @@
 // main: material.less
 
-
+// material icons path
+@material-font-path: "../fonts";
 
 // Material colors palette
 @red: #F44336;

sass/_variables.scss

@@ -3,30 +3,30 @@
 
 
 // Material colors palette
-$red: #F44336;
-$pink: #E91E63;
-$purple: #9C27B0;
-$deeppurple: #673AB7;
-$indigo: #3F51B5;
-$lightblue: #03A9F4;
-$cyan: #00BCD4;
-$teal: #009688;
-$lightgreen: #8BC34A;
-$lime: #CDDC39;
-$lightyellow: #FFEB3B;
-$orange: #FF9800;
-$deeporange: #FF5722;
-$grey: #9E9E9E;
-$bluegrey: #607D8B;
-$brown: #795548;
-$lightgrey: #ECECEC;
+$red: #F44336 !default;
+$pink: #E91E63 !default;
+$purple: #9C27B0 !default;
+$deeppurple: #673AB7 !default;
+$indigo: #3F51B5 !default;
+$lightblue: #03A9F4 !default;
+$cyan: #00BCD4 !default;
+$teal: #009688 !default;
+$lightgreen: #8BC34A !default;
+$lime: #CDDC39 !default;
+$lightyellow: #FFEB3B !default;
+$orange: #FF9800 !default;
+$deeporange: #FF5722 !default;
+$grey: #9E9E9E !default;
+$bluegrey: #607D8B !default;
+$brown: #795548 !default;
+$lightgrey: #ECECEC !default;
 
 // Bootstrap shades
-$primary: #4285F4;
-$success: #0F9D58;
-$info: $lightblue;
-$warning: $deeporange;
-$danger: $red;
+$primary: #4285F4 !default;
+$success: #0F9D58 !default;
+$info: $lightblue !default;
+$warning: $deeporange !default;
+$danger: $red !default;
 
 // Typography elements for Material
 $darkbg-text: rgba(255,255,255,0.84);