readme.md in bourbon-2.1.1 vs readme.md in bourbon-2.1.2

- old
+ new

@@ -1,211 +1,87 @@ -[![Bourbon Sass Mixin Library](http://thoughtbot.com/bourbon/images/bourbon-logo.png)](http://thoughtbot.com/bourbon) +[![Bourbon Sass Mixin Library](http://bourbon.io/images/bourbon-logo.png)](http://bourbon.io) + # A simple and lightweight mixin library for Sass Bourbon is a comprehensive library of sass mixins that are designed to be simple -and easy to use. No configuration required. The mixins aim to be as vanilla as -possible, meaning they should be as close to the original CSS syntax as possible. +and easy to use. No configuration required. +The mixins aim to be as vanilla as possible, meaning they should be as close to the original CSS syntax as possible. The mixins contain vendor specific prefixes for all CSS3 properties for support amongst modern browsers. The prefixes also ensure graceful degradation for older browsers that support only CSS3 prefixed properties. Bourbon uses SCSS syntax. -#[Documentation & Demo](http://thoughtbot.com/bourbon) +#[Documentation & Demo](http://bourbon.io) # Requirements -Sass 3.1+ +Sass 3.2+ -# Install for Rails +# Install for Rails 3.1+ In your Gemfile: gem 'bourbon' Then run: $ bundle install -## Rails 3.1.x -Rename application.css to application.css.scss: +Restart your server. Then rename application`.css` to application`.css.scss`: mv app/assets/stylesheets/application.css app/assets/stylesheets/application.css.scss -Bourbon needs the sass files to be imported in a specific order to function properly. Therefore, you will need to disable the require\_tree sprocket directive. -Delete the following sprocket directive in application.css.scss: +Delete the sprocket directive in application.css.scss: [Why?](https://github.com/thoughtbot/bourbon/wiki/Rails-Sprockets) *= require_tree . -Import bourbon at the beginning of application.css.scss: +Import Bourbon at the beginning of application.css.scss. All additional stylesheets must be imported below Bourbon: @import "bourbon"; - -Import all additional stylesheets from your app/assets/stylesheets directory underneath the bourbon import: - - @import "bourbon"; @import "home"; @import "users"; -## Rails 3.0.x -For Rails 3.0.x you must run the installation rake task. You should run this task every time a new version of Bourbon is released. -This will copy the Sass files into your project's `public/stylesheets/sass` directory. - rake bourbon:install +[Help! I'm getting an undefined mixin error.](https://github.com/thoughtbot/bourbon/wiki/Rails-Help-%5C-Undefined-mixin) -Import the mixins at the beginning of your stylesheet +##### [Rails 3.0.x Install Instructions](https://github.com/thoughtbot/bourbon/wiki/Rails-3.0.x-Install) - @import 'bourbon/bourbon'; +##### Rails 2.3 - follow the [non-rails installation](#non-rails) -*Optional*: If you use a non-standard location for your sass files, you can specify the path to your sass files as an argument to the install task +# <span id="non-rails"></span>Non-Rails projects +Bourbon includes an easy way to generate a directory with all the necessary files. +For command line help: `$ bourbon help` or visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/Command-Line-Tools) - rake bourbon:install[app/stylesheets] +####Install -# Rails 2.3 or a non-Rails project (static site, jekyll, wordpress, etc...) -Bourbon includes an easy way to generate a directory with all the necessary files. -Install the bourbon gem: - gem install bourbon -Change the directory to where you want to generate the bourbon folder and files: +Install Bourbon into the current directory by generating the `bourbon` folder: - cd project_name/stylesheets/sass/ - -Install bourbon: - bourbon install -This will generate a folder called `bourbon` containing all the mixins and other necessary bourbon files. It is recommended not to add or modify the bourbon files so that you can update bourbon easily. +<small>The generated folder will contain all the mixins and other necessary Bourbon files. +It is recommended not to add or modify the Bourbon files so that you can update Bourbon easily.</small> -Update an existing bourbon installation with: - - bourbon update - -This will delete the bourbon directory and regenerate it. - +#### Sass Watch *Sass Watch:* To output properly, Bourbon must be explicitly required (`-r`) by Sass at the command line: # Example (project root directory) sass --watch stylesheets/sass:stylesheets -r ./stylesheets/sass/bourbon/lib/bourbon.rb -You will need to import the mixins at the beginning of your stylesheet(s): +Lastly, import the mixins at the beginning of your stylesheet(s): @import 'bourbon/bourbon'; +#### Other Commands +Visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/Command-Line-Tools) for a complete list + + bourbon help + bourbon update + # Browser support Bourbon aims to provide support for CSS3 properties that are not yet fully supported in modern stable browsers. -# All Supported Functions, Mixins, and Addons -[View the Bourbon documentation](http://thoughtbot.com/bourbon) - -*@ denotes a mixin and must be prefaced with @include* - - Mixins - -------------------------------- - animation - @ animation(*args) - @ animation-delay(*args) - @ animation-direction(*args) - @ animation-duration(*args) - @ animation-fill-mode(*args) - @ animation-iteration-count(*args) - @ animation-name(*args) - @ animation-play-state(*args) - @ animation-timing-function(*args) - - @ appearance(*args) - @ background-image(*args) - @ background-size(*args) - @ border-image(*args) - - border-radius - @ border-radius(*args) - @ border-top-radius(*args) - @ border-top-left-radius(*args) - @ border-top-right-radius(*args) - @ border-bottom-radius(*args) - @ border-bottom-left-radius(*args) - @ border-bottom-right-radius(*args) - @ border-left-radius(*args) - @ border-right-radius(*args) - - @ box-shadow(*args) - @ box-sizing(*args) - - columns - @columns(*args) - @column-count(*args) - @column-fill(*args) - @column-gap(*args) - @column-rule(*args) - @column-rule-color(*args) - @column-rule-style(*args) - @column-rule-width(*args) - @column-span(*args) - @column-width(*args) - - flex-box - @ box(*args) - @ box-align(*args) - @ box-direction(*args) - @ box-flex(*args) - @ box-flex-group(*args) - @ box-lines(*args) - @ box-ordinal-group(*args) - @ box-orient(*args) - @ box-pack(*args) - @ display-box - - @ inline-block - @ linear-gradient(*args) - @ radial-gradient(*args) - - transform - @ transform(*args) - @ transform-origin(*args) - - transition - @ transition(*args) - @ transition-delay(*args) - @ transition-duration(*args) - @ transition-property(*args) - @ transition-timing-function(*args) - - @ user-select - - Functions - -------------------------------- - compact(*args) - flex-grid(*args) - golden-ratio(*args) - grid-width(*args) - linear-gradient(*args) - radial-gradient(*args) - shade(*args) - tint(*args) - - Addons - ------------------------------- - @ button(*args) - @ clearfix - @ hide-text - - HTML5 Inputs - #{$all-text-inputs} - - font-family - $georgia - $helvetica - $lucida-grande - $monospace - $verdana - - timing-functions - $ease-in-* - $ease-out-* - $ease-in-out-* - * = quad, cubic, quart, quint, sine, expo, circ, back - - ## Help Out Currently the project is a work in progress. Feel free to help out. A general rule when considering filing a pull request for a new mixin: Do the following browsers *only* support the CSS3 property using vendor specific prefixes? If the answer is yes, there is a high chance the mixin will be accepted via a pull request. @@ -217,22 +93,27 @@ * IE 9+ *Bourbon does not intend to support IE filters.* -Resources for checking browser support: [MDN - Moz Dev Network](https://developer.mozilla.org/en-US/), [Mozilla CSS Extensions](https://developer.mozilla.org/en/CSS_Reference/Mozilla_Extensions), [Webkit CSS Properties](http://css-infos.net/properties/webkit.php), [Firefox CSS Properties](http://css-infos.net/properties/firefox.php), [MSDN - Microsoft Dev Network](http://msdn.microsoft.com/en-us/library/ms531207(v=VS.85).aspx) +Resources for checking browser support: +* [MDN - Moz Dev Network](https://developer.mozilla.org/en-US/) +* [Mozilla CSS Extensions](https://developer.mozilla.org/en/CSS_Reference/Mozilla_Extensions) +* [Webkit CSS Properties](http://css-infos.net/properties/webkit.php) +* [MSDN - Microsoft Dev Network](http://msdn.microsoft.com/en-us/library/ms531207\(v=VS.85\).aspx) + Credits ------- ![thoughtbot](http://thoughtbot.com/images/tm/logo.png) -Got questions? Need help? Tweet at [@phillapier](http://twitter.com/phillapier). - Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com/community) The names and logos for thoughtbot are trademarks of thoughtbot, inc. +Got questions? Need help? Tweet at [@phillapier](http://twitter.com/phillapier). + License ------- -Bourbon is Copyright © 2012 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file. +Bourbon is Copyright © 2011-2012 thoughtbot. It is free software, and may be redistributed under the terms specified in the LICENSE file.