Permalink
Browse files

upgrade bootstrap-sass to 2.3.1.1

  • Loading branch information...
tka committed Apr 27, 2013
1 parent 3713c4c commit ea074e07a5037c53b8068b247df0c69572081d1b
Showing with 47 additions and 28 deletions.
  1. +0 −14 lib/ruby/compass_extensions/bootstrap-sass-2.3.1.0/lib/bootstrap-sass/compass_functions.rb
  2. 0 lib/ruby/compass_extensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/LICENSE
  3. +11 −3 lib/ruby/compass_extensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/README.md
  4. +14 −8 lib/ruby/compass_extensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/lib/bootstrap-sass.rb
  5. +19 −0 lib/ruby/compass_extensions/bootstrap-sass-2.3.1.1/lib/bootstrap-sass/compass_functions.rb
  6. 0 ...compass_extensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/lib/bootstrap-sass/engine.rb
  7. 0 .../bootstrap-sass/rails_functions.rb → bootstrap-sass-2.3.1.1/lib/bootstrap-sass/sass_functions.rb}
  8. 0 ...ompass_extensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/templates/project/manifest.rb
  9. 0 ...ompass_extensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/templates/project/styles.scss
  10. BIN ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/images/glyphicons-halflings-white.png
  11. BIN ...s/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/images/glyphicons-halflings.png
  12. 0 ...ns/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-affix.js
  13. 0 ...ns/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-alert.js
  14. 0 ...s/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-button.js
  15. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-carousel.js
  16. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-collapse.js
  17. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-dropdown.js
  18. 0 ...ns/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-modal.js
  19. 0 .../{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-popover.js
  20. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-scrollspy.js
  21. 0 ...ions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-tab.js
  22. 0 .../{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-tooltip.js
  23. 0 ...ootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-transition.js
  24. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap-typeahead.js
  25. 0 ...tensions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/javascripts/bootstrap.js
  26. 0 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap-responsive.scss
  27. 0 ...nsions/{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap.scss
  28. 0 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_accordion.scss
  29. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_alerts.scss
  30. 0 ...trap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
  31. 0 ...ap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_button-groups.scss
  32. 0 ...ootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_buttons.scss
  33. 0 ...otstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_carousel.scss
  34. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_close.scss
  35. 0 .../{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_code.scss
  36. 0 ...-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_component-animations.scss
  37. 0 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
  38. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_forms.scss
  39. 0 .../{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_grid.scss
  40. 0 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_hero-unit.scss
  41. 0 ...ap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_labels-badges.scss
  42. 0 ...ootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_layouts.scss
  43. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_media.scss
  44. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_mixins.scss
  45. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_modals.scss
  46. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_navbar.scss
  47. 0 .../{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_navs.scss
  48. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_pager.scss
  49. 0 ...strap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_pagination.scss
  50. 0 ...otstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_popovers.scss
  51. 0 ...ap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
  52. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_reset.scss
  53. 0 ...2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_responsive-1200px-min.scss
  54. 0 ...-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss
  55. 0 ....3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_responsive-768px-979px.scss
  56. 0 ...ass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss
  57. 0 ...-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
  58. 0 ...trap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
  59. 0 ...ootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_sprites.scss
  60. 0 ...bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_tables.scss
  61. 0 ...strap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
  62. 0 ...ootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_tooltip.scss
  63. 0 .../{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_type.scss
  64. 0 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_utilities.scss
  65. +3 −3 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_variables.scss
  66. 0 ...{bootstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/_wells.scss
  67. 0 ...otstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/bootstrap.scss
  68. 0 ...tstrap-sass-2.3.1.0 → bootstrap-sass-2.3.1.1}/vendor/assets/stylesheets/bootstrap/responsive.scss
@@ -1,14 +0,0 @@
-# This contains functions for use with a project *only* using Compass.
-
-module Sass::Script::Functions
- # Define image_path for Compass to allow use of sprites without url() wrapper.
- def image_path(asset)
- if defined?(::Compass)
- image_url(asset, Sass::Script::Bool.new(true))
- else
- # Revert to the old compass-agnostic path determination
- asset_sans_quotes = asset.value.gsub('"', '')
- Sass::Script::String.new("/images/#{asset_sans_quotes}", :string)
- end
- end
-end
@@ -14,12 +14,20 @@ In your Gemfile:
```ruby
gem 'sass-rails', '~> 3.2'
-gem 'bootstrap-sass', '~> 2.3.1.0'
+gem 'bootstrap-sass', '~> 2.3.1.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 your SCSS file of choice 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.
+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.
```css
@import "bootstrap";
@@ -115,7 +123,7 @@ Basically this means you should expect to append a separate patch version to the
### Bundler?
```ruby
-gem 'bootstrap-sass', '~> 2.3.1.0'
+gem 'bootstrap-sass', '~> 2.3.1.1'
```
Don't use the standard `~> 2.x.y`. Your apps may break.
@@ -3,20 +3,22 @@ class FrameworkNotFound < StandardError; end
# Inspired by Kaminari
def self.load!
- if compass? && asset_pipeline?
- register_compass_extension
- register_rails_engine
- elsif compass?
- # Only require compass extension if a standalone project
+ if compass?
require 'bootstrap-sass/compass_functions'
register_compass_extension
elsif asset_pipeline?
- require 'sass-rails' # See: https://github.com/thomas-mcdonald/bootstrap-sass/pull/4
+ require 'bootstrap-sass/sass_functions'
+ end
+
+ if rails?
+ require 'sass-rails'
register_rails_engine
- require 'bootstrap-sass/rails_functions'
- else
+ end
+
+ if !(rails? || compass?)
raise Bootstrap::FrameworkNotFound, "bootstrap-sass requires either Rails > 3.1 or Compass, neither of which are loaded"
end
+
stylesheets = File.expand_path(File.join("..", 'vendor', 'assets', 'stylesheets'))
::Sass.load_paths << stylesheets
end
@@ -30,6 +32,10 @@ def self.compass?
defined?(::Compass)
end
+ def self.rails?
+ defined?(::Rails)
+ end
+
def self.register_compass_extension
base = File.join(File.dirname(__FILE__), '..')
styles = File.join(base, 'vendor', 'assets', 'stylesheets')
@@ -0,0 +1,19 @@
+# This contains functions for use with a project *only* using Compass.
+module Sass::Script::Functions
+ def image_path(source, options = {})
+ if defined?(::Sprockets)
+ ::Sass::Script::String.new sprockets_context.image_path(source.value).to_s, :string
+ elsif defined?(::Compass)
+ image_url(source, Sass::Script::Bool.new(true))
+ else
+ # Revert to the old compass-agnostic path determination
+ asset_sans_quotes = source.value.gsub('"', '')
+ Sass::Script::String.new("/images/#{asset_sans_quotes}", :string)
+ end
+ end
+
+ protected
+ def sprockets_context # :nodoc:
+ options[:custom][:sprockets_context]
+ end
+end
@@ -62,9 +62,9 @@ $headingsColor: inherit !default; // empty to use BS default, $textColor
// -------------------------
// Based on 14px font-size and 20px line-height
-$fontSizeLarge: $baseFontSize * 1.25; // ~18px
-$fontSizeSmall: $baseFontSize * 0.85; // ~12px
-$fontSizeMini: $baseFontSize * 0.75; // ~11px
+$fontSizeLarge: $baseFontSize * 1.25 !default; // ~18px
+$fontSizeSmall: $baseFontSize * 0.85 !default; // ~12px
+$fontSizeMini: $baseFontSize * 0.75 !default; // ~11px
$paddingLarge: 11px 19px !default; // 44px
$paddingSmall: 2px 10px !default; // 26px

0 comments on commit ea074e0

Please sign in to comment.