diff --git a/README.md b/README.md index 42ab2f0..e3902c6 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,13 @@ Skeleton Sass 2 ======================= -Skeleton Sass is a "Sassification" of Dave Gamache's [Skeleton CSS](http://getskeleton.com) responsive front-end framework. +Skeleton Sass is a "Sassification" of Dave Gamache's [Skeleton CSS](http://getskeleton.com) responsive Sass starting point. * Ability to seamlessly adjust grids by changing the value of variables * Install Skeleton Sass with bower via `bower install skeleton-sass` * [Live demo!](http://atomicpages.github.io/skeleton-sass/demo/index.html) * [Extensive documentation](https://github.com/atomicpages/skeleton-sass/wiki) -### Coming up in 2.5 -* Addition of a new default theme called **fresh** - * Removal of old reset CSS in favor of [normalize.css](http://necolas.github.io/normalize.css/) - * Although, you can always use `reset.css` if you wish since it will still be part of the theme mixins! - * Adjustment of media queries - * **Note:** these media queries probably won't be perfect for _every_ project. Let the content dictate the media queries! - * Fluid grid is now the default with a fixed width set on the `body` element (you can change this behavior, of course) - * **Note:** the fixed grid will still be there! Difference is that the fluid grid will be the new default with the new theme only. You can still use the old `sphenoid` theme for the pre 2.5 setup (e.g. fixed grid, old skeleton.css theme, `reset.css`, etc.). - * New default font: [Raleway](http://www.google.com/fonts/specimen/Raleway) -* Improvements with scripts and better compatibility with Ruby 2.x and better backward compatibility with Ruby 1.8+ - ### Life after 2.5 * At some point after 2.5 I would like to create a Ruby Gem of Skeleton Sass with Rails/Sinatra support. This will likely be the next major release (i.e. 3.0). @@ -123,6 +112,15 @@ Skeleton Sass is community driven. We will gladly review any issues that you fin Changelog --------- ### 2.5.0 +* Addition of a new default theme called **fresh** + * Removal of old reset CSS in favor of [normalize.css](http://necolas.github.io/normalize.css/) + * Although, you can always use `reset.css` if you wish since it will still be part of the theme mixins! + * Adjustment of media queries + * **Note:** these media queries probably won't be perfect for _every_ project. Let the content dictate the media queries! + * Fluid grid is now the default with a fixed width set on the `body` element (you can change this behavior, of course) + * **Note:** the fixed grid will still be there! Difference is that the fluid grid will be the new default with the new theme only. You can still use the old `sphenoid` theme for the pre 2.5 setup (e.g. fixed grid, old skeleton.css theme, `reset.css`, etc.). + * New default font: [Raleway](http://www.google.com/fonts/specimen/Raleway) +* Improvements with scripts and better compatibility with Ruby 2.x and better backward compatibility with Ruby 1.8+ ###### Removals * `$colWidth` variable in the `@grid` mixin diff --git a/_MYconfig.scss b/_MYconfig.scss new file mode 100644 index 0000000..bcc67f9 --- /dev/null +++ b/_MYconfig.scss @@ -0,0 +1,23 @@ +// This file stores all of your global project configuration options +// and will not be wiped out by upgrading skeleton sass. Run the +// setup.sh script from command line or follow the steps below +// to manually configure: +// +// MANUAL CONFIGURATON +// 1. Rename _MYconfig.scss to _[projectname].config.scss +// 2. Rename skeleton_template.scss to skeleton.scss +// 3. Navigate to core and edit _config.scss using your favorite +// text editor. Add the following to the end of _config.scss: +// @import " _[projectname].config.scss"; +// +// HOW TO RUN AUTOMATED SETUP +// 1. Open terminal and issue the following command: +// bin/setup.rb - Note: You must have ruby installed +// to run this script +// 2. Follow prompts from script + +// GLOBAL VARIABLES - include your variables here or alter the predefined vars +// See skeleton file for copyright info + +// MY VARIABLES +// $foo: "bar"; diff --git a/bower.json b/bower.json index ddaaec7..c6b1ddd 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "skeleton-sass", - "version": "2.5.0-b2", + "version": "2.5.0", "author": "Dennis Thompson", "homepage": "http://atomicpages.github.io/skeleton-sass/", "repository": { diff --git a/license.txt b/license.txt index 0256ca5..8665885 100644 --- a/license.txt +++ b/license.txt @@ -1,5 +1,5 @@ The MIT License (MIT) -Copyright (c) 2014 AtomicPages LLC +Copyright (c) 2015 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: diff --git a/skeleton/core/_config.scss b/skeleton/core/_config.scss index a5ee42f..8b44b4c 100644 --- a/skeleton/core/_config.scss +++ b/skeleton/core/_config.scss @@ -50,4 +50,4 @@ $use-new-grid: true !global; // Uses the new grid released in Skeleton CSS 2 @import "functions"; @import "mixins"; // @import "../../_MYconfig.scss"; -@import "../../_demo.config.scss" +@import "../../_demo.config.scss"; diff --git a/skeleton/themes/fresh/_base.scss b/skeleton/themes/fresh/_base.scss index b5d1382..249c6cf 100644 --- a/skeleton/themes/fresh/_base.scss +++ b/skeleton/themes/fresh/_base.scss @@ -202,6 +202,7 @@ input[type="button"] { } } } +.button:visited { color: $button-color; } /* Fix for odd Mozilla border & padding issues */ button, diff --git a/skeleton/themes/fresh/_vars.scss b/skeleton/themes/fresh/_vars.scss index 7c32c40..76fbe25 100644 --- a/skeleton/themes/fresh/_vars.scss +++ b/skeleton/themes/fresh/_vars.scss @@ -21,7 +21,7 @@ $use-global-border-box: false; // Change to true the enable global border-box $link-color: #1EAEDB; // default link color $link-hover: #0FA0CE; // default link color on :hover -$link-decoration: none; // default link decoration +$link-decoration: underline; // default link decoration $base-width: if($is-fluid, 100%, ($base-col-width + $base-gutter-width) * $base-col-count);