diff --git a/README.md b/README.md index cb038cd..4b57f63 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,7 @@ Changelog * Importing of theme components has to be done manually by consumers. * Added `.editorconfig` * Added `package.json` for installing via npm +* Updated dependency to use [`normalize-scss`](https://github.com/JohnAlbin/normalize-scss/) ###### Removals * `bin/` @@ -251,6 +252,7 @@ Changelog * `_MYConfig.scss` * `themes/demo` * `var` partial imports in shipped theme files +* Removed `normalize` import from `fresh/vars`, user can add the import in the `loader` partial ###### Additions * Introduction of `$new-grid-width` in the global config diff --git a/bower.json b/bower.json index ea5ced1..8d39b54 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass", - "version": "3.0.0-dev3", + "version": "3.0.0-dev4", "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { @@ -29,6 +29,6 @@ "dependencies/" ], "dependencies": { - "normalize-scss": "latest" + "normalize-scss": "normalize.scss#^5.0.3" } } diff --git a/package.json b/package.json index fdd0b60..def1e32 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass", - "version": "3.0.0-dev3", + "version": "3.0.0-dev4", "description": "Skeleton Sass is a highly modular version of Skeleton CSS", "main": "skeleton/core/_config.scss", "scripts": { diff --git a/skeleton/themes/fresh/_base.scss b/skeleton/themes/fresh/_base.scss index c2cc333..81cc8a3 100644 --- a/skeleton/themes/fresh/_base.scss +++ b/skeleton/themes/fresh/_base.scss @@ -3,7 +3,7 @@ // See skeleton/core/_config.scss for default variable values. // See _vars.scss for theme-scoped default values. -/* RESET +/* Normalize * ------------------------------------------------ */ @include normalize(); diff --git a/skeleton/themes/fresh/_vars.scss b/skeleton/themes/fresh/_vars.scss index 53cb6b3..b7cc7df 100644 --- a/skeleton/themes/fresh/_vars.scss +++ b/skeleton/themes/fresh/_vars.scss @@ -3,7 +3,6 @@ // stored in the marrow folder, but to also create project-level // variables. -@import "../../../../normalize-scss/sass/normalize/import-now"; @import "marrow/mixins"; // Yep, taken right from bourbon - https://github.com/thoughtbot/bourbon/blob/master/dist/settings/_prefixer.scss