From f85271ca03a3dcfd9f28e9ef38a1c67fb2d30980 Mon Sep 17 00:00:00 2001 From: Nelson Omuto Date: Sun, 5 Oct 2014 17:27:50 -0400 Subject: [PATCH 1/9] jshint double-quotes error --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index f9507014..bb59179d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -177,5 +177,5 @@ module.exports = function(grunt) { ]); }); - grunt.registerTask('cibuild',["newer:jshint", "jasmine:scripts"]); + grunt.registerTask("cibuild",["newer:jshint", "jasmine:scripts"]); }; From 40d5bb815565389ce4232bf7a3164499c28a64fe Mon Sep 17 00:00:00 2001 From: Nelson Omuto Date: Mon, 6 Oct 2014 10:41:44 -0400 Subject: [PATCH 2/9] fixes #81 adding build status emblem to readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 24f8e054..215a5c8c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![build status](https://travis-ci.org/FezVrasta/bootstrap-material-design.svg?branch=master)](https://travis-ci.org/FezVrasta/bootstrap-material-design) + [![banner](demo/imgs/banner.jpg)](#) This Bootstrap theme is an easy way to use the new Material Design guidelines by Google in your Bootstrap 3 based application. From f61f95150889800344eb7fa9b041778b7c96d3ea Mon Sep 17 00:00:00 2001 From: Nelson Omuto Date: Mon, 6 Oct 2014 10:49:22 -0400 Subject: [PATCH 3/9] fixes #90, adding documentation to clarify development workflow to readme --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 215a5c8c..3c0f38ca 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,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 From e9bce7864137529c977d0c5b5f8e96ebfdfd2961 Mon Sep 17 00:00:00 2001 From: Fabrizio Fortunato Date: Mon, 6 Oct 2014 18:14:27 +0200 Subject: [PATCH 4/9] added support for !default for the sass variables --- sass/_variables.scss | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/sass/_variables.scss b/sass/_variables.scss index 0cef9df8..a977e733 100644 --- a/sass/_variables.scss +++ b/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); From a55a81795a05862cd518dbbaefabc9261192e7d0 Mon Sep 17 00:00:00 2001 From: egoroff Date: Wed, 8 Oct 2014 00:52:32 +0400 Subject: [PATCH 5/9] Material fonts folder can be adjusted using varialbe --- less/_icons-material-design.less | 10 +++++----- less/_variables.less | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/less/_icons-material-design.less b/less/_icons-material-design.less index c63e4f4c..ba69c532 100644 --- a/less/_icons-material-design.less +++ b/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; } diff --git a/less/_variables.less b/less/_variables.less index 2f0a33ef..9b6230c3 100644 --- a/less/_variables.less +++ b/less/_variables.less @@ -1,6 +1,7 @@ // main: material.less - +// material icons path +@material-font-path: "../fonts"; // Material colors palette @red: #F44336; From 280debb3761d0b42ebb003eed7995fe224b70fda Mon Sep 17 00:00:00 2001 From: liliakai Date: Tue, 7 Oct 2014 15:08:27 -0700 Subject: [PATCH 6/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c8fbeea..d1421078 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,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 fulle replacement of the plugin's CSS, so don't include it. Read more about [selectize.js](http://brianreavis.github.io/selectize.js/) From b504d13d5b7a36c035ef369d6fd42a65e7d8ae7a Mon Sep 17 00:00:00 2001 From: liliakai Date: Tue, 7 Oct 2014 15:09:42 -0700 Subject: [PATCH 7/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d1421078..accfdf96 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,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, so don't include it. +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/) From eff2ccb26677d5cfecb97980b233cb6c29b7da33 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Wed, 8 Oct 2014 08:59:05 +0200 Subject: [PATCH 8/9] updated contributing --- CONTRIBUTING.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b3a6b26..d11f8e87 100644 --- a/CONTRIBUTING.md +++ b/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. \ No newline at end of file From 396e386d2e38d13589a93df88631a69d0a375d89 Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Fri, 10 Oct 2014 09:55:06 +0200 Subject: [PATCH 9/9] added ghat badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index accfdf96..bd393cdc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![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)](#)