bootstrap-sass-rails 3.0.2.1 → 3.0.3.0

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

@@ -48,11 +48,6 @@
     &:focus {
       background-color: $nav-link-hover-bg;
       border-color: $link-color;
-
-      .caret {
-        border-top-color: $link-hover-color;
-        border-bottom-color: $link-hover-color;
-      }
     }
   }
 
@@ -138,11 +133,6 @@
       &:focus {
         color: $nav-pills-active-link-hover-color;
         background-color: $nav-pills-active-link-hover-bg;
-
-        .caret {
-          border-top-color: $nav-pills-active-link-hover-color;
-          border-bottom-color: $nav-pills-active-link-hover-color;
-        }
       }
     }
   }
@@ -243,16 +233,6 @@
 // Dropdowns
 // -------------------------
 
-// Make dropdown carets use link color in navs
-.nav .caret {
-  border-top-color: $link-color;
-  border-bottom-color: $link-color;
-}
-.nav a:hover .caret {
-  border-top-color: $link-hover-color;
-  border-bottom-color: $link-hover-color;
-}
-
 // Specific dropdowns
 .nav-tabs .dropdown-menu {
   // make dropdown border overlap tab border

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

@@ -57,13 +57,17 @@
 
 .panel {
   > .table,
-  > .table-responsive {
+  > .table-responsive > .table {
     margin-bottom: 0;
   }
   > .panel-body + .table,
   > .panel-body + .table-responsive {
     border-top: 1px solid $table-border-color;
   }
+  > .table > tbody:first-child th,
+  > .table > tbody:first-child td {
+    border-top: 0;
+  }
   > .table-bordered,
   > .table-responsive > .table-bordered {
     border: 0;
@@ -87,6 +91,10 @@
       }
     }
   }
+  > .table-responsive {
+    border: 0;
+    margin-bottom: 0;
+  }
 }
 
 
@@ -106,6 +114,8 @@
   margin-top: 0;
   margin-bottom: 0;
   font-size: ceil(($font-size-base * 1.125));
+  color: inherit;
+
   > a {
     color: inherit;
   }

data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss

@@ -12,18 +12,6 @@
   to    { background-position: 0 0; }
 }
 
-// Firefox
-@-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
 // Spec and IE10+
 @keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }

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

@@ -104,10 +104,12 @@ th {
 //
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
-.table-striped > tbody > tr:nth-child(odd) {
-  > td,
-  > th {
-    background-color: $table-bg-accent;
+.table-striped {
+  > tbody > tr:nth-child(odd) {
+    > td,
+    > th {
+      background-color: $table-bg-accent;
+    }
   }
 }
 
@@ -116,10 +118,12 @@ th {
 //
 // Placed here since it has to come after the potential zebra striping
 
-.table-hover > tbody > tr:hover {
-  > td,
-  > th {
-    background-color: $table-bg-hover;
+.table-hover {
+  > tbody > tr:hover {
+    > td,
+    > th {
+      background-color: $table-bg-hover;
+    }
   }
 }
 
@@ -129,6 +133,7 @@ th {
 // Reset default table behavior
 
 table col[class*="col-"] {
+  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
   float: none;
   display: table-column;
 }
@@ -148,21 +153,11 @@ table {
 // Exact selectors below required to override `.table-striped` and prevent
 // inheritance to nested tables.
 
-.table > thead > tr,
-.table > tbody > tr,
-.table > tfoot > tr {
-  > td.active,
-  > th.active,
-  &.active > td,
-  &.active > th  {
-    background-color: $table-bg-active;
-  }
-}
-
 // Generate the contextual variants
-@include table-row-variant('success', $state-success-bg, $state-success-border);
-@include table-row-variant('danger', $state-danger-bg, $state-danger-border);
-@include table-row-variant('warning', $state-warning-bg, $state-warning-border);
+@include table-row-variant('active', $table-bg-active);
+@include table-row-variant('success', $state-success-bg);
+@include table-row-variant('danger', $state-danger-bg);
+@include table-row-variant('warning', $state-warning-bg);
 
 
 // Responsive tables

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

@@ -5,11 +5,17 @@
 
 // Mixin and adjust the regular image class
 .thumbnail {
-  @extend .img-thumbnail;
-  display: block; // Override the inline-block from `.img-thumbnail`
+  display: block;
+  padding: $thumbnail-padding;
   margin-bottom: $line-height-computed;
+  line-height: $line-height-base;
+  background-color: $thumbnail-bg;
+  border: 1px solid $thumbnail-border;
+  border-radius: $thumbnail-border-radius;
+  @include transition(all .2s ease-in-out);
 
-  > img {
+  > img,
+  a > img {
     @include img-responsive();
     margin-left: auto;
     margin-right: auto;
@@ -23,6 +29,7 @@
     color: $thumbnail-caption-color;
   }
 }
+
 // Add a hover state for linked versions only
 a.thumbnail:hover,
 a.thumbnail:focus,

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

@@ -3,12 +3,62 @@
 // --------------------------------------------------
 
 
+// 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: floor($font-size-base * 1.15);
@@ -72,55 +122,6 @@ cite    { font-style: normal; }
 .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;
-  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; }
-
-
 // Page header
 // -------------------------
 
@@ -131,7 +132,6 @@ h6, .h6 { font-size: $font-size-h6; }
 }
 
 
-
 // Lists
 // --------------------------------------------------
 
@@ -171,6 +171,7 @@ ol {
 
 // Description Lists
 dl {
+  margin-top: 0; // Remove browser default
   margin-bottom: $line-height-computed;
 }
 dt,
@@ -215,7 +216,7 @@ abbr[data-original-title] {
   cursor: help;
   border-bottom: 1px dotted $abbr-border-color;
 }
-abbr.initialism {
+.initialism {
   font-size: 90%;
   text-transform: uppercase;
 }
@@ -233,7 +234,8 @@ blockquote {
   p:last-child {
     margin-bottom: 0;
   }
-  small {
+  small,
+  .small {
     display: block;
     line-height: $line-height-base;
     color: $blockquote-small-color;

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

@@ -41,7 +41,7 @@ $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;
@@ -84,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;
 
@@ -157,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;
@@ -186,8 +189,6 @@ $dropdown-link-disabled-color:   $gray-light !default;
 
 $dropdown-header-color:          $gray-light !default;
 
-$dropdown-caret-color:           #000 !default;
-
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -246,8 +247,13 @@ $screen-md-max:              ($screen-lg-min - 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
+
+// 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
@@ -321,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;
@@ -375,19 +380,19 @@ $jumbotron-font-size:            ceil($font-size-base * 1.5) !default;
 // Form states and alerts
 // -------------------------
 
-$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:             #c09853 !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:              #b94a48 !default;
+$state-danger-text:              #a94442 !default;
 $state-danger-bg:                #f2dede !default;
 $state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
 

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

@@ -1,7 +1,7 @@
 module Bootstrap
   module Sass
     module Rails
-      VERSION = '3.0.2.1'
+      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