Skip to content

Commit

Permalink
2.5.0
Browse files Browse the repository at this point in the history
Finalizing changes for 2.5.0 release
  • Loading branch information
Dennis committed Jun 29, 2015
1 parent f98a542 commit 9c3d4a0
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 16 deletions.
22 changes: 10 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -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).

Expand Down Expand Up @@ -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
Expand Down
23 changes: 23 additions & 0 deletions _MYconfig.scss
Original file line number Diff line number Diff line change
@@ -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";
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion license.txt
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
2 changes: 1 addition & 1 deletion skeleton/core/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
1 change: 1 addition & 0 deletions skeleton/themes/fresh/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ input[type="button"] {
}
}
}
.button:visited { color: $button-color; }

/* Fix for odd Mozilla border & padding issues */
button,
Expand Down
2 changes: 1 addition & 1 deletion skeleton/themes/fresh/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 9c3d4a0

Please sign in to comment.