bootstrap-sass-rails 2.0.2.0 → 2.0.2.1

data/lib/bootstrap/sass/rails/version.rb

@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '2.0.2.0'
+      VERSION = '2.0.2.1'
     end
   end
 end

data/test/dummy/log/test.log

@@ -1243,3 +1243,41 @@ Compiled twitter/bootstrap.css  (559ms)  (pid 9855)
 Compiled sprockets.css  (567ms)  (pid 9855)
 Compiled twitter/bootstrap.css  (574ms)  (pid 9855)
 Compiled sprockets.css  (581ms)  (pid 9855)
+Compiled application.css  (738ms)  (pid 90375)
+Compiled application.css  (511ms)  (pid 90375)
+Compiled application.css  (522ms)  (pid 90375)
+Compiled twitter/bootstrap/transition.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/alert.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/button.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/popover.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/tab.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap.js  (98ms)  (pid 90375)
+Compiled application.js  (124ms)  (pid 90375)
+Compiled twitter/bootstrap/transition.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/alert.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/button.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/carousel.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/collapse.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/dropdown.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/tooltip.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/popover.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/scrollspy.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/tab.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap/typeahead.js  (0ms)  (pid 90375)
+Compiled twitter/bootstrap.js  (80ms)  (pid 90375)
+Compiled application.js  (86ms)  (pid 90375)
+Compiled twitter/bootstrap/modal.js  (0ms)  (pid 90375)
+Compiled individual.js  (6ms)  (pid 90375)
+Compiled individual.css  (123ms)  (pid 90375)
+Compiled twitter/bootstrap.css  (584ms)  (pid 90375)
+Compiled sprockets.css  (591ms)  (pid 90375)
+Compiled twitter/bootstrap.css  (559ms)  (pid 90375)
+Compiled sprockets.css  (590ms)  (pid 90375)

data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss

@@ -505,11 +505,11 @@
 }
 
 // The Grid
-@mixin grid-core-offset($columns) {
+@mixin grid-core-offset($gridColumnWidth, $gridGutterWidth, $columns) {
   margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)) + ($gridGutterWidth * 2);
 }
 
-@mixin grid-core-span($columns) {
+@mixin grid-core-span($gridColumnWidth, $gridGutterWidth, $columns) {
   width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
 }
 
@@ -527,16 +527,16 @@
   // Set the container width, and override it for fixed navbars in media queries
   .container,
   .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container { @include grid-core-span($gridColumns); }
+  .navbar-fixed-bottom .container { @include grid-core-span($gridColumnWidth, $gridGutterWidth, $gridColumns); }
 
   // generate .spanX and .offsetX
   @for $index from 1 through $gridColumns {
-    .span#{$index}  { @include grid-core-span($index) }
-    .offset#{$index} { @include grid-core-offset($index) }
+    .span#{$index}  { @include grid-core-span($gridColumnWidth, $gridGutterWidth, $index) }
+    .offset#{$index} { @include grid-core-offset($gridColumnWidth, $gridGutterWidth, $index) }
   }
 }
 
-@mixin grid-fluid-span($columns) {
+@mixin grid-fluid-span($gridColumnWidth, $gridGutterWidth, $columns) {
   width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
 }
 
@@ -554,12 +554,12 @@
 
     // generate .spanX
     @for $index from 1 through $gridColumns {
-      > .span#{$index} { @include grid-fluid-span($index); }
+      > .span#{$index} { @include grid-fluid-span($gridColumnWidth, $gridGutterWidth, $index); }
     }
   }
 }
 
-@mixin grid-input-span($columns) {
+@mixin grid-input-span($gridColumnWidth, $gridGutterWidth, $columns) {
   width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
 }
 @mixin grid-input($gridColumnWidth, $gridGutterWidth) {
@@ -574,7 +574,7 @@
     input.span#{$index},
     textarea.span#{$index},
     .uneditable-input.span#{$index} {
-      @include grid-input-span($index);
+      @include grid-input-span($gridColumnWidth, $gridGutterWidth, $index);
     }
   }
 }

data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss

@@ -181,7 +181,7 @@
 
 .navbar-fixed-top .container,
 .navbar-fixed-bottom .container {
-  @include grid-core-span($gridColumns);
+  @include grid-core-span($gridColumnWidth, $gridGutterWidth, $gridColumns);
 }
 
 // Fixed to top

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2.0
+  version: 2.0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000 Z
+date: 2012-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70152550514080 !ruby/object:Gem::Requirement
+  requirement: &70313336630920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70152550514080
+  version_requirements: *70313336630920
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70152550513480 !ruby/object:Gem::Requirement
+  requirement: &70313336629580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70152550513480
+  version_requirements: *70313336629580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70152550513000 !ruby/object:Gem::Requirement
+  requirement: &70313336629120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70152550513000
+  version_requirements: *70313336629120
 description: Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps,
   and more. It includes base CSS styles for typography, forms, buttons, tables, grids,
   navigation, alerts, and more.
@@ -220,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 630178751143479804
+      hash: -3446989779704171088
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 630178751143479804
+      hash: -3446989779704171088
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17