bootstrap-sass 3.0.1.0 → 3.0.3.0

data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss

@@ -5,17 +5,30 @@
 
 // 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;
   }
-}
 
+  // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
+
+  // Image captions
+  .caption {
+    padding: $thumbnail-caption-padding;
+    color: $thumbnail-caption-color;
+  }
+}
 
 // Add a hover state for linked versions only
 a.thumbnail:hover,
@@ -23,9 +36,3 @@ a.thumbnail:focus,
 a.thumbnail.active {
   border-color: $link-color;
 }
-
-// Image captions
-.thumbnail .caption {
-  padding: $thumbnail-caption-padding;
-  color: $thumbnail-caption-color;
-}

data/vendor/assets/stylesheets/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/vendor/assets/stylesheets/bootstrap/_variables.scss

@@ -1,3 +1,5 @@
+// bootstrap specific variable. set to false if not using ruby + asset pipeline / compass.
+$bootstrap-sass-asset-helper: true !default;
 //
 // Variables
 // --------------------------------------------------
@@ -41,7 +43,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 +86,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 +162,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 +191,6 @@ $dropdown-link-disabled-color:   $gray-light !default;
 
 $dropdown-header-color:          $gray-light !default;
 
-$dropdown-caret-color:           #000 !default;
-
 
 // COMPONENT VARIABLES
 // --------------------------------------------------
@@ -246,8 +249,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 +329,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 +382,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;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap-sass
 version: !ruby/object:Gem::Version
-  version: 3.0.1.0
+  version: 3.0.3.0
 platform: ruby
 authors:
 - Thomas McDonald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -152,7 +152,6 @@ files:
 - Rakefile
 - bootstrap-sass.gemspec
 - lib/bootstrap-sass.rb
-- lib/bootstrap-sass/compass_functions.rb
 - lib/bootstrap-sass/engine.rb
 - lib/bootstrap-sass/sass_functions.rb
 - lib/bootstrap-sass/version.rb
@@ -206,9 +205,13 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy_sass_only/Gemfile
+- test/dummy_sass_only/compile.rb
+- test/dummy_sass_only/import_all.sass
 - test/gemfiles/sass_3_2.gemfile
 - test/gemfiles/sass_head.gemfile
 - test/pages_test.rb
+- test/sass_test.rb
 - test/support/integration_test.rb
 - test/test_helper.rb
 - vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
@@ -334,8 +337,12 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy_sass_only/Gemfile
+- test/dummy_sass_only/compile.rb
+- test/dummy_sass_only/import_all.sass
 - test/gemfiles/sass_3_2.gemfile
 - test/gemfiles/sass_head.gemfile
 - test/pages_test.rb
+- test/sass_test.rb
 - test/support/integration_test.rb
 - test/test_helper.rb

data/lib/bootstrap-sass/compass_functions.rb

@@ -1,24 +0,0 @@
-# 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:
-    if options.key?(:sprockets)
-      options[:sprockets][:context]
-    else
-      # Compatibility with sprockets pre 2.10.0
-      options[:importer].context
-    end
-  end
-end