bootstrap-sass 2.3.2.0 → 2.3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f502c25ee946e29cbadf5a88744b41b177eb9e2c
-  data.tar.gz: 2ad210792cd1f45c9e0db7126fa845966d6d0496
+  metadata.gz: 5bb7fd8551f85426c5881a1dc425a65b5a9ac98f
+  data.tar.gz: 4f217305659458105cd1e7d8084bea95e536e473
 SHA512:
-  metadata.gz: 0f632027ad30ce3da7dc6e3b98c2382dda542811aea1b698aae6c6aae05410fe70a5ca00718164093fac8f83a549821740a4827831d5c759833a2a267b74bfb8
-  data.tar.gz: 5b37c7bbde6d8e8ded49094fcd5072fe31508aaed83d81fa87769e6e9d1548907cf393039101a5516e3f5c16608684d6243318cdaac7db7b3ca7cf51a9eb457d
+  metadata.gz: 215470fb0847cbaa9f7d75950b0be7307fa6258519212eab219bff3490063247c3dfd0d7211503e67515c2568bafacc0975b4c6ea0a8ff8d2410ae65bf7cacc3
+  data.tar.gz: fbf087573adc022a364387c31fae39d35e5b8a5b4fd75ecc55fa10b0cc2b1b10c51b37e27a82d4a6471448b7d2db0b1dcf5fbc13f1ee1bdad6cc96fcdf0a8466

data/.gitignore

@@ -0,0 +1,6 @@
+*.gem
+.sass-cache
+bootstrap.css
+bootstrap-responsive.css
+Gemfile.lock
+.rvmrc

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - jruby-19mode
+gemfile:
+  - test/gemfiles/sass_3_2.gemfile
+  - test/gemfiles/sass_head.gemfile

data/CHANGELOG.md

@@ -0,0 +1,92 @@
+# Changelog
+
+## 2.3.2.0
+
+* Update to Bootstrap 2.3.2 - *Dan Allen*
+
+## 2.3.1.3
+
+* Find the correct Sprockets context for the `image_path` function - *Tristan Harward, Gleb Mazovetskiy*
+
+## 2.3.1.2
+
+* Fix changes to image url - *Gleb Mazovetskiy*
+* Copy _variables into project on Compass install - *Phil Thompson*
+* Add `bootstrap-affix` to the Compass template file - *brief*
+
+## 2.3.1.1 (yanked)
+
+* Change how image_url is handled internally - *Tristan Harward*
+* Fix some font variables not having `!default` - *Thomas McDonald*
+
+## 2.3.0.0
+* [#290] Update to Bootstrap 2.3.0 - *Tristan Harward*
+* Fix `rake:debug` with new file locations - *Thomas McDonald*
+* Add draft contributing document - *Thomas McDonald*
+* [#260] Add our load path to the global Sass load path - *Tristan Harward*
+* [#275] Use GitHub notation in Sass head testing gemfile - *Timo Schilling*
+* [#279, #283] Readme improvements - *theverything, Philip Arndt*
+
+## 2.2.2.0
+* [#270] Update to Bootstrap 2.2.2 - *Tristan Harward*
+* [#266] Add license to gemspec - *Peter Marsh*
+
+## 2.2.1.1
+* [#258] Use `bootstrap` prefix for `@import`ing files in `bootstrap/bootstrap.scss` - *Umair Siddique*
+
+## 2.2.1.0
+* [#246] Update to Bootstrap 2.2.1 - *Tristan Harward*
+* [#246] Pull Bootstrap updates from jlong/sass-twitter-bootstrap - *Tristan Harward*
+
+## 2.1.1.0
+* Update to Bootstrap 2.1.1
+* [#222] Remove 100% multiplier in vertical-three-colours
+* [#227] Fix IE component animation collapse
+* [#228] Fix variables documentation link
+* [#231] Made .input-block-level a class as well as mixin
+
+## 2.1.0.1
+* [#219] Fix expected a color. Got: transparent.
+* [#207] Add missing warning style for table row highlighting
+* [#208] Use grid-input-span for input spans
+
+## 2.1.0.0
+* Updated to Bootstrap 2.1
+* Changed some mixin names to be more consistent. Nested mixins in Less are separated by a `-` when they are flattened in Sass.
+
+## 2.0.4.1
+* Fix `.row-fluid > spanX` nesting
+* Small Javascript fixes for those staying on the 2.0.4 release
+* Add `!default` to z-index variables.
+
+## 2.0.4.0
+* Updated to Bootstrap 2.0.4
+* Switched to Bootstrap 2.0.3+'s method of separating responsive files
+* [#149, #150] Fix off by one error introduced with manual revert of media query breakpoints
+* `rake debug` and `rake test` both compile bootstrap & bootstrap-responsive
+
+## 2.0.3.1
+* [#145, #146] Fix button alignment in collapsing navbar as a result of an incorrect variable
+
+## 2.0.3
+* Updated to Bootstrap 2.0.3
+* [#106] Support for Rails < 3.1 through Compass
+* [#132] Add CI testing
+* [#106] Support Rails w/Compass
+* [#134] Fix support for Rails w/Compass
+
+## 2.0.2
+* [#86] Updated to Bootstrap 2.0.2
+Things of note: static navbars now have full width. (to be fixed in 2.0.3) `.navbar-inner > .container { width:940px; }` seems to work in the meanwhile
+* [#62] Fixed asset compilation taking a *very* long time.
+* [#69, #79, #80] \(Hopefully) clarified README. Now with less cat humour.
+* [#91] Removed doubled up Sass extensions for Rails.
+* [#63, #73] Allow for overriding of image-path
+* [[SO](http://stackoverflow.com/a/9909626/241212)] Added makeFluidColumn mixin for defining fluid columns. Fluid rows must use `@extend .row-fluid`, and any column inside it can use `@include makeFluidColumn(num)`, where `num` is the number of columns. Unfortunately, there is a rather major limitation to this: margins on first-child elements must be overriden. See the attached Stack Overflow answer for more information.
+
+## 2.0.1
+* Updated to Bootstrap 2.0.1
+* Modified `@mixin opacity()` to take an argument `0...1` rather than `0...100` to be consistent with Compass.
+
+## 2.0.0
+* Updated to Bootstrap 2.0.0

data/CONTRIBUTING.md

@@ -0,0 +1,71 @@
+# Contributing to bootstrap-sass 
+
+## Bugs
+
+A bug is a _demonstrable problem_ that is caused by the code in the
+repository. Good bug reports are extremely helpful - thank you!
+
+Guidelines for bug reports:
+
+1. **Does it belong here?** — is this a problem with bootstrap-sass, or
+   it an issue with [twitter/bootstrap](https://github.com/twitter/bootstrap)?
+   We only distribute a direct port and will not modify files if they're not
+   changed upstream.
+
+2. **Use the GitHub issue search** — check if the issue has already been
+   reported.
+
+3. **Isolate the problem** — ideally create a [reduced test
+   case](http://css-tricks.com/6263-reduced-test-cases/) and a live example.
+
+A good bug report shouldn't leave others needing to chase you up for more
+information. Please try to be as detailed as possible in your report. What is
+your environment? What steps will reproduce the issue? What browser(s) and OS
+experience the problem? What would you expect to be the outcome? All these
+details will help people to fix any potential bugs.
+
+Example:
+
+> Short and descriptive example bug report title
+>
+> A summary of the issue and the browser/OS environment in which it occurs. If
+> suitable, include the steps required to reproduce the bug.
+>
+> 1. This is the first step
+> 2. This is the second step
+> 3. Further steps, etc.
+>
+> `<url>` (a link to the reduced test case)
+>
+> Any other information you want to share that is relevant to the issue being
+> reported. This might include the lines of code that you have identified as
+> causing the bug, and potential solutions (and your opinions on their
+> merits).
+
+**[File a bug report](https://github.com/thomas-mcdonald/bootstrap-sass/issues/)**
+
+
+## Pull requests
+
+**We will not accept pull requests that modify the SCSS beyond fixing bugs caused by *our* code!**
+
+Most pull requests should go to [twitter/bootstrap](https://github.com/twitter/bootstrap) or [jlong/sass-twitter-bootstrap](https://github.com/jlong/sass-twitter-bootstrap)
+
+Good pull requests - patches, improvements, new features - are a fantastic
+help. They should remain focused in scope and avoid containing unrelated
+commits. If your contribution involves a significant amount of work or substantial
+changes to any part of the project, please open an issue to discuss it first.
+
+Make sure to adhere to the coding conventions used throughout a project
+(indentation, accurate comments, etc.). Please update any documentation that is
+relevant to the change you're making.
+
+## Do not…
+
+Please **do not** use the issue tracker for personal support requests (use
+[Stack Overflow](http://stackoverflow.com/)).
+
+Please **do not** derail or troll issues. Keep the
+discussion on topic and respect the opinions of others.
+
+*props [html5-boilerplate](https://github.com/h5bp/html5-boilerplate/blob/master/CONTRIBUTING.md)*

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.md

@@ -14,17 +14,11 @@ In your Gemfile:
 
 ```ruby
 gem 'sass-rails', '~> 3.2'
-gem 'bootstrap-sass', '~> 2.3.2'
+gem 'bootstrap-sass', '~> 2.3.2.1'
 ```
 
 `bundle install` and restart your server to make the files available.
 
-#### Rails 4
-
-Due to a change in Rails that prevents images from being compiled in vendor and lib, you'll need to add the following line to your application.rb:
-
-    config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
-
 #### CSS
 
 Import Bootstrap in an SCSS file (for example, `application.css.scss`) to get all of Bootstrap's styles, mixins and variables! We recommend against using `//= require` directives, since none of your other stylesheets will be [able to use](https://github.com/thomas-mcdonald/bootstrap-sass/issues/79#issuecomment-4428595) the awesome mixins that Bootstrap has defined.
@@ -123,7 +117,7 @@ Basically this means you should expect to append a separate patch version to the
 ### Bundler?
 
 ```ruby
-gem 'bootstrap-sass', '~> 2.3.2'
+gem 'bootstrap-sass', '~> 2.3.2.1'
 ```
 
 Don't use the standard `~> 2.x.y`. Your apps may break.

data/Rakefile

@@ -0,0 +1,20 @@
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.verbose = true
+end
+
+desc 'Dumps output to a CSS file for testing'
+task :debug do
+  require 'sass'
+  require './lib/bootstrap-sass/compass_functions'
+  require './lib/bootstrap-sass/sass_functions'
+  path = './vendor/assets/stylesheets'
+  %w(bootstrap bootstrap-responsive).each do |file|
+    engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
+    File.open("./#{file}.css", 'w') { |f| f.write(engine.render) }
+  end
+end
+
+task default: :test

data/asseturl.patch

@@ -0,0 +1,15 @@
+diff --git a/vendor/assets/stylesheets/_variables.scss b/vendor/assets/stylesheets/_variables.scss
+index e29dc59..85f4d56 100644
+--- a/vendor/assets/stylesheets/_variables.scss
++++ b/vendor/assets/stylesheets/_variables.scss
+@@ -151,8 +151,8 @@ $zindexModal:             1050 !default;
+ 
+ // Sprite icons path
+ // -------------------------
+-$iconSpritePath:          "../img/glyphicons-halflings.png" !default;
+-$iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png" !default;
++$iconSpritePath:          image-path("glyphicons-halflings.png") !default;
++$iconWhiteSpritePath:     image-path("glyphicons-halflings-white.png") !default;
+ 
+ 
+ // Input placeholder text color

data/bootstrap-sass.gemspec

@@ -0,0 +1,16 @@
+Gem::Specification.new do |s|
+  s.name = "bootstrap-sass"
+  s.version = '2.3.2.1'
+  s.authors = ["Thomas McDonald"]
+  s.email = 'tom@conceptcoding.co.uk'
+  s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"
+  s.homepage = "http://github.com/thomas-mcdonald/bootstrap-sass"
+  s.license = "Apache 2.0"
+
+  s.add_development_dependency 'compass'
+  s.add_development_dependency 'sass-rails', '~> 3.2'
+  s.add_runtime_dependency     'sass',       '~> 3.2'
+
+  s.files      = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- test/*`.split("\n")
+end

data/lib/bootstrap-sass/engine.rb

@@ -1,7 +1,9 @@
 module Bootstrap
   module Rails
     class Engine < ::Rails::Engine
-      # Rails, will you please look in our vendor? kthx
+      initializer "bootstrap-sass.assets.precompile" do |app|
+        app.config.assets.precompile += %w(glyphicons-halflings.png glyphicons-halflings-white.png)
+      end
     end
   end
-end
+end

data/test/compilation_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class CompilationTest < Test::Unit::TestCase
+  def test_compilation
+    path = 'vendor/assets/stylesheets'
+    %w(bootstrap bootstrap-responsive).each do |file|
+      engine = Sass::Engine.for_file("#{path}/#{file}.scss", syntax: :scss, load_paths: [path])
+      assert_nothing_raised do
+        engine.render
+      end
+    end
+  end
+end

data/test/gemfiles/sass_3_2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'sass', '~> 3.2'
+
+gemspec path: '../../'

data/test/gemfiles/sass_head.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'sass', github: 'nex3/sass'
+
+gemspec path: '../../'

data/test/test_helper.rb

@@ -0,0 +1,7 @@
+$:.unshift("#{File.dirname(__FILE__)}/..")
+
+require 'test/unit'
+
+require 'sass'
+require 'lib/bootstrap-sass/compass_functions'
+require 'lib/bootstrap-sass/sass_functions'

data/update-bootstrap.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+
+ROOT=`pwd`"/vendor/assets"
+TMP='tmp/sass-twitter-bootstrap'
+# Pull down sass-twitter-bootstrap sources
+git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-bootstrap
+# Copy lib/ to stylesheets/
+mkdir -p $ROOT/stylesheets/bootstrap
+cp -r $TMP/lib/* $ROOT/stylesheets/bootstrap
+# Copy js/ to javascripts/
+cp -r $TMP/js/* $ROOT/javascripts
+# Copy img/ to images/
+cp -r $TMP/img/* $ROOT/images
+# Remove tests
+rm -r $ROOT/javascripts/tests
+rm -r $ROOT/stylesheets/bootstrap/tests
+
+# Patch the asset-url in _variables.scss
+patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch
+
+# Patch paths in bootstrap.scss and responsive.scss
+sed -i.bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss
+rm $ROOT/stylesheets/bootstrap/*.bak
+
+rm -rf $TMP

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 2.3.2.0
+  version: 2.3.2.1
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -58,6 +58,46 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
+- .travis.yml
+- CHANGELOG.md
+- CONTRIBUTING.md
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- asseturl.patch
+- bootstrap-sass.gemspec
+- lib/bootstrap-sass.rb
+- lib/bootstrap-sass/compass_functions.rb
+- lib/bootstrap-sass/engine.rb
+- lib/bootstrap-sass/sass_functions.rb
+- templates/project/_variables.scss
+- templates/project/manifest.rb
+- templates/project/styles.scss
+- test/compilation_test.rb
+- test/gemfiles/sass_3_2.gemfile
+- test/gemfiles/sass_head.gemfile
+- test/test_helper.rb
+- update-bootstrap.sh
+- vendor/assets/images/glyphicons-halflings-white.png
+- vendor/assets/images/glyphicons-halflings.png
+- vendor/assets/javascripts/bootstrap-affix.js
+- vendor/assets/javascripts/bootstrap-alert.js
+- vendor/assets/javascripts/bootstrap-button.js
+- vendor/assets/javascripts/bootstrap-carousel.js
+- vendor/assets/javascripts/bootstrap-collapse.js
+- vendor/assets/javascripts/bootstrap-dropdown.js
+- vendor/assets/javascripts/bootstrap-modal.js
+- vendor/assets/javascripts/bootstrap-popover.js
+- vendor/assets/javascripts/bootstrap-scrollspy.js
+- vendor/assets/javascripts/bootstrap-tab.js
+- vendor/assets/javascripts/bootstrap-tooltip.js
+- vendor/assets/javascripts/bootstrap-transition.js
+- vendor/assets/javascripts/bootstrap-typeahead.js
+- vendor/assets/javascripts/bootstrap.js
+- vendor/assets/stylesheets/bootstrap-responsive.scss
+- vendor/assets/stylesheets/bootstrap.scss
 - vendor/assets/stylesheets/bootstrap/_accordion.scss
 - vendor/assets/stylesheets/bootstrap/_alerts.scss
 - vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
@@ -99,33 +139,6 @@ files:
 - vendor/assets/stylesheets/bootstrap/_wells.scss
 - vendor/assets/stylesheets/bootstrap/bootstrap.scss
 - vendor/assets/stylesheets/bootstrap/responsive.scss
-- vendor/assets/stylesheets/bootstrap-responsive.scss
-- vendor/assets/stylesheets/bootstrap.scss
-- vendor/assets/javascripts/bootstrap-affix.js
-- vendor/assets/javascripts/bootstrap-alert.js
-- vendor/assets/javascripts/bootstrap-button.js
-- vendor/assets/javascripts/bootstrap-carousel.js
-- vendor/assets/javascripts/bootstrap-collapse.js
-- vendor/assets/javascripts/bootstrap-dropdown.js
-- vendor/assets/javascripts/bootstrap-modal.js
-- vendor/assets/javascripts/bootstrap-popover.js
-- vendor/assets/javascripts/bootstrap-scrollspy.js
-- vendor/assets/javascripts/bootstrap-tab.js
-- vendor/assets/javascripts/bootstrap-tooltip.js
-- vendor/assets/javascripts/bootstrap-transition.js
-- vendor/assets/javascripts/bootstrap-typeahead.js
-- vendor/assets/javascripts/bootstrap.js
-- vendor/assets/images/glyphicons-halflings-white.png
-- vendor/assets/images/glyphicons-halflings.png
-- lib/bootstrap-sass/compass_functions.rb
-- lib/bootstrap-sass/engine.rb
-- lib/bootstrap-sass/sass_functions.rb
-- lib/bootstrap-sass.rb
-- templates/project/_variables.scss
-- templates/project/manifest.rb
-- templates/project/styles.scss
-- README.md
-- LICENSE
 homepage: http://github.com/thomas-mcdonald/bootstrap-sass
 licenses:
 - Apache 2.0
@@ -150,4 +163,8 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass
-test_files: []
+test_files:
+- test/compilation_test.rb
+- test/gemfiles/sass_3_2.gemfile
+- test/gemfiles/sass_head.gemfile
+- test/test_helper.rb