Skip to content

Commit

Permalink
3.0.0-dev4
Browse files Browse the repository at this point in the history
* Removed normalize import from fresh/vars
* Fixed normalize bower dependency to use the correct one
  • Loading branch information
atomicpages committed Sep 5, 2016
1 parent 28cbf86 commit 60f0d18
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,15 @@ 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/`
* `skeleton_template.scss`
* `_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
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down Expand Up @@ -29,6 +29,6 @@
"dependencies/"
],
"dependencies": {
"normalize-scss": "latest"
"normalize-scss": "normalize.scss#^5.0.3"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion skeleton/themes/fresh/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
1 change: 0 additions & 1 deletion skeleton/themes/fresh/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60f0d18

Please sign in to comment.