Skip to content

Commit

Permalink
Merge pull request #257 from buzzfeed/version-bump-1-1-0
Browse files Browse the repository at this point in the history
Version bump 1.1.0
  • Loading branch information
samthurman committed Oct 1, 2015
2 parents 9b7a37c + c037d19 commit 777b1a5
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 4 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ Grunt-sass uses libsass to compile your sass. Use includePaths to make solid ava

Then in your scss import file import solid with `@import "solid";`

## Solid Structure
Solid is broken up into four sections:
+ solid-helpers (variables and mixins used by all imports)
+ solid-base (normalize + base element styles)
+ solid-utilities (utility classes)
+ solid-components (utility classes that require specific HTML markup)

You can get everything with `@import "solid";`. Individual sections can also be imported. For example if you want the utility classes just `@import "solid-utilities";`

## Building the Solid Styleguide
The solid styleguide lets you view Solid along with all of its documentation.

Expand Down
19 changes: 16 additions & 3 deletions index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,28 @@

<div class="release clearfix xs-mb2 xs-pb1 xs-border-bottom--lighter">
<div class="col xs-col-2 lg-col-1 text-gray--lightest">
1.1.0
1.1.1
</div>

<div class="col xs-col-10 lg-col-11">
<h4 class="bold xs-mb1">Under Development</h4>
<ul>
<li class="xs-mb1">Restructured imports to allow importing base/utilities/components seperately.</li>
<li class="xs-mb1"></li>
</ul>
</div>
</div>

<div class="release clearfix xs-mb2 xs-pb1 xs-border-bottom--lighter">
<div class="col xs-col-2 lg-col-1 text-gray--lightest">
1.1.0
</div>

<div class="col xs-col-10 lg-col-11">
<h4 class="bold xs-mb1">Import Structure Update</h4>
<ul>
<li class="xs-mb1"><span class="text-red bold">Potential Breaking Change:</span> Restructured imports to allow importing base/utilities/components seperately.</li>
<li class="xs-mb1">Button groups are now a component!</li>
<li class="xs-mb1">Literally everything inside solid-utilities.scss is !important</li>
<li class="xs-mb1"><span class="text-red bold">Potential Breaking Change:</span> Literally everything inside solid-utilities.scss is !important</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bf-solid",
"version": "1.0.7",
"version": "1.1.0",
"description": "Solid CSS Styling",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down

0 comments on commit 777b1a5

Please sign in to comment.