bootstrap-sass-rails 3.0.0.3 → 3.0.3.0

data/app/assets/stylesheets/twitter/bootstrap/_type.scss

@@ -3,19 +3,69 @@
 // --------------------------------------------------
 
 
+// Headings
+// -------------------------
+
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: $headings-font-family;
+  font-weight: $headings-font-weight;
+  line-height: $headings-line-height;
+  color: $headings-color;
+
+  small,
+  .small {
+    font-weight: normal;
+    line-height: 1;
+    color: $headings-small-color;
+  }
+}
+
+h1,
+h2,
+h3 {
+  margin-top: $line-height-computed;
+  margin-bottom: ($line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 65%;
+  }
+}
+h4,
+h5,
+h6 {
+  margin-top: ($line-height-computed / 2);
+  margin-bottom: ($line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 75%;
+  }
+}
+
+h1, .h1 { font-size: $font-size-h1; }
+h2, .h2 { font-size: $font-size-h2; }
+h3, .h3 { font-size: $font-size-h3; }
+h4, .h4 { font-size: $font-size-h4; }
+h5, .h5 { font-size: $font-size-h5; }
+h6, .h6 { font-size: $font-size-h6; }
+
+
 // Body text
 // -------------------------
 
 p {
   margin: 0 0 ($line-height-computed / 2);
 }
+
 .lead {
   margin-bottom: $line-height-computed;
-  font-size: ($font-size-base * 1.15);
+  font-size: floor($font-size-base * 1.15);
   font-weight: 200;
   line-height: 1.4;
 
-  @media (min-width: 768px) {
+  @media (min-width: $screen-sm-min) {
     font-size: ($font-size-base * 1.5);
   }
 }
@@ -25,64 +75,51 @@ p {
 // -------------------------
 
 // Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
+small,
+.small  { font-size: 85%; }
 
 // Undo browser default styling
 cite    { font-style: normal; }
 
 // Contextual emphasis
-.text-muted          { color: $text-muted; }
-.text-primary        { color: $brand-primary; }
-.text-warning        { color: $state-warning-text; }
-.text-danger         { color: $state-danger-text; }
-.text-success        { color: $state-success-text; }
-.text-info           { color: $state-info-text; }
-
-// Alignment
-.text-left           { text-align: left; }
-.text-right          { text-align: right; }
-.text-center         { text-align: center; }
-
-
-// Headings
-// -------------------------
-
-h1, h2, h3, h4, h5, h6,
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: $headings-font-family;
-  font-weight: $headings-font-weight;
-  line-height: $headings-line-height;
-  small {
-    font-weight: normal;
-    line-height: 1;
-    color: $headings-small-color;
+.text-muted {
+  color: $text-muted;
+}
+.text-primary {
+  color: $brand-primary;
+  &:hover {
+    color: darken($brand-primary, 10%);
   }
 }
-
-h1,
-h2,
-h3 {
-  margin-top: $line-height-computed;
-  margin-bottom: ($line-height-computed / 2);
+.text-warning {
+  color: $state-warning-text;
+  &:hover {
+    color: darken($state-warning-text, 10%);
+  }
 }
-h4,
-h5,
-h6 {
-  margin-top: ($line-height-computed / 2);
-  margin-bottom: ($line-height-computed / 2);
+.text-danger {
+  color: $state-danger-text;
+  &:hover {
+    color: darken($state-danger-text, 10%);
+  }
+}
+.text-success {
+  color: $state-success-text;
+  &:hover {
+    color: darken($state-success-text, 10%);
+  }
+}
+.text-info {
+  color: $state-info-text;
+  &:hover {
+    color: darken($state-info-text, 10%);
+  }
 }
 
-h1, .h1 { font-size: floor($font-size-base * 2.60); } // ~36px
-h2, .h2 { font-size: floor($font-size-base * 2.15); } // ~30px
-h3, .h3 { font-size: ceil($font-size-base * 1.70); } // ~24px
-h4, .h4 { font-size: ceil($font-size-base * 1.25); } // ~18px
-h5, .h5 { font-size:  $font-size-base; }
-h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px
-
-h1 small, .h1 small { font-size: ceil($font-size-base * 1.70); } // ~24px
-h2 small, .h2 small { font-size: ceil($font-size-base * 1.25); } // ~18px
-h3 small, .h3 small,
-h4 small, .h4 small { font-size: $font-size-base; }
+// Alignment
+.text-left           { text-align: left; }
+.text-right          { text-align: right; }
+.text-center         { text-align: center; }
 
 
 // Page header
@@ -95,7 +132,6 @@ h4 small, .h4 small { font-size: $font-size-base; }
 }
 
 
-
 // Lists
 // --------------------------------------------------
 
@@ -105,7 +141,7 @@ ol {
   margin-top: 0;
   margin-bottom: ($line-height-computed / 2);
   ul,
-  ol{
+  ol {
     margin-bottom: 0;
   }
 }
@@ -117,18 +153,25 @@ ol {
   padding-left: 0;
   list-style: none;
 }
+
 // Inline turns list items into inline-block
 .list-inline {
   @extend .list-unstyled;
+
   > li {
     display: inline-block;
     padding-left: 5px;
     padding-right: 5px;
+
+    &:first-child {
+      padding-left: 0;
+    }
   }
 }
 
 // Description Lists
 dl {
+  margin-top: 0; // Remove browser default
   margin-bottom: $line-height-computed;
 }
 dt,
@@ -168,12 +211,12 @@ dd {
 
 // Abbreviations and acronyms
 abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted $abbr-border-color;
 }
-abbr.initialism {
+.initialism {
   font-size: 90%;
   text-transform: uppercase;
 }
@@ -191,12 +234,13 @@ blockquote {
   p:last-child {
     margin-bottom: 0;
   }
-  small {
+  small,
+  .small {
     display: block;
     line-height: $line-height-base;
     color: $blockquote-small-color;
     &:before {
-      content: '\2014 \00A0';// EM DASH, NBSP
+      content: '\2014 \00A0'; // EM DASH, NBSP
     }
   }
 
@@ -207,23 +251,23 @@ blockquote {
     border-right: 5px solid $blockquote-border-color;
     border-left: 0;
     p,
-    small {
+    small,
+    .small {
       text-align: right;
     }
-    small {
+    small,
+    .small {
       &:before {
         content: '';
       }
       &:after {
-        content: '\00A0 \2014';// NBSP, EM DASH
+        content: '\00A0 \2014'; // NBSP, EM DASH
       }
     }
   }
 }
 
 // Quotes
-q:before,
-q:after,
 blockquote:before,
 blockquote:after {
   content: "";
@@ -231,7 +275,6 @@ blockquote:after {
 
 // Addresses
 address {
-  display: block;
   margin-bottom: $line-height-computed;
   font-style: normal;
   line-height: $line-height-base;

data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss

@@ -9,6 +9,9 @@
 .clearfix {
   @include clearfix();
 }
+.center-block {
+  @include center-block();
+}
 .pull-right {
   float: right !important;
 }
@@ -20,6 +23,7 @@
 // Toggling content
 // -------------------------
 
+// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
 .hide {
   display: none !important;
 }
@@ -30,7 +34,17 @@
   visibility: hidden;
 }
 .text-hide {
-  @include hide-text();
+  @include text-hide();
+}
+
+
+// Hide from screenreaders and browsers
+//
+// Credit: HTML5 Boilerplate
+
+.hidden {
+  display: none !important;
+  visibility: hidden !important;
 }
 
 

data/app/assets/stylesheets/twitter/bootstrap/_variables.scss

@@ -41,19 +41,28 @@ $link-hover-color:      darken($link-color, 15%) !default;
 
 $font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
-$font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace !default;
+$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
 $font-family-base:        $font-family-sans-serif !default;
 
 $font-size-base:          14px !default;
 $font-size-large:         ceil($font-size-base * 1.25) !default; // ~18px
 $font-size-small:         ceil($font-size-base * 0.85) !default; // ~12px
 
+$font-size-h1:            floor($font-size-base * 2.6) !default; // ~36px
+$font-size-h2:            floor($font-size-base * 2.15) !default; // ~30px
+$font-size-h3:            ceil($font-size-base * 1.7) !default; // ~24px
+$font-size-h4:            ceil($font-size-base * 1.25) !default; // ~18px
+$font-size-h5:            $font-size-base !default;
+$font-size-h6:            ceil($font-size-base * 0.85) !default; // ~12px
+
 $line-height-base:        1.428571429 !default; // 20/14
 $line-height-computed:    floor($font-size-base * $line-height-base) !default; // ~20px
 
 $headings-font-family:    $font-family-base !default;
 $headings-font-weight:    500 !default;
 $headings-line-height:    1.1 !default;
+$headings-color:          inherit !default;
+
 
 // Iconography
 // -------------------------
@@ -75,6 +84,9 @@ $padding-large-horizontal:       16px !default;
 $padding-small-vertical:         5px !default;
 $padding-small-horizontal:       10px !default;
 
+$padding-xs-vertical:            1px !default;
+$padding-xs-horizontal:          5px !default;
+
 $line-height-large:              1.33 !default;
 $line-height-small:              1.5 !default;
 
@@ -82,6 +94,7 @@ $border-radius-base:             4px !default;
 $border-radius-large:            6px !default;
 $border-radius-small:            3px !default;
 
+$component-active-color:         #fff !default;
 $component-active-bg:            $brand-primary !default;
 
 $caret-width-base:               4px !default;
@@ -147,7 +160,7 @@ $input-border-focus:             #66afe9 !default;
 $input-color-placeholder:        $gray-light !default;
 
 $input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
-$input-height-large:             (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
+$input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
 $input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
 
 $legend-color:                   $gray-dark !default;
@@ -165,19 +178,17 @@ $dropdown-border:                rgba(0,0,0,.15) !default;
 $dropdown-fallback-border:       #ccc !default;
 $dropdown-divider-bg:            #e5e5e5 !default;
 
-$dropdown-link-active-color:     #fff !default;
-$dropdown-link-active-bg:        $component-active-bg !default;
-
 $dropdown-link-color:            $gray-dark !default;
-$dropdown-link-hover-color:      #fff !default;
-$dropdown-link-hover-bg:         $dropdown-link-active-bg !default;
+$dropdown-link-hover-color:      darken($gray-dark, 5%) !default;
+$dropdown-link-hover-bg:         #f5f5f5 !default;
+
+$dropdown-link-active-color:     $component-active-color !default;
+$dropdown-link-active-bg:        $component-active-bg !default;
 
 $dropdown-link-disabled-color:   $gray-light !default;
 
 $dropdown-header-color:          $gray-light !default;
 
-$dropdown-caret-color:           #000 !default;
-
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -200,25 +211,33 @@ $zindex-modal:             1050 !default;
 // --------------------------------------------------
 
 // Extra small screen / phone
+// Note: Deprecated $screen-xs and $screen-phone as of v3.0.1
 $screen-xs:                  480px !default;
-$screen-phone:               $screen-xs !default;
+$screen-xs-min:              $screen-xs !default;
+$screen-phone:               $screen-xs-min !default;
 
 // Small screen / tablet
+// Note: Deprecated $screen-sm and $screen-tablet as of v3.0.1
 $screen-sm:                  768px !default;
-$screen-tablet:              $screen-sm !default;
+$screen-sm-min:              $screen-sm !default;
+$screen-tablet:              $screen-sm-min !default;
 
 // Medium screen / desktop
+// Note: Deprecated $screen-md and $screen-desktop as of v3.0.1
 $screen-md:                  992px !default;
-$screen-desktop:             $screen-md !default;
+$screen-md-min:              $screen-md !default;
+$screen-desktop:             $screen-md-min !default;
 
 // Large screen / wide desktop
+// Note: Deprecated $screen-lg and $screen-lg-desktop as of v3.0.1
 $screen-lg:                  1200px !default;
-$screen-lg-desktop:          $screen-lg !default;
+$screen-lg-min:              $screen-lg !default;
+$screen-lg-desktop:          $screen-lg-min !default;
 
 // So media queries don't overlap when required, provide a maximum
-$screen-xs-max:              ($screen-sm - 1) !default;
-$screen-sm-max:              ($screen-md - 1) !default;
-$screen-md-max:              ($screen-lg - 1) !default;
+$screen-xs-max:              ($screen-sm-min - 1) !default;
+$screen-sm-max:              ($screen-md-min - 1) !default;
+$screen-md-max:              ($screen-lg-min - 1) !default;
 
 
 // Grid system
@@ -228,8 +247,13 @@ $screen-md-max:              ($screen-lg - 1) !default;
 $grid-columns:              12 !default;
 // Padding, to be divided by two and applied to the left and right of all columns
 $grid-gutter-width:         30px !default;
-// Point at which the navbar stops collapsing
-$grid-float-breakpoint:     $screen-tablet !default;
+
+// Navbar collapse
+
+// Point at which the navbar becomes uncollapsed
+$grid-float-breakpoint:     $screen-sm-min !default;
+// Point at which the navbar begins collapsing
+$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
 
 
 // Navbar
@@ -238,13 +262,14 @@ $grid-float-breakpoint:     $screen-tablet !default;
 // Basics of a navbar
 $navbar-height:                    50px !default;
 $navbar-margin-bottom:             $line-height-computed !default;
-$navbar-default-color:             #777 !default;
-$navbar-default-bg:                #f8f8f8 !default;
-$navbar-default-border:            darken($navbar-default-bg, 6.5%) !default;
 $navbar-border-radius:             $border-radius-base !default;
 $navbar-padding-horizontal:        floor($grid-gutter-width / 2) !default;
 $navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2) !default;
 
+$navbar-default-color:             #777 !default;
+$navbar-default-bg:                #f8f8f8 !default;
+$navbar-default-border:            darken($navbar-default-bg, 6.5%) !default;
+
 // Navbar links
 $navbar-default-link-color:                #777 !default;
 $navbar-default-link-hover-color:          #333 !default;
@@ -256,7 +281,7 @@ $navbar-default-link-disabled-bg:          transparent !default;
 
 // Navbar brand label
 $navbar-default-brand-color:               $navbar-default-link-color !default;
-$navbar-default-brand-hover-color:         darken($navbar-default-link-color, 10%) !default;
+$navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 10%) !default;
 $navbar-default-brand-hover-bg:            transparent !default;
 
 // Navbar toggle
@@ -286,13 +311,6 @@ $navbar-inverse-brand-color:                $navbar-inverse-link-color !default;
 $navbar-inverse-brand-hover-color:          #fff !default;
 $navbar-inverse-brand-hover-bg:             transparent !default;
 
-// Inverted navbar search
-// Normal navbar needs no special styles or vars
-$navbar-inverse-search-bg:                  lighten($navbar-inverse-bg, 25%) !default;
-$navbar-inverse-search-bg-focus:            #fff !default;
-$navbar-inverse-search-border:              $navbar-inverse-bg !default;
-$navbar-inverse-search-placeholder-color:   #ccc !default;
-
 // Inverted navbar toggle
 $navbar-inverse-toggle-hover-bg:            #333 !default;
 $navbar-inverse-toggle-icon-bar-bg:         #fff !default;
@@ -309,7 +327,6 @@ $nav-disabled-link-color:                   $gray-light !default;
 $nav-disabled-link-hover-color:             $gray-light !default;
 
 $nav-open-link-hover-color:                 #fff !default;
-$nav-open-caret-border-color:               #fff !default;
 
 // Tabs
 $nav-tabs-border-color:                     #ddd !default;
@@ -324,8 +341,9 @@ $nav-tabs-justified-link-border-color:            #ddd !default;
 $nav-tabs-justified-active-link-border-color:     $body-bg !default;
 
 // Pills
+$nav-pills-border-radius:                   $border-radius-base !default;
 $nav-pills-active-link-hover-bg:            $component-active-bg !default;
-$nav-pills-active-link-hover-color:         #fff !default;
+$nav-pills-active-link-hover-color:         $component-active-color !default;
 
 
 // Pagination
@@ -355,29 +373,29 @@ $pager-disabled-color:                 $gray-light !default;
 $jumbotron-padding:              30px !default;
 $jumbotron-color:                inherit !default;
 $jumbotron-bg:                   $gray-lighter !default;
-
 $jumbotron-heading-color:        inherit !default;
+$jumbotron-font-size:            ceil($font-size-base * 1.5) !default;
 
 
 // Form states and alerts
 // -------------------------
 
-$state-warning-text:             #c09853 !default;
-$state-warning-bg:               #fcf8e3 !default;
-$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 3%) !default;
-
-$state-danger-text:              #b94a48 !default;
-$state-danger-bg:                #f2dede !default;
-$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 3%) !default;
-
-$state-success-text:             #468847 !default;
+$state-success-text:             #3c763d !default;
 $state-success-bg:               #dff0d8 !default;
 $state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
 
-$state-info-text:                #3a87ad !default;
+$state-info-text:                #31708f !default;
 $state-info-bg:                  #d9edf7 !default;
 $state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
 
+$state-warning-text:             #8a6d3b !default;
+$state-warning-bg:               #fcf8e3 !default;
+$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
+
+$state-danger-text:              #a94442 !default;
+$state-danger-bg:                #f2dede !default;
+$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
+
 
 // Tooltips
 // -------------------------
@@ -478,7 +496,7 @@ $list-group-border:           #ddd !default;
 $list-group-border-radius:    $border-radius-base !default;
 
 $list-group-hover-bg:         #f5f5f5 !default;
-$list-group-active-color:     #fff !default;
+$list-group-active-color:     $component-active-color !default;
 $list-group-active-bg:        $component-active-bg !default;
 $list-group-active-border:    $list-group-active-bg !default;
 
@@ -553,6 +571,7 @@ $badge-border-radius:         10px !default;
 $breadcrumb-bg:               #f5f5f5 !default;
 $breadcrumb-color:            #ccc !default;
 $breadcrumb-active-color:     $gray-light !default;
+$breadcrumb-separator:        "/" !default;
 
 
 // Carousel
@@ -573,8 +592,8 @@ $carousel-caption-color:                      #fff !default;
 
 // Close
 // ------------------------
-$close-color:                 #000 !default;
 $close-font-weight:           bold !default;
+$close-color:                 #000 !default;
 $close-text-shadow:           0 1px 0 #fff !default;
 
 
@@ -611,10 +630,13 @@ $component-offset-horizontal: 180px !default;
 // --------------------------------------------------
 
 // Small screen / tablet
-$container-tablet:            ((720px + $grid-gutter-width)) !default;
+$container-tablet:             ((720px + $grid-gutter-width)) !default;
+$container-sm:                 $container-tablet !default;
 
 // Medium screen / desktop
-$container-desktop:           ((940px + $grid-gutter-width)) !default;
+$container-desktop:            ((940px + $grid-gutter-width)) !default;
+$container-md:                 $container-desktop !default;
 
 // Large screen / wide desktop
-$container-lg-desktop:        ((1140px + $grid-gutter-width)) !default;
+$container-large-desktop:      ((1140px + $grid-gutter-width)) !default;
+$container-lg:                 $container-large-desktop !default;

data/app/assets/stylesheets/twitter/bootstrap.css.scss

@@ -1,13 +1,3 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
 // Core variables and mixins
 @import "twitter/bootstrap/variables";
 @import "twitter/bootstrap/mixins";

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

@@ -2,7 +2,15 @@ module Bootstrap
   module Sass
     module Rails
       class Engine < ::Rails::Engine
-        # Make rails look at the vendored assets
+        initializer :setup_bootstrap_sass_rails, group: :all do |app|
+          # Ten significant digits precision is required for calculations
+          # to work out in Bootstrap 3.0 - to match LESS/JS calculations
+          # bump the default precision to match IEEE-754 double precision
+          # floating point requirements
+          if ::Sass::Script::Number.precision < 10
+            ::Sass::Script::Number.precision = 15
+          end
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '3.0.0.3'
+      VERSION = '3.0.3.0'
     end
   end
 end

data/lib/generators/bootstrap/customize_generator.rb

@@ -0,0 +1,37 @@
+require 'rails/generators'
+
+module Bootstrap
+  class CustomizeGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+
+    class_option :customize_variables, type: :boolean, default: true, desc: 'Customize variables to define colors, sizes and more inside your custom stylesheets'
+    class_option :css_components, type: :boolean, default: false, desc: 'Choose which SCSS files to compile into your custom build of Bootstrap'
+    class_option :js_components, type: :boolean, default: false, desc: 'Choose which JS files to compile into your custom build of Bootstrap'
+
+    # Copy all needed stylesheets in the asset directory of the application
+    def customize_default_variables
+      template "bootstrap-custom.css.scss", "app/assets/stylesheets/bootstrap-custom.css.scss"
+    end
+
+    def customize_css_components
+      if options.css_components?
+        append_file "app/assets/stylesheets/bootstrap-custom.css.scss" do
+          File.read File.expand_path("../../../../app/assets/stylesheets/twitter/bootstrap.css.scss", __FILE__)
+        end
+      end
+    end
+
+    def customize_js_components
+      if options.js_components?
+        template "bootstrap-custom.js", "app/assets/javascripts/bootstrap-custom.js"
+        append_file "app/assets/javascripts/bootstrap-custom.js" do
+          File.read File.expand_path("../../../../app/assets/javascripts/twitter/bootstrap.js", __FILE__)
+        end
+      end
+    end
+
+    def show_usage
+      readme "USAGE" if behavior == :invoke
+    end
+  end
+end