anjlab-bootstrap-rails 3.0.0.2 → 3.0.0.3

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

@@ -7,6 +7,7 @@
 .thumbnail {
   @extend .img-thumbnail;
   display: block; // Override the inline-block from `.img-thumbnail`
+  margin-bottom: $line-height-computed;
 
   > img {
     @include img-responsive();

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

@@ -14,10 +14,10 @@
   @include opacity(0);
 
   &.in     { @include opacity(.9); }
-  &.top    { margin-top:  -3px; padding: 5px 0; }
-  &.right  { margin-left:  3px; padding: 0 5px; }
-  &.bottom { margin-top:   3px; padding: 5px 0; }
-  &.left   { margin-left: -3px; padding: 0 5px; }
+  &.top    { margin-top:  -3px; padding: $tooltip-arrow-width 0; }
+  &.right  { margin-left:  3px; padding: 0 $tooltip-arrow-width; }
+  &.bottom { margin-top:   3px; padding: $tooltip-arrow-width 0; }
+  &.left   { margin-left: -3px; padding: 0 $tooltip-arrow-width; }
 }
 
 // Wrapper for the tooltip content
@@ -49,13 +49,13 @@
   }
   &.top-left .tooltip-arrow {
     bottom: 0;
-    left: 5px;
+    left: $tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
   &.top-right .tooltip-arrow {
     bottom: 0;
-    right: 5px;
+    right: $tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
@@ -82,14 +82,14 @@
   }
   &.bottom-left .tooltip-arrow {
     top: 0;
-    left: 5px;
+    left: $tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }
   &.bottom-right .tooltip-arrow {
     top: 0;
-    right: 5px;
+    right: $tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }
-}
+}

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

@@ -15,7 +15,7 @@ p {
   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,18 +25,46 @@ 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; }
+.text-muted {
+  color: $text-muted;
+}
+.text-primary {
+  color: $brand-primary;
+  &:hover {
+    color: darken($brand-primary, 10%);
+  }
+}
+.text-warning {
+  color: $state-warning-text;
+  &:hover {
+    color: darken($state-warning-text, 10%);
+  }
+}
+.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%);
+  }
+}
 
 // Alignment
 .text-left           { text-align: left; }
@@ -52,6 +80,8 @@ 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 {
     font-weight: normal;
     line-height: 1;
@@ -64,25 +94,28 @@ h2,
 h3 {
   margin-top: $line-height-computed;
   margin-bottom: ($line-height-computed / 2);
+
+  small {
+    font-size: 65%;
+  }
 }
 h4,
 h5,
 h6 {
   margin-top: ($line-height-computed / 2);
   margin-bottom: ($line-height-computed / 2);
-}
 
-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
+  small {
+    font-size: 75%;
+  }
+}
 
-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; }
+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
@@ -234,7 +267,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,7 +9,9 @@
 .clearfix {
   @include clearfix();
 }
-
+.center-block {
+  @include center-block();
+}
 .pull-right {
   @include pull-right;
 }
@@ -31,7 +33,7 @@
   visibility: hidden;
 }
 .text-hide {
-  @include hide-text();
+  @include text-hide();
 }
 
 

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

@@ -48,12 +48,20 @@ $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.60) !default; // ~36px
+$font-size-h2:            floor($font-size-base * 2.15) !default; // ~30px
+$font-size-h3:            ceil($font-size-base * 1.70) !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
 // -------------------------
@@ -82,6 +90,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;
@@ -165,12 +174,12 @@ $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;
 
@@ -200,25 +209,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
@@ -229,7 +246,7 @@ $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;
+$grid-float-breakpoint:     $screen-sm-min !default;
 
 
 // Navbar
@@ -238,13 +255,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 +274,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 +304,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;
@@ -324,8 +335,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
@@ -362,22 +374,22 @@ $jumbotron-heading-color:        inherit !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-bg:               #dff0d8 !default;
-$state-success-border:           darken(adjust-hue($state-success-bg, -10%), 5%) !default;
+$state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
 
 $state-info-text:                #3a87ad !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-bg:               #fcf8e3 !default;
+$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
+
+$state-danger-text:              #b94a48 !default;
+$state-danger-bg:                #f2dede !default;
+$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
+
 
 // Tooltips
 // -------------------------
@@ -478,7 +490,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 +565,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 +586,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 +624,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/lib/bootstrap-rails/engine.rb

@@ -3,7 +3,7 @@ module Bootstrap
     class Engine < ::Rails::Engine
       initializer 'anjlab-bootstrap-rails-setup', :group => :all do |app|
         # Tune Sass options
-        Sass::Script::Number.precision = 15
+        ::Sass::Script::Number.precision = 15
       end
     end
   end

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = '3.0.0.2'
+    VERSION = '3.0.0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.2
+  version: 3.0.0.3
 platform: ruby
 authors:
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties