2.0.1

Updated readme and squashed a few more bugs

.gitignore

@@ -1,25 +1,5 @@
 .sass-cache
-<<<<<<< HEAD
-compass/css
-sass/css
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-TODO.md
-
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
-=======
 *.config.scss
 skeleton.*
 skeleton_template.css
 *.html
->>>>>>> 2.x

bin/theme_setup.rb

@@ -34,6 +34,7 @@
 
 Helper.cp("skeleton/themes/demo/_base.scss", "skeleton/themes/#{name}/_base.scss")
 Helper.cp("skeleton/themes/demo/_vars.scss", "skeleton/themes/#{name}/_vars.scss")
+Helper.cp("skeleton/themes/demo/marrow/_mixins.scss", "skeleton/themes/#{name}/marrow/_mixins.scss")
 
 END {
 	puts "Theme setup complete!"

bin/upgrade

@@ -47,7 +47,7 @@ echo "Launch Setup Utility now? [y/n]"
 read ans
 
 if [[ ($ans != "n") && ($ans != "N") && ($ans != "no") && ($ans != "No") && ($ans != "NO") ]]; then
-	bin/setup.sh
+	bin/setup.rb
 	echo "Upgrade and Setup is complete!"
 	exit 0
 fi

bin/upgrade.rb

@@ -13,6 +13,8 @@
 
 STDOUT.flush
 
+puts "Warning: this script is incomplete at the moment. If you are using a BASH shell, please run bin/upgrade instead\n\n"
+
 puts "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."
 
 resp = Helper.yesno("Did you add the contents from _vars.scss in Skeleton Sass 1.x to _MYconfig.scss in Skeleton Sass 2.x? [y/n]\nNote: If you ran the setup utility, your global configuration name might differ")
@@ -57,6 +59,12 @@
 	"mobileLandscapeWidth" => "mobile-landscape-width"
 }
 
-variables.each do |key, value|
-	%x(ruby -p -e "gsub /#{key}/, '#{value}' #{Dir.pwd}#{filename}")
+# variables.each do |key, value|
+# 	key = key.gsub(/(?<=[a-z])(?=[A-Z])/, '-').downcase
+# end
+
+File.open(Dir.pwd + "/" + filename, "r+") do |file|
+	file.each_line do |line|
+		puts line
+	end
 end

bower.json

@@ -1,10 +1,6 @@
 {
 	"name": "skeleton-sass",
-<<<<<<< HEAD
-	"version": "1.6.3",
-=======
 	"version": "2.0.0",
->>>>>>> 2.x
 	"author": "Dennis Thompson",
 	"homepage": "http://atomicpages.github.io/skeleton-sass/",
 	"repository": {
@@ -17,15 +13,9 @@
 			"url": "http://opensource.org/licenses/MIT"
 		}
 	],
-<<<<<<< HEAD
-	"ignore": [
-		"demo",
-		"sass/dev"
-=======
 	"main": "",
 	"ignore": [
 		".gitignore",
 		"sache.json"
->>>>>>> 2.x
 	]
 }

skeleton/themes/demo/_vars.scss

@@ -4,6 +4,7 @@
 // variables.
 
 @import "../../core/config"; // default dependencies
+@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
 

skeleton/themes/sphenoid/_vars.scss

@@ -13,4 +13,4 @@ $prefix-for-webkit:    true !default;
 $prefix-for-mozilla:   true !default;
 $prefix-for-microsoft: true !default;
 $prefix-for-opera:     true !default;
-$prefix-for-spec:      true !default;
+$prefix-for-spec:      true !default; // set all prefixes to false EXCEPT spec to disable all vendor prefixes