anjlab-bootstrap-rails 3.0.0.rc2 → 3.0.0.0

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

@@ -3,28 +3,17 @@
 // --------------------------------------------------
 
 
-// Base classes
-// For thumbnail block-level composite components and simple image styles
-
-// The actual thumbnailed element
-// Can be `a`, `div`, or `img`
-.thumbnail,
-.img-thumbnail {
-  padding: $thumbnail-padding;
-  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);
-}
+// Mixin and adjust the regular image class
 .thumbnail {
-  display: block;
-}
-.thumbnail > img,
-.img-thumbnail {
-  @include img-responsive();
+  @extend .img-thumbnail;
+  display: block; // Override the inline-block from `.img-thumbnail`
+
+  > img {
+    @include img-responsive();
+  }
 }
 
+
 // Add a hover state for linked versions only
 a.thumbnail:hover,
 a.thumbnail:focus {

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

@@ -72,8 +72,8 @@ h6 {
   margin-bottom: ($line-height-computed / 2);
 }
 
-h1, .h1 { font-size: ceil($font-size-base * 2.70); } // ~38px
-h2, .h2 { font-size: ceil($font-size-base * 2.25); } // ~32px
+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; }

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

@@ -3,43 +3,9 @@
 // --------------------------------------------------
 
 
-// Media queries breakpoints
-// --------------------------------------------------
-
-// Extra small screen / phone
-$screen-xsmall:              480px !default;
-$screen-phone:               $screen-xsmall !default;
-
-// Small screen / tablet
-$screen-small:               768px !default;
-$screen-tablet:              $screen-small !default;
-
-// Medium screen / desktop
-$screen-medium:              992px !default;
-$screen-desktop:             $screen-medium !default;
-
-// Large screen / wide desktop
-$screen-large:               1200px !default;
-$screen-large-desktop:       $screen-large !default;
-
-// So media queries don't overlap when required, provide a maximum
-$screen-phone-max:           ($screen-small - 1) !default;
-$screen-small-max:           ($screen-medium - 1) !default;
-$screen-tablet-max:          ($screen-desktop - 1) !default;
-$screen-desktop-max:         ($screen-large-desktop - 1) !default;
-
-
-// Grid system
+// Global values
 // --------------------------------------------------
 
-// Number of columns in the grid system
-$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;
-
-
 // Grays
 // -------------------------
 
@@ -89,6 +55,12 @@ $headings-font-family:    $font-family-base !default;
 $headings-font-weight:    500 !default;
 $headings-line-height:    1.1 !default;
 
+// Iconography
+// -------------------------
+
+$icon-font-path:          "twitter/" !default;
+$icon-font-name:          "glyphicons-halflings-regular" !default;
+
 
 // Components
 // -------------------------
@@ -132,7 +104,7 @@ $table-border-color:                 #ddd !default; // table and cell border
 // Buttons
 // -------------------------
 
-$btn-font-weight:                bold !default;
+$btn-font-weight:                normal !default;
 
 $btn-default-color:              #333 !default;
 $btn-default-bg:                 #fff !default;
@@ -216,6 +188,7 @@ $dropdown-caret-color:           #000 !default;
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
 
+$zindex-navbar:            1000 !default;
 $zindex-dropdown:          1000 !default;
 $zindex-popover:           1010 !default;
 $zindex-tooltip:           1030 !default;
@@ -223,6 +196,40 @@ $zindex-navbar-fixed:      1030 !default;
 $zindex-modal-background:  1040 !default;
 $zindex-modal:             1050 !default;
 
+// Media queries breakpoints
+// --------------------------------------------------
+
+// Extra small screen / phone
+$screen-xs:                  480px !default;
+$screen-phone:               $screen-xs !default;
+
+// Small screen / tablet
+$screen-sm:                  768px !default;
+$screen-tablet:              $screen-sm !default;
+
+// Medium screen / desktop
+$screen-md:                  992px !default;
+$screen-desktop:             $screen-md !default;
+
+// Large screen / wide desktop
+$screen-lg:                  1200px !default;
+$screen-lg-desktop:          $screen-lg !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;
+
+
+// Grid system
+// --------------------------------------------------
+
+// Number of columns in the grid system
+$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
@@ -231,33 +238,34 @@ $zindex-modal:             1050 !default;
 // Basics of a navbar
 $navbar-height:                    50px !default;
 $navbar-margin-bottom:             $line-height-computed !default;
-$navbar-color:                     #777 !default;
-$navbar-bg:                        #f8f8f8 !default;
-$navbar-border:                    darken($navbar-bg, 6.5%) !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 links
-$navbar-link-color:                #777 !default;
-$navbar-link-hover-color:          #333 !default;
-$navbar-link-hover-bg:             transparent !default;
-$navbar-link-active-color:         #555 !default;
-$navbar-link-active-bg:            darken($navbar-bg, 6.5%) !default;
-$navbar-link-disabled-color:       #ccc !default;
-$navbar-link-disabled-bg:          transparent !default;
+$navbar-default-link-color:                #777 !default;
+$navbar-default-link-hover-color:          #333 !default;
+$navbar-default-link-hover-bg:             transparent !default;
+$navbar-default-link-active-color:         #555 !default;
+$navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%) !default;
+$navbar-default-link-disabled-color:       #ccc !default;
+$navbar-default-link-disabled-bg:          transparent !default;
 
 // Navbar brand label
-$navbar-brand-color:               $navbar-link-color !default;
-$navbar-brand-hover-color:         darken($navbar-link-color, 10%) !default;
-$navbar-brand-hover-bg:            transparent !default;
+$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-bg:            transparent !default;
 
 // Navbar toggle
-$navbar-toggle-hover-bg:           #ddd !default;
-$navbar-toggle-icon-bar-bg:        #ccc !default;
-$navbar-toggle-border-color:       #ddd !default;
+$navbar-default-toggle-hover-bg:           #ddd !default;
+$navbar-default-toggle-icon-bar-bg:        #ccc !default;
+$navbar-default-toggle-border-color:       #ddd !default;
 
 
+// Inverted navbar
 //
 // Reset inverted navbar basics
 $navbar-inverse-color:                      $gray-light !default;
@@ -294,6 +302,7 @@ $navbar-inverse-toggle-border-color:        #333 !default;
 // Navs
 // -------------------------
 
+$nav-link-padding:                          10px 15px !default;
 $nav-link-hover-bg:                         $gray-lighter !default;
 
 $nav-disabled-link-color:                   $gray-light !default;
@@ -324,10 +333,15 @@ $nav-pills-active-link-hover-color:         #fff !default;
 
 $pagination-bg:                        #fff !default;
 $pagination-border:                    #ddd !default;
-$pagination-active-bg:                 #f5f5f5 !default;
-$pagination-active-color:              $gray-light !default;
+
+$pagination-hover-bg:                  $gray-lighter !default;
+
+$pagination-active-bg:                 $brand-primary !default;
+$pagination-active-color:              #fff !default;
+
 $pagination-disabled-color:            $gray-light !default;
 
+
 // Pager
 // -------------------------
 
@@ -338,9 +352,11 @@ $pager-disabled-color:                 $gray-light !default;
 // Jumbotron
 // -------------------------
 
+$jumbotron-padding:              30px !default;
+$jumbotron-color:                inherit !default;
 $jumbotron-bg:                   $gray-lighter !default;
+
 $jumbotron-heading-color:        inherit !default;
-$jumbotron-lead-color:           inherit !default;
 
 
 // Form states and alerts
@@ -394,6 +410,7 @@ $popover-arrow-outer-fallback-color:  #999 !default;
 // -------------------------
 
 $label-default-bg:            $gray-light !default;
+$label-primary-bg:            $brand-primary !default;
 $label-success-bg:            $brand-success !default;
 $label-info-bg:               $brand-info !default;
 $label-warning-bg:            $brand-warning !default;
@@ -425,22 +442,22 @@ $alert-padding:               15px !default;
 $alert-border-radius:         $border-radius-base !default;
 $alert-link-font-weight:      bold !default;
 
-$alert-bg:                    $state-warning-bg !default;
-$alert-text:                  $state-warning-text !default;
-$alert-border:                $state-warning-border !default;
-
 $alert-success-bg:            $state-success-bg !default;
 $alert-success-text:          $state-success-text !default;
 $alert-success-border:        $state-success-border !default;
 
-$alert-danger-bg:             $state-danger-bg !default;
-$alert-danger-text:           $state-danger-text !default;
-$alert-danger-border:         $state-danger-border !default;
-
 $alert-info-bg:               $state-info-bg !default;
 $alert-info-text:             $state-info-text !default;
 $alert-info-border:           $state-info-border !default;
 
+$alert-warning-bg:            $state-warning-bg !default;
+$alert-warning-text:          $state-warning-text !default;
+$alert-warning-border:        $state-warning-border !default;
+
+$alert-danger-bg:             $state-danger-bg !default;
+$alert-danger-text:           $state-danger-text !default;
+$alert-danger-border:         $state-danger-border !default;
+
 
 // Progress bars
 // -------------------------
@@ -472,11 +489,14 @@ $list-group-link-heading-color:  #333 !default;
 // Panels
 // -------------------------
 $panel-bg:                    #fff !default;
-$panel-border:                #ddd !default;
+$panel-inner-border:          #ddd !default;
 $panel-border-radius:         $border-radius-base !default;
-$panel-heading-bg:            #f5f5f5 !default;
 $panel-footer-bg:             #f5f5f5 !default;
 
+$panel-default-text:          $gray-dark !default;
+$panel-default-border:        #ddd !default;
+$panel-default-heading-bg:    #f5f5f5 !default;
+
 $panel-primary-text:          #fff !default;
 $panel-primary-border:        $brand-primary !default;
 $panel-primary-heading-bg:    $brand-primary !default;
@@ -504,6 +524,7 @@ $thumbnail-padding:           4px !default;
 $thumbnail-bg:                $body-bg !default;
 $thumbnail-border:            #ddd !default;
 $thumbnail-border-radius:     $border-radius-base !default;
+
 $thumbnail-caption-color:     $text-color !default;
 $thumbnail-caption-padding:   9px !default;
 
@@ -513,11 +534,6 @@ $thumbnail-caption-padding:   9px !default;
 $well-bg:                     #f5f5f5 !default;
 
 
-// Accordion
-// -------------------------
-$accordion-border-color:      #e5e5e5 !default;
-
-
 // Badges
 // -------------------------
 $badge-color:                 #fff !default;
@@ -541,6 +557,7 @@ $breadcrumb-active-color:     $gray-light !default;
 
 // Carousel
 // ------------------------
+
 $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
 
 $carousel-control-color:                      #fff !default;
@@ -594,10 +611,10 @@ $component-offset-horizontal: 180px !default;
 // --------------------------------------------------
 
 // Small screen / tablet
-$container-tablet:          720px !default;
+$container-tablet:            ((720px + $grid-gutter-width)) !default;
 
 // Medium screen / desktop
-$container-desktop:         940px !default;
+$container-desktop:           ((940px + $grid-gutter-width)) !default;
 
 // Large screen / wide desktop
-$container-large-desktop:   1140px !default;
+$container-lg-desktop:        ((1140px + $grid-gutter-width)) !default;

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = '3.0.0.rc2'
+    VERSION = '3.0.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.0
 platform: ruby
 authors:
 - Yury Korolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -79,6 +79,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/assets/fonts/twitter/glyphicons-halflings-regular.eot
+- app/assets/fonts/twitter/glyphicons-halflings-regular.svg
+- app/assets/fonts/twitter/glyphicons-halflings-regular.ttf
+- app/assets/fonts/twitter/glyphicons-halflings-regular.woff
 - app/assets/javascripts/twitter/bootstrap.js
 - app/assets/javascripts/twitter/bootstrap/affix.js
 - app/assets/javascripts/twitter/bootstrap/alert.js
@@ -105,6 +109,7 @@ files:
 - app/assets/stylesheets/twitter/bootstrap/_component-animations.scss
 - app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss
 - app/assets/stylesheets/twitter/bootstrap/_forms.scss
+- app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss
 - app/assets/stylesheets/twitter/bootstrap/_grid.scss
 - app/assets/stylesheets/twitter/bootstrap/_input-groups.scss
 - app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss
@@ -125,6 +130,7 @@ files:
 - app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss
 - app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss
 - app/assets/stylesheets/twitter/bootstrap/_tables.scss
+- app/assets/stylesheets/twitter/bootstrap/_theme.scss
 - app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss
 - app/assets/stylesheets/twitter/bootstrap/_tooltip.scss
 - app/assets/stylesheets/twitter/bootstrap/_type.scss
@@ -152,9 +158,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3