Merge pull request #250 from buzzfeed/version-bump-1-0-6

updated release notes and version number

README.md

@@ -9,17 +9,36 @@ You must have NPM installed. If you have installed the [Buzzfeed webapp](https:/
 
 ### Install
 When inside your project directory type:
- ```
- npm install bf-solid --save
- ```
+```
+npm install bf-solid --save
+```
 or using Bower:
 ```
 bower install git+ssh://git@github.com/buzzfeed/solid.git#<RELEASE_VERSION> --save
 ```
 
 This will give you `solid.scss` and all of its scss files inside `node_modules/solid/lib`. This package includes the static, uncompiled SCSS files. Whether you want to build them into your project with Grunt, Gulp, etc. is up to you.
 
-Including the package using a github URL will also include all of the styleguide's template `.ejs` files. Please disregard.
+### Grunt Usage
+
+#### (with grunt-sass)
+
+Grunt-sass uses libsass to compile your sass. Use includePaths to make solid available as an scss import.
+
+```
+  sass: {
+    dist: {
+      options: {
+        includePaths: 'node_modules/bf-solid/lib'
+      },
+      files: {
+        'path/to/output.css': 'path/to/input.scss'
+      }
+    }
+});
+```
+
+Then in your scss import file import solid with `@import "solid";`
 
 ## Building the Solid Styleguide
 The solid styleguide lets you view Solid along with all of its documentation.

index.ejs

@@ -13,21 +13,35 @@
 
   <div class="release--container clearfix xs-col-12 lg-col-9 xs-mb2 xs-pb1 xs-pt2 xs-border-top--lighter">
 
+    <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">Under Development</h4>
+        <ul>
+          <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.0.6
       </div>
 
       <div class="col xs-col-10 lg-col-11">
-        <h4 class="bold xs-mb1">Under Development</h4>
+        <h4 class="bold xs-mb1"><a href="https://github.com/buzzfeed/solid/releases/tag/1.0.6">Everything is !important, social buttons, class cleanup, docs cleanup</a></h4>
+        <p class="xs-mb1 text-5 text-gray--lightest">Sept 23, 2015</p>
         <ul>
-          <li class="xs-mb1"> Removed line height variable and added specific line heights for each type size.</li>
-          <li class="xs-mb1"> Added buttons with icons and social buttons.</li>
+          <li class="xs-mb1"><span class="nowrap"><span class="text-red bold">Potential Breaking Change:</span>Added !important to all utility classes</li>
           <li class="xs-mb1"><span class="text-red bold">Breaking Change:</span> <span class="nowrap">.<code class="js-highlight">xs-show</code></span> has been deprecated. Use the responsive display classes found in Utilities going forward.</li>
           <li class="xs-mb1"><span class="text-red bold">Breaking Change:</span> <span class="nowrap">.<code class="js-highlight">xs-half-width</code></span> and <span class="nowrap">.<code class="js-highlight">xs-full-width</code></span> have been deprecated in favor of using <span class="nowrap">.<code class="js-highlight">xs-col-6</code></span> and <span class="nowrap">.<code class="js-highlight">xs-col-12</code></span>.</li>
           <li class="xs-mb1"><span class="text-red bold">Breaking Change:</span> <span class="nowrap">.<code class="js-highlight">block-grid-item</code></span> is now <span class="nowrap">.<code class="js-highlight">block-grid__item</code></span>, in line with our other BEM classes.</li>
-          <li class="xs-mb1"><span class="nowrap"><span class="text-red bold">Potential Breaking Change:</span>Added !important to all utility classes</li>
+          <li class="xs-mb1"> Added specific line heights for each type size.</li>
+          <li class="xs-mb1"> Added buttons with icons and social buttons.</li>
           <li class="xs-mb1"><span class="nowrap">.<code class="js-highlight">block-grid</code></span> is no longer necessary to create a Block Grid.</li>
           <li class="xs-mb1">Added <span class="nowrap">.<code class="js-highlight">xs-static</code></span> and <span class="nowrap">.<code class="js-highlight">xs-overflow-visible</code></span> in case one needs to reset those at a specific breakpoint.</li>
           <li class="xs-mb1">Fixed overflow classes to be responsive.</li>
@@ -45,7 +59,7 @@
       </div>
 
       <div class="col xs-col-10 lg-col-11">
-        <h4 class="bold xs-mb1">Change Segmented Buttons, Various Fixes In Docs</h4>
+        <h4 class="bold xs-mb1"><a href="https://github.com/buzzfeed/solid/releases/tag/1.0.5">Change Segmented Buttons, Various Fixes In Docs</a></h4>
         <p class="xs-mb1 text-5 text-gray--lightest">Sept 4, 2015</p>
         <ul>
           <li class="xs-mb1"><b class="text-red">Breaking Change:</b> Segmented Buttons are now Button Groups. CSS now reflects other button CSS.</li>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bf-solid",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Solid CSS Styling",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"