From 88f5235bf34eba955ce654b22b1e61f942d01cc0 Mon Sep 17 00:00:00 2001 From: atomicpages Date: Tue, 20 May 2014 00:40:47 -0700 Subject: [PATCH] 2.0.0-a4 Added a few shell scripts to handle the initial setup and also to handle upgrades to skeleton sass. Moved user config to project root and renamed skeleton.scss to skeleton_template.scss. --- .gitignore | 6 ++++-- bower.json | 2 +- core/_MYconfig.scss | 11 ----------- core/_config.scss | 2 +- skeleton.scss | 5 ----- 5 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 core/_MYconfig.scss delete mode 100644 skeleton.scss diff --git a/.gitignore b/.gitignore index d47f1c2..7437343 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,10 @@ .bundle .config .sass-cache -compass/css -sass/css +flavors/*/css +*.config.scss +skeleton.scss +skeleton.css coverage InstalledFiles lib/bundler/man diff --git a/bower.json b/bower.json index f91bd1f..b7a102b 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass", - "version": "1.7.0", + "version": "1.6.3", "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { diff --git a/core/_MYconfig.scss b/core/_MYconfig.scss deleted file mode 100644 index b156f26..0000000 --- a/core/_MYconfig.scss +++ /dev/null @@ -1,11 +0,0 @@ -// This file is just a placeholder and not actually used. Please rename to _functions.scss -// and write custom functions that you wish to be scoped globally across all flavors (except css) -// This file can be used to override any and all mixins and functions. Please override variables in the project -// directories in _vars.scss in any given flavor (except css). - -// Once file has been renamed to _functions.scss do the following: -// 1. Open _config.scss and scroll to the bottom -// 2. Uncomment @import "functions"; to enable the use of custom code -// 3. Enjoy! - -// @function myFunction() { } diff --git a/core/_config.scss b/core/_config.scss index 6d54168..3634cb3 100644 --- a/core/_config.scss +++ b/core/_config.scss @@ -52,4 +52,4 @@ $mobileLandscapeWidth: 420px; // ------ IMPORTS. DO NOT CHANGE @import "dependencies"; @import "mixins"; - // @import "MYconfig"; +// @import "_MYconfig.scss"; diff --git a/skeleton.scss b/skeleton.scss deleted file mode 100644 index f3e8146..0000000 --- a/skeleton.scss +++ /dev/null @@ -1,5 +0,0 @@ -// Choose the your flavor of Skeleton Sass and compile - -// @import "core/flavors/bourbon"; // sass --update -C skeleton.scss:skeleton.css -// @import "core/flavors/compass"; // sass --update -C --compass skeleton.scss:skeleton.css -@import "core/flavors/sass"; // sass --update -C skeleton.scss:skeleton.css