Skip to content

Commit

Permalink
3.0.0-dev3
Browse files Browse the repository at this point in the history
* Updated normalize dependency to use normalize-scss
* Added dependency to package.json
  • Loading branch information
atomicpages committed Sep 5, 2016
1 parent 72e2c05 commit 28cbf86
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
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-dev2",
"version": "3.0.0-dev3",
"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": "latest"
}
}
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "skeleton-sass",
"version": "3.0.0-dev2",
"version": "3.0.0-dev3",
"description": "Skeleton Sass is a highly modular version of Skeleton CSS",
"main": "skeleton/core/_config.scss",
"scripts": {
Expand All @@ -23,5 +23,8 @@
"bugs": {
"url": "https://github.com/atomicpages/skeleton-sass/issues"
},
"homepage": "https://github.com/atomicpages/skeleton-sass#readme"
"homepage": "https://github.com/atomicpages/skeleton-sass#readme",
"dependencies": {
"normalize-scss": "^5.0.3"
}
}
4 changes: 1 addition & 3 deletions skeleton/themes/fresh/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
// stored in the marrow folder, but to also create project-level
// variables.

@import "../../../../normalize.scss/sass/normalize";
@import "../../../../normalize-scss/sass/normalize/import-now";
@import "marrow/mixins";
// @import "my_folder/_foo.scss"; // import dependencies from a custom folder
// @import "bourbon"; // install bourbon in this directory and uncomment this line to enable bourbon, for example

// Yep, taken right from bourbon - https://github.com/thoughtbot/bourbon/blob/master/dist/settings/_prefixer.scss
$prefix-for-webkit: true !default;
Expand Down

0 comments on commit 28cbf86

Please sign in to comment.