diff --git a/.gitignore b/.gitignore index 173bf22..041d552 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ node_modules .sass-cache .idea scripts/__pycache__/ +yarn-error.log +tmp diff --git a/.npmignore b/.npmignore index 6c9cb93..307145b 100644 --- a/.npmignore +++ b/.npmignore @@ -3,3 +3,5 @@ node_modules .idea scripts/__pycache__/ scripts/.idea +yarn-error.log +tmp diff --git a/Gruntfile.js b/Gruntfile.js index d6a4557..7effdd9 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,6 +61,12 @@ module.exports = function(grunt) { src: ['*.css', '!*.min.css'], dest: 'css', ext: '.min.css' + }, { + expand: true, + cwd: 'demo/style', + src: ['*.css', '!*.min.css'], + dest: 'demo/style', + ext: '.min.css' }] } }, diff --git a/README.md b/README.md index 312432a..7cbcc44 100644 --- a/README.md +++ b/README.md @@ -167,11 +167,9 @@ Using CSS classes, you can also use additional features such as: ## Licenses -- Google Material Design Icons fonts are licensed under the CC-BY-4.0: - - https://github.com/google/material-design-icons/blob/master/LICENSE +- Google Material Design Icons fonts are licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) -- Python scripts are licensed under the Apache License, Version 2.0: - - http://www.apache.org/licenses/LICENSE-2.0 +- Python scripts are licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0.html) + +- Bootstrap Material Design Icons CSS and SCSS files are licensed under the [MIT License](http://opensource.org/licenses/mit-license.html) -- Bootstrap Material Design Icons CSS and SCSS files are licensed under the MIT License: - - http://opensource.org/licenses/mit-license.html diff --git a/demo/style/_variables.scss b/demo/style/_variables.scss new file mode 100644 index 0000000..8a2a336 --- /dev/null +++ b/demo/style/_variables.scss @@ -0,0 +1,8 @@ +$media-xs: 500px; +$media-sm: 576px; +$media-md: 768px; +$media-lg: 992px; +$media-xl: 1200px; + +$search-panel-height: 64px; +$sidebar-width: 250px; \ No newline at end of file diff --git a/package.json b/package.json index 1cbcb32..a5fa191 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mervick/mdi-icons", - "version": "4.0.0", + "version": "4.0.1", "description": "Google Material Design Icons For Using With Bootstrap", "repository": { "type": "git", @@ -16,6 +16,7 @@ "keywords": [ "icons", "material", + "material-icons", "material-design", "google", "icons-web-font", @@ -23,7 +24,7 @@ "bootstrap" ], "style": "css/material-icons.min.css", - "license": "(MIT AND CC-BY-4.0)", + "license": "(MIT AND Apache-2.0)", "bugs": { "url": "http://github.com/mervick/material-design-icons/issues" }, @@ -31,13 +32,10 @@ "devDependencies": { "grunt": "^1.3.0", "grunt-cli": "^1.3.2", - "grunt-contrib-cssmin": "^2.2.1", + "grunt-contrib-cssmin": "^3.0.0", "grunt-contrib-sass": "^2.0.0", "grunt-contrib-watch": "^0.6.1", "grunt-sass": "^3.1.0", - "grunt-shell": "^3.0.1", - "lodash": "^4.5.0", - "through2": "^2.0.1", - "vinyl": "^1.1.1" + "grunt-shell": "^3.0.1" } } diff --git a/yarn.lock b/yarn.lock index d1be81a..3220229 100644 --- a/yarn.lock +++ b/yarn.lock @@ -195,22 +195,12 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -clean-css@~4.1.1: - version "4.1.11" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a" - integrity sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo= +clean-css@~4.2.1: + version "4.2.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" + integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== dependencies: - source-map "0.5.x" - -clone-stats@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1" - integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE= - -clone@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= + source-map "~0.6.0" collection-visit@^1.0.0: version "1.0.0" @@ -264,11 +254,6 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -592,13 +577,13 @@ grunt-cli@^1.3.2, grunt-cli@~1.3.2: nopt "~4.0.1" v8flags "~3.1.1" -grunt-contrib-cssmin@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/grunt-contrib-cssmin/-/grunt-contrib-cssmin-2.2.1.tgz#64cbebe60134bc1270ca4154514ec4007cc16f7f" - integrity sha512-IXNomhQ5ekVZbDbj/ik5YccoD9khU6LT2fDXqO1+/Txjq8cp0tQKjVS8i8EAbHOrSDkL7/UD6A7b+xj98gqh9w== +grunt-contrib-cssmin@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/grunt-contrib-cssmin/-/grunt-contrib-cssmin-3.0.0.tgz#1767c0a062f4b7353c5adcadc52dcff7197d4d89" + integrity sha512-eXpooYmVGKMs/xV7DzTLgJFPVOfMuawPD3x0JwhlH0mumq2NtH3xsxaHxp1Y3NKxp0j0tRhFS6kSBRsz6TuTGg== dependencies: - chalk "^1.0.0" - clean-css "~4.1.1" + chalk "^2.4.1" + clean-css "~4.2.1" maxmin "^2.1.0" grunt-contrib-sass@^2.0.0: @@ -787,7 +772,7 @@ inherits@1: resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b" integrity sha1-ykMJ2t7mtUzAuNJH6NfHoJdb3Js= -inherits@2, inherits@~2.0.3: +inherits@2: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -925,7 +910,7 @@ is-windows@^1.0.1, is-windows@^1.0.2: resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== -isarray@1.0.0, isarray@~1.0.0: +isarray@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= @@ -993,7 +978,7 @@ liftoff@~2.5.0: rechoir "^0.6.2" resolve "^1.1.7" -lodash@^4.17.14, lodash@^4.5.0, lodash@~4.17.19, lodash@~4.17.20: +lodash@^4.17.14, lodash@~4.17.19, lodash@~4.17.20: version "4.17.20" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== @@ -1286,29 +1271,11 @@ pretty-bytes@^3.0.0: dependencies: number-is-nan "^1.0.0" -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - qs@~0.5.2: version "0.5.6" resolved "https://registry.yarnpkg.com/qs/-/qs-0.5.6.tgz#31b1ad058567651c526921506b9a8793911a0384" integrity sha1-MbGtBYVnZRxSaSFQa5qHk5EaA4Q= -readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - rechoir@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384" @@ -1334,11 +1301,6 @@ repeat-string@^1.6.1: resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= -replace-ext@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" - integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ= - resolve-dir@^1.0.0, resolve-dir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" @@ -1372,11 +1334,6 @@ rimraf@~3.0.2: dependencies: glob "^7.1.3" -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-regex@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" @@ -1467,11 +1424,16 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= -source-map@0.5.x, source-map@^0.5.6: +source-map@^0.5.6: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= +source-map@~0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" @@ -1497,13 +1459,6 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -1537,14 +1492,6 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -through2@^2.0.1: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - tiny-lr-fork@0.0.5: version "0.0.5" resolved "https://registry.yarnpkg.com/tiny-lr-fork/-/tiny-lr-fork-0.0.5.tgz#1e99e1e2a8469b736ab97d97eefa98c71f76ed0a" @@ -1621,7 +1568,7 @@ use@^3.1.0: resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== -util-deprecate@^1.0.2, util-deprecate@~1.0.1: +util-deprecate@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= @@ -1633,15 +1580,6 @@ v8flags@~3.1.1: dependencies: homedir-polyfill "^1.0.1" -vinyl@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884" - integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ= - dependencies: - clone "^1.0.0" - clone-stats "^0.0.1" - replace-ext "0.0.1" - which@^1.2.14, which@^1.2.9, which@^1.3.1, which@~1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -1653,8 +1591,3 @@ wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==