Skip to content

Commit

Permalink
v2.0.0
Browse files Browse the repository at this point in the history
Revert back to have variables in "spacing.scss" to "_variables.scss"
  • Loading branch information
nicetransition committed Nov 8, 2013
1 parent 828613d commit 6803bdd
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
+ 1.0.0: Updates for *"-sides", this was originally missing in the Initial Release. Also updated the initial size from 40px to 20px, for the example.
+ 1.1.0: Updates to documentation and a few whitespace spots removed. Moved media query to top of the file. Introduced official versions and branches. Welcome `v1.1`
+ 2.0.0: Refactor of code, addition of %selector-names for @extend functionality, BEM naming convention, updates to documentation
+ 2.1.0: Variables moved into "spacing.scss" and removal of "_variables.scss"
+ 2.1.0: Variables moved into "spacing.scss" and removal of "_variables.scss"
+ 2.2.0: Revert back to have variables in "spacing.scss" to "_variables.scss"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OOCSS Spacing [v2.1.0]
OOCSS Spacing [v2.2.0]
===============================

Spacing is one of the most fundamental pieces of a website design, using this starter kit will help you maintain consistent spacing throughout your project. This is a [Sass](http://sass-lang.com/) file for creating global spacing for your projects. The repository includes a compressed compiled version in CSS.
Expand All @@ -13,7 +13,7 @@ Spacing is one of the most fundamental pieces of a website design, using this st
---

### Sass Option
Include "space.scss" in your project and adjust variables at the top of the Sass file.
Include "spacing.scss" and "_variables.scss" in your project. Adjust variables in "_variables.scss" to fit your needs.

It is recommended to change the file to a [partial](http://sass-lang.com/documentation/file.SASS_REFERENCE.html#partials) and `@import "spacing"` in your main output file.

Expand Down
3 changes: 2 additions & 1 deletion VERSION.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
+ 1.0.0 - 02/14/13
+ 1.1.0 - 04/15/13
+ 2.0.0 - 10/30/13
+ 2.1.0 - 11/05/13
+ 2.1.0 - 11/05/13
+ 2.2.0 - 11/05/13
2 changes: 1 addition & 1 deletion assets/scss/spacing.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* OOCSS Spacing v2.1.0
* OOCSS Spacing v2.2.0
* Github: https://github.com/kevinmack18/SASS-Margin-and-Padding-Starter
* Demo: http://kevinmack18.github.io/SASS-Margin-and-Padding-Starter/
*
Expand Down

0 comments on commit 6803bdd

Please sign in to comment.