2.0.0-b7

Changed the file structure so it is more cohesive. Everything the framework needs is now in skeleton. Themes are called themes and all themes are loaded from a centralized _loader.scss partial

bin/setup.sh

@@ -43,7 +43,7 @@ echo "Renaming skeleton_template to skeleton"
 mv skeleton_template.scss skeleton.scss
 
 echo "Adding user override to core/_config.scss"
-echo "@import \"../_${name}.config.scss\"" >> core/_config.scss
+echo "@import \"../../_${name}.config.scss\"" >> skeleton/core/_config.scss
 
-echo "Done"
+echo "Setup complete!"
 exit 0;

bin/theme_setup.sh

@@ -38,17 +38,16 @@ done
 echo "Theme name is ${name}"
 
 echo "Creating required files and folders..."
-touch core/bones/_${name}.scss;
-echo "// ${name} theme created with love" > core/bones/_${name}.scss
-echo "@import \"../../skeleton/${name}/vars\";" >> core/bones/_${name}.scss
-echo "@import \"../../skeleton/${name}/base\";" >> core/bones/_${name}.scss
-echo "@import \"../../skeleton/sphenoid/vars\"; // Override manually if you wish to create your own grid" >> core/bones/_${name}.scss
-echo "core/bones/_${name}.scss has been created"
+echo "// ${name} theme created with love using Skeleton Sass theme setup script!" > skeleton/themes/_loader.scss
+echo "@import \"${name}/vars\";" >> skeleton/themes/_loader.scss
+echo "@import \"${name}/base\";" >> skeleton/themes/_loader.scss
+echo "@import \"sphenoid/skeleton\"; // Override manually if you wish to create your own grid" >> skeleton/themes/_loader.scss
+echo "skeleton/themes/_loader.scss has been updated... moving on"
 
 
-mkdir -p skeleton/${name}/marrow
-cp skeleton/demo/_base.scss skeleton/${name}
-cp skeleton/demo/_vars.scss skeleton/${name}
+mkdir -p skeleton/themes/${name}/marrow
+cp skeleton/themes/demo/_base.scss skeleton/themes/${name}
+cp skeleton/themes/demo/_vars.scss skeleton/themes/${name}
 
 echo "Use Bourbon? [y/n]"
 read ans
@@ -121,15 +120,9 @@ if [ $bourbon -eq 1 ]; then
 			fi
 		done
 	}
-	bourbon install --path=skeleton/${name}/
-	cp skeleton/demo/_bourbon.scss skeleton/${name}
-	sed -i "" -e $'8 a\\\n'"@import \"bourbon\";" skeleton/${name}/_vars.scss
+	bourbon install --path=skeleton/themes/${name}/
+	sed -i "" -e $'8 a\\\n'"@import \"bourbon/bourbon\";" skeleton/themes/${name}/_vars.scss
 fi
 
-skeleton=$(ls | grep skeleton_*.scss)
-
-sed -i "" '/sphenoid/d' $skeleton
-sed -i "" -e $'10 a\\\n'"@import \"core/bones/${name}\"; // compile with sass --update -C ${skeleton}.scss:${skeleton}.css" $skeleton
-
 echo "Theme setup complete!"
 exit 0

bin/upgrade

@@ -10,6 +10,7 @@ fi
 echo "Disclaimer: this utility it meant to aid in upgrading from Skeleton Sass 1.x to Skeleton Sass 2.x. If you have followed the wiki articles then please do not use this script without a clean installation of Skeleton Sass 2.x. We, AtomicPages LLC, are not responsible for any unforeseen events that arise by using this script. Please follow the prompts.\n"
 
 echo "Did you add the contents from _vars.scss in Skeleton Sass 1.x to _MYconfig.scss in Skeleton Sass 2.x? [y/n]"
+echo "Note: If you ran the setup utility, your global configuration name might differ"
 read ans
 
 	if [[ ($ans != "y") && ($ans != "Y") && ($ans != "YES") && ($ans != "yes") ]]; then
@@ -51,5 +52,5 @@ if [[ ($ans != "n") && ($ans != "N") && ($ans != "no") && ($ans != "No") && ($an
 	exit 0
 fi
 
-echo "Upgrade is complete! Rename _MYconfig.scss to a different name and import that file into core/_config.scss"
+echo "Upgrade is complete! Rename _MYconfig.scss to a different name if you haven't done so already and import that file into core/_config.scss. You may also run bin/setup.sh from command line to automate this task."
 exit 0