2.5.3

* Documentation updates
* Manual push to normalize 4.2.0
* Date bump in license and other files
* and more...

README.md

@@ -49,7 +49,7 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
 		* `_functions.scss` the default global functions for Skeleton Sass
 		* `_mixins.scss` the default global mixins for Skeleton Sass
 	* `themes` where all of the themes live
-		* `demo`
+		* `demo` & `fresh`
 			* `marrow` stores all project-level functions and mixins
 				* `_mixins.scss` loads the default theme mixins and functions from `sphenoid`
 			* `_base.scss` contains all of the base styles for Skeleton Sass with the exception of the reset styles
@@ -61,7 +61,6 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
 			* `_base.scss` contains all of the base styles for Skeleton Sass (same look as Skeleton CSS created)
 			* `_vars.scss` contains project-scoped configuration options
 			* `_skeleton.scss` contains all the styles to create the grid
-		* `fresh`
 * `_MYconfig.scss` contains all of your global configuration options that won't be overridden by an update to Skeleton Sass
 * `skeleton_template.scss` contains all of the styles accumulated into a single file.
 
@@ -70,12 +69,16 @@ The only dependency for Skeleton Sass to run is Sass 3.3+. Any other libraries (
 
 Install Skeleton Sass with bower via command line:
 
-	bower install skeleton-sass
+~~~bash
+bower install skeleton-sass --save
+~~~
 
-You can also install alpha, beta, rc, and previous versions by looking at the [releases](https://github.com/atomicpages/skeleton-sass/releases) page and install with the following syntax:
+You can also install alpha, beta, release candidate, and previous versions by looking at the [releases](https://github.com/atomicpages/skeleton-sass/releases) page and install with the following syntax:
 
-	bower install skeleton-sass#[tag]
-	bower install skeleton-sass#2.0.0-b2
+~~~bash
+bower install skeleton-sass#[tag]
+bower install skeleton-sass#2.0.0-b2
+~~~
 
 [Learn how to set up Skeleton Sass for the first time here](https://github.com/atomicpages/skeleton-sass/wiki/Setting-up-Skeleton-Sass-for-first-time-use).
 
@@ -111,6 +114,13 @@ Skeleton Sass is community driven. We will gladly review any issues that you fin
 
 Changelog
 ---------
+### 2.5.3
+* Comment cleanup
+* Rearranging of dependencies
+* Update to year in license and other copyright headers
+* Change `Dir.exists?` to `Dir.exist?` to squash ruby 2.3.x deprecation notice
+* Manual bump to normalize.css 4.2.0
+
 ### 2.5.2
 * Fixes [issue #22](https://github.com/atomicpages/skeleton-sass/issues/22)
 

_MYconfig.scss

@@ -12,7 +12,7 @@
 //
 // HOW TO RUN AUTOMATED SETUP
 // 1. Open terminal and issue the following command:
-//    bin/setup.rb - Note: You must have ruby installed
+//    bin/setup.rb - Note: You must have ruby 2.x installed
 //	   to run this script
 // 2. Follow prompts from script
 

bin/theme_setup.rb

@@ -15,7 +15,7 @@
 name = Helper.nfqr("Please enter in the name of your theme with no spaces or special characters other than - or _ and press [ENTER]", /[^\w\-]/, "Theme name invalid, please try again and press [ENTER]")
 puts "Theme name is #{name}"
 
-if !Dir.exists?("skeleton/themes/#{name}")
+if !Dir.exist?("skeleton/themes/#{name}")
 	Dir.mkdir("skeleton/themes/#{name}")
 end
 
@@ -28,7 +28,7 @@
 file.puts("@import \"sphenoid/skeleton\"; // Override manually if you wish to create your own grid")
 puts "skeleton/themes/_loader.scss has been updated... moving on"
 
-if !Dir.exists?("skeleton/themes/#{name}/marrow")
+if !Dir.exist?("skeleton/themes/#{name}/marrow")
 	Dir.mkdir("skeleton/themes/#{name}/marrow")
 end
 

bin/update.rb

@@ -37,7 +37,7 @@
 	end
 end
 
-if File.exists?(".bower.json")
+if File.exist?(".bower.json")
 	resp = Helper.yesno("Bowers files found. Update with bower now? [y/n]")
 	if resp =~ /y(es)?/i
 		puts "Updating skeleton-sass"

bin/upgrade.rb

@@ -39,7 +39,7 @@ def nfqr(question, regex, errorMsg = "Invalid input. #{question}", isValid = nil
 	end
 
 	def cp(file, destination)
-		if !File.exists?(file) # fail quickly if not found
+		if !File.exist?(file) # fail quickly if not found
 			raise SystemCallError, "#{file} was not found or does not exist"
 		end
 
@@ -125,7 +125,7 @@ def gem_available?(name)
 	%x(ruby -i.bak -pe "gsub /#{key}/i, '#{value}'" #{filename})
 end
 
-if File.exists?("#{filename}.bak")
+if File.exist?("#{filename}.bak")
 	File.delete("#{filename}.bak")
 end
 

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "skeleton-sass",
-	"version": "2.5.2",
+	"version": "2.5.3",
 	"author": "Dennis Thompson",
 	"homepage": "http://atomicpages.github.io/skeleton-sass/",
 	"repository": {

license.txt

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2015 AtomicPages LLC
+Copyright (c) 2016 AtomicPages LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

skeleton/core/_config.scss

@@ -1,8 +1,6 @@
-// GLOBAL VARIABLES - include your variables here or alter the
-// predefined vars.
-// Changes to these variables will alter ALL flavors EXCEPT css.
-// If you wish to override for any given flavor, please edit the vars
-// partial in that flavor.
+// GLOBAL VARIABLES - default global variables in this file.
+// If you wish to change the default value of these variables,
+// please do so in your _MYconfig.scss.
 
 // background vars
 $background-color: #fff !global; // default background color

skeleton/core/_dependencies.scss

@@ -1,5 +1,6 @@
-// Core dependencies shared by all flavors (except css) are here. Any changes to these
-// dependencies will reflect on ALL flavors. Alter with discretion.
+// Core mixin and function dependencies that are globally scoped.
+// Can be used as building blocks for other functions/mixins in your
+// own themes.
 
 // ---------- MIXIN DEPENDENCIES
 
@@ -9,7 +10,7 @@
 	/* Overrides */
 	$gutter: percent($base-gutter-width) / 100;
 	.container {
-		@if($new == true) { width: 80%; } // FIXME: make this dynamic somehow
+		@if($new == true) { width: 80%; } // TODO: make this dynamic somehow
 	}
 	@if($new == false) {
 		.column,

skeleton/core/_functions.scss

@@ -1,4 +1,4 @@
-// Public functions that can be used globally. Have at it!
+// Public functions that can be used globally.
 
 @import "dependencies"; // Don't remove me
 

skeleton/core/_mixins.scss

@@ -1,6 +1,5 @@
-// Core mixins shared by all flavors (except css) are here. Any changes to these
-// mixins will reflect on ALL flavors. Alter with discretion.
-// Note: all logic for "private" mixins are in _dependencies.scss
+// Core mixins with global scope.
+// Note: all logic for private mixins are in _dependencies.scss
 
 // grid ( [ number $width: 960px, [ boolean $fluid: false, [  number $gutterWidth: 20px, [ number $colCount: 16 ] ] ] ] )
 @mixin grid($width: $base-width, $fluid: $is-fluid, $gutterWidth: $base-gutter-width, $colCount: $base-col-count) {

skeleton/themes/_loader.scss

@@ -1,5 +1,6 @@
 // fresh theme created with love using Skeleton Sass theme setup script!
 
+@import "../core/config"; // default dependencies for all themes
 @import "fresh/vars";
 @import "fresh/base";
 @import "fresh/skeleton"; // Override manually if you wish to create your own grid

skeleton/themes/demo/_base.scss

@@ -1,7 +1,7 @@
-// This template file is almost an exact replica of the sphenoid
-// base file except the reset styles are missing. Feel free to
-// edit this file to your hearts content and create an amazing base
-// style for Skeleton Sass!
+// The foundation of Skeleton which includes all base styles
+// that come bundled by default.
+// See skeleton/core/_config.scss for default variable values.
+// See _vars.scss for theme-scoped default values.
 
 @import "vars";
 

skeleton/themes/demo/_vars.scss

@@ -3,7 +3,6 @@
 // stored in the marrow folder, but to also create project-level
 // 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/fresh/_base.scss

@@ -1,7 +1,7 @@
-// This template file is almost an exact replica of the sphenoid
-// base file except the reset styles are missing. Feel free to
-// edit this file to your hearts content and create an amazing base
-// style for Skeleton Sass!
+// The foundation of Skeleton which includes all base styles
+// that come bundled by default.
+// See skeleton/core/_config.scss for default variable values.
+// See _vars.scss for theme-scoped default values.
 
 @import "vars";
 

skeleton/themes/fresh/_vars.scss

@@ -3,7 +3,6 @@
 // stored in the marrow folder, but to also create project-level
 // 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/_base.scss

@@ -1,3 +1,8 @@
+// The foundation of Skeleton which includes all base styles
+// that come bundled by default.
+// See skeleton/core/_config.scss for default variable values.
+// See _vars.scss for theme-scoped default values.
+
 @import "vars";
 
 /* RESET

skeleton/themes/sphenoid/_vars.scss

@@ -6,7 +6,6 @@
 
 @import "marrow/private";
 @import "marrow/public";
-@import "../../core/config"; // default dependencies
 
 // Yep, taken right from bourbon - https://github.com/thoughtbot/bourbon/blob/master/dist/settings/_prefixer.scss
 $prefix-for-webkit:    true !default;

skeleton/themes/sphenoid/marrow/_private.scss

@@ -1,9 +1,4 @@
-// DISCLAIMER: this file is called private because these items are not supposed to accessed directly
-// outside of the public file. They are also not supposed to be edited directly either. Alter only if
-// you know what you're doing. Changes here can potentially render the sphenoid theme unusable.
-//
-// Am I allowed to use these in my own theme? You bet!
-// I have a fix... how do I help? Check the README!
+// Private mixins scoped at the theme level. Change with discretion.
 
 // ---------- MIXIN DEPENDENCIES
 @mixin _bd($vert, $horiz, $radius) {
@@ -12,10 +7,11 @@
 	border-#{$vert}-#{$horiz}-radius: $radius;
 }
 
-// needs multiple stop support
-// needs center adjustment support
 // _buildRadialGradient ( mixed $start, mixed $stop, boolean $ie )
 @mixin _buildRadialGradient($start, $stop, $ie) {
+	// TODO: needs multiple stop support
+	// TODO: needs center adjustment support
+
 	@if type-of($start) != "list" {
 		$start: append($start, 0%, space);
 	}

skeleton/themes/sphenoid/marrow/_public.scss

@@ -277,5 +277,5 @@
 
 // @normalize ( )
 @mixin normalize {
-	/*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
+	/*! normalize.css v4.2.0 | MIT License | github.com/necolas/normalize.css */button,hr,input{overflow:visible}audio,canvas,progress,video{display:inline-block}progress,sub,sup{vertical-align:baseline}[type=checkbox],[type=radio],legend{box-sizing:border-box;padding:0}html{font-family:sans-serif;line-height:1.15;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}h1{font-size:2em;margin:.67em 0}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}a{background-color:transparent;-webkit-text-decoration-skip:objects}a:active,a:hover{outline-width:0}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}dfn{font-style:italic}mark{background-color:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative}sub{bottom:-.25em}sup{top:-.5em}audio:not([controls]){display:none;height:0}img{border-style:none}svg:not(:root){overflow:hidden}button,input,optgroup,select,textarea{font-family:sans-serif;font-size:100%;line-height:1.15;margin:0}button,select{text-transform:none}[type=reset],[type=submit],button,html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:ButtonText dotted 1px}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{color:inherit;display:table;max-width:100%;white-space:normal}textarea{overflow:auto}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}[hidden],template{display:none}
 }

skeleton_template.scss

@@ -1,9 +1,9 @@
 /**
  * SASS/SCSS/Compass Transcription of Skeleton Responsive Grid
  * @author Dennis Thompson <http://www.atomicpages.net>
- * @copyright Copyright (c) 2014 AtomicPages LLC
+ * @copyright Copyright (c) 2016 AtomicPages LLC
  * @license MIT
- * @version 2.5.2
+ * @version 2.5.3
  */
 
 @import "skeleton/themes/loader"; // sass --update -C skeleton.scss:skeleton.css