Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
Bourbon v3.2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyson Gach committed Dec 30, 2014
1 parent e7f81f1 commit c385323
Show file tree
Hide file tree
Showing 9 changed files with 75 additions and 47 deletions.
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*swp
_site
.DS_store
.sass-cache
*gem
.sass-cache/
/bourbon/
demo/
tmp/
tags
*swp
Gemfile.lock
tmp
20 changes: 11 additions & 9 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
app/
bin/
features/
lib/
bower.json
bourbon.gemspec
Rakefile
Gemfile.lock
Gemfile
.gitignore
app/
bin/
bourbon.gemspec
bower.json
features/
LICENSE.md
lib/
Gemfile
Gemfile.lock
Rakefile
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
bourbon (4.0.0.rc1)
sass (~> 3.3)
bourbon (3.2.4)
sass (~> 3.2)
thor

GEM
Expand Down Expand Up @@ -36,9 +36,9 @@ GEM
rspec-expectations (2.8.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.8.0)
sass (3.3.4)
sass (3.4.9)
term-ansicolor (1.0.7)
thor (0.18.1)
thor (0.19.1)

PLATFORMS
ruby
Expand Down
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
[![Bourbon](http://images.thoughtbot.com/bourbon/bourbon-logo.svg)](http://bourbon.io)

[![Gem Version](http://img.shields.io/gem/v/bourbon.svg?style=flat)](https://rubygems.org/gems/bourbon)
[![Code Climate](http://img.shields.io/codeclimate/github/thoughtbot/bourbon.svg?style=flat)](https://codeclimate.com/github/thoughtbot/bourbon)
[![Gitter chat](https://img.shields.io/badge/gitter-thoughtbot/bourbon-ae3dd2.svg?style=flat)](https://gitter.im/thoughtbot/bourbon)
[![Stack Overflow](http://img.shields.io/badge/stack%20overflow-bourbon-ae3dd2.svg?style=flat)](http://stackoverflow.com/questions/tagged/bourbon)

## A simple and lightweight mixin library for Sass.

### This is the v3.2.4 branch
### _This is the v3.2.4 branch_

Bourbon is a library of pure 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.

Expand Down Expand Up @@ -100,7 +95,7 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
2. Reinstall the Bourbon gem, using the `-v` flag to specify the version you need:

```bash
gem install bourbon -v 3.2.3
gem install bourbon -v 3.2.4
```

3. Follow the [instructions above](#installation) to install Bourbon into your project.
Expand Down
5 changes: 5 additions & 0 deletions app/assets/stylesheets/_bourbon.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Bourbon 3.2.4
// http://bourbon.io
// Copyright 2011-2015 thoughtbot, inc.
// MIT License

// Settings
@import "settings/prefixer";
@import "settings/px-to-em";
Expand Down
29 changes: 23 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
{
"name": "bourbon",
"homepage": "http://bourbon.io/",
"version": "3.2.3",
"description": "A simple and lightweight mixin library for Sass.",
"version": "3.2.4",
"main": "dist/_bourbon.scss",
"license": "MIT",
"ignore": [
"**/.*",
"app",
"bin",
"bourbon.gemspec",
"features",
"LICENSE.md",
"lib",
".gitignore",
"Gemfile",
"Gemfile.lock",
"Rakefile",
"bourbon.gemspec"
]
"package.json",
"Rakefile"
],
"keywords": [
"css",
"mixins",
"sass",
"scss"
],
"authors": [
"thoughtbot (http://thoughtbot.com)"
],
"homepage": "http://bourbon.io",
"repository": {
"type": "git",
"url": "https://github.com/thoughtbot/bourbon.git"
}
}
5 changes: 5 additions & 0 deletions dist/_bourbon.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Bourbon 3.2.4
// http://bourbon.io
// Copyright 2011-2015 thoughtbot, inc.
// MIT License

// Settings
@import "settings/prefixer";
@import "settings/px-to-em";
Expand Down
2 changes: 1 addition & 1 deletion lib/bourbon/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Bourbon
VERSION = "3.2.3"
VERSION = "3.2.4"
end
32 changes: 18 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
{
"name": "bourbon",
"version": "3.2.3",
"version": "3.2.4",
"description": "A simple and lightweight mixin library for Sass.",
"main": "dist/_bourbon.scss",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/thoughtbot/bourbon"
},
"keywords": [
"scss",
"css",
"mixins"
"mixins",
"sass",
"scss"
],
"author": "Thoughtbot",
"license": "MIT",
"homepage": "http://bourbon.io",
"bugs": {
"url": "https://github.com/thoughtbot/bourbon/issues"
},
"homepage": "https://github.com/thoughtbot/bourbon"
"license": "MIT",
"author": {
"name": "thoughtbot",
"url": "http://thoughtbot.com"
},
"main": "dist/_bourbon.scss",
"repository": {
"type": "git",
"url": "https://github.com/thoughtbot/bourbon.git"
},
"scripts": {
"test": "echo \"No test specified\""
}
}

0 comments on commit c385323

Please sign in to comment.