From 55bddb069cfda783697c97f891eb9bcd4ad84ddd Mon Sep 17 00:00:00 2001 From: FezVrasta Date: Mon, 9 Mar 2015 17:10:44 +0100 Subject: [PATCH] see changes to changelog.md --- CHANGELOG.md | 10 +- Gruntfile.js | 52 +- README.md | 6 +- bootstrap-elements.html | 3 +- ...ial-wfont.css => material-fullpalette.css} | 26646 ++++++++++++- dist/css/material-fullpalette.css.map | 1 + dist/css/material-fullpalette.min.css | 2 + dist/css/material-fullpalette.min.css.map | 1 + dist/css/material-wfont.css.map | 1 - dist/css/material-wfont.min.css | 2 - dist/css/material-wfont.min.css.map | 1 - dist/css/material.css | 31413 +--------------- dist/css/material.css.map | 2 +- dist/css/material.min.css | 4 +- dist/css/material.min.css.map | 2 +- dist/css/roboto.css | 25 + dist/css/roboto.css.map | 1 + dist/css/roboto.min.css | 2 + dist/css/roboto.min.css.map | 1 + dist/test.html | 7 +- index.html | 17 +- less/_mixins-fullpalette.less | 158 + less/_mixins.less | 34 +- less/material-fullpalette.less | 2 + less/{material-wfont.less => roboto.less} | 1 - 25 files changed, 26892 insertions(+), 31502 deletions(-) rename dist/css/{material-wfont.css => material-fullpalette.css} (62%) create mode 100644 dist/css/material-fullpalette.css.map create mode 100644 dist/css/material-fullpalette.min.css create mode 100644 dist/css/material-fullpalette.min.css.map delete mode 100644 dist/css/material-wfont.css.map delete mode 100644 dist/css/material-wfont.min.css delete mode 100644 dist/css/material-wfont.min.css.map create mode 100644 dist/css/roboto.css create mode 100644 dist/css/roboto.css.map create mode 100644 dist/css/roboto.min.css create mode 100644 dist/css/roboto.min.css.map create mode 100644 less/_mixins-fullpalette.less create mode 100644 less/material-fullpalette.less rename less/{material-wfont.less => roboto.less} (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a23873c8..fdb784e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,14 @@ ## v 0.3.0 dev - Implemented full color palette from Material Design specifications (thanks @korgan00) -- Reformat of ripples.js (thanks @grvcoelho) -- Autofill option of Material.js is now set to false by default +- Reformat of `ripples.js` (thanks @grvcoelho) +- Autofill option of `material.js` is now set to false by default +- Deprecated `material-wfont.css`, now to include web fonts you should include roboto.css +- Now `material.css` supports only the primary shades of the material color palette (lightweight! about 200KB) +- `material-fullpalette.css` supports every shade of the material color palette (huge size! ~ 2MB) +- Adjusted padding on dialog(modal) to be more inline with standards (thanks @GradyD) +- Added jQuery 1.9.1 and Bootstrap 3.0 as dependencies (thanks @GradyD) +- fixed #468 (thanks @MatrixZ) ## v 0.2.1 diff --git a/Gruntfile.js b/Gruntfile.js index 8935462a..882ebc83 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -22,17 +22,30 @@ module.exports = function(grunt) { "dist/css/material.css": "less/material.less", } }, - materialwfont: { + materialfullpalette: { options: { paths: ["less"], sourceMap: true, sourceMapRootpath: "/", - sourceMapFilename: "dist/css/material-wfont.css.map", - sourceMapURL: "material-wfont.css.map", + sourceMapFilename: "dist/css/material-fullpalette.css.map", + sourceMapURL: "material-fullpalette.css.map", outputSourceFiles: true }, files: { - "dist/css/material-wfont.css": "less/material-wfont.less", + "dist/css/material-fullpalette.css": "less/material-fullpalette.less", + } + }, + roboto: { + options: { + paths: ["less"], + sourceMap: true, + sourceMapRootpath: "/", + sourceMapFilename: "dist/css/roboto.css.map", + sourceMapURL: "roboto.css.map", + outputSourceFiles: true + }, + files: { + "dist/css/roboto.css": "less/roboto.less", } }, ripples: { @@ -63,10 +76,16 @@ module.exports = function(grunt) { "dist/css/material.min.css": "dist/css/material.min.css" } }, - materialwfont: { + materialfullpalette: { files: { - "dist/css/material-wfont.css": "dist/css/material-wfont.css", - "dist/css/material-wfont.min.css": "dist/css/material-wfont.min.css" + "dist/css/material-fullpalette.css": "dist/css/material-fullpalette.css", + "dist/css/material-fullpalette.min.css": "dist/css/material-fullpalette.min.css" + } + }, + roboto: { + files: { + "dist/css/roboto.css": "dist/css/roboto.css", + "dist/css/roboto.min.css": "dist/css/roboto.min.css" } }, ripples: { @@ -83,9 +102,13 @@ module.exports = function(grunt) { src: "dist/css/material.css", dest: "dist/css/material.min.css" }, - materialwfont: { - src: "dist/css/material-wfont.css", - dest: "dist/css/material-wfont.min.css" + materialfullpalette: { + src: "dist/css/material-fullpalette.css", + dest: "dist/css/material-fullpalette.min.css" + }, + roboto: { + src: "dist/css/roboto.css", + dest: "dist/css/roboto.min.css" }, ripples: { src: "dist/css/ripples.css", @@ -243,11 +266,14 @@ module.exports = function(grunt) { ]); grunt.registerTask("material:less", [ "less:material", - "less:materialwfont", + "less:materialfullpalette", + "less:roboto", "csswring:material", - "csswring:materialwfont", + "csswring:materialfullpalette", + "csswring:roboto", "autoprefixer:material", - "autoprefixer:materialwfont" + "autoprefixer:materialfullpalette", + "autoprefixer:roboto" ]); grunt.registerTask("material:js", [ "copy:material", diff --git a/README.md b/README.md index f11e3dd0..daf81f93 100644 --- a/README.md +++ b/README.md @@ -29,9 +29,9 @@ If you prefer, you can include this framework in your project using our official Navigate to the `dist/` folder in this repository, and you will see the `test.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 `dist/` 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. -#### material-wfont.css or material.css? +#### material-fullpalette.css or material.css? -The only difference is that `material-wfont.css` has the Google web fonts included. +The only difference is that `material-fullpalette.css` has the full colors palette available, the other one has just the primary colors. #### Use custom color as primary @@ -91,6 +91,8 @@ These colors are taken from the Material Design color palette and are reported b ![palette](demo/imgs/palette.jpg) +To take advantage of all the shades please use `material-fullpalette.css`, be aware of its huge size. + ### Buttons Add `.btn-flat` to a button to make it flat, without shadows. diff --git a/bootstrap-elements.html b/bootstrap-elements.html index 7fc5e112..e21a580a 100644 --- a/bootstrap-elements.html +++ b/bootstrap-elements.html @@ -5,8 +5,9 @@ Bootstrap Material + + -