sass-rails-bootstrap 2.1.1 → 2.2.1

data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.sass

@@ -53,6 +53,7 @@
     
   // Make all grid-sized elements block level again
   [class*="span"],
+  .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
   .row-fluid [class*="span"]
     float: none
     display: block
@@ -63,6 +64,8 @@
   .row-fluid .span12
     width: 100%
     +box-sizing(border-box)
+  .row-fluid [class*="offset"]:first-child
+    margin-left: 0
     
   // FORM FIELDS
   // -----------
@@ -96,8 +99,10 @@
     right: 20px
     width: auto
     margin: 0
+    &.fade
+      top: -100px
     &.fade.in
-      top: auto
+      top: 20px
 
 
 
@@ -140,6 +145,18 @@
       padding-left: 10px
       padding-right: 10px
 
+  // Medias
+  // Reset float and spacing to stack
+  .media .pull-left,
+  .media .pull-right
+    float: none
+    display: block
+    margin-bottom: 10px
+  // Remove side margins since we stack instead of indent
+  .media-object
+    margin-right: 0
+    margin-left: 0
+
   // Modals
   .modal
     top:   10px

data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.sass

@@ -73,7 +73,7 @@
   .nav-collapse .btn
     padding: 4px 10px 4px
     font-weight: normal
-    +border-radius(4px)
+    +border-radius($baseBorderRadius)
   .nav-collapse .dropdown-menu li + li a
     margin-bottom: 2px
     
@@ -81,6 +81,10 @@
   .nav-collapse .dropdown-menu a:hover
     background-color: $navbarBackground
 
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a
+    color: $navbarInverseLinkColor
+
   .navbar-inverse .nav-collapse .nav > li > a:hover,
   .navbar-inverse .nav-collapse .dropdown-menu a:hover
     background-color: $navbarInverseBackground
@@ -96,7 +100,7 @@
     top: auto
     left: auto
     float: none
-    display: block
+    display: none
     max-width: none
     margin: 0 15px
     padding: 0
@@ -104,6 +108,8 @@
     border: none
     +border-radius(0)
     +box-shadow(none)
+  .nav-collapse .open > .dropdown-menu
+    display: block
     
   .nav-collapse .dropdown-menu:before,
   .nav-collapse .dropdown-menu:after
@@ -158,7 +164,7 @@
 // DEFAULT DESKTOP
 // ---------------
 
-@media (min-width: 980px)
+@media (min-width: $navbarCollapseDesktopWidth)
   // Required to make the collapsing navbar work on regular desktops
   .nav-collapse.collapse
     height: auto !important

data/vendor/assets/stylesheets/twitter/bootstrap/_sprites.sass

@@ -28,8 +28,6 @@
 
 // White icons with optional class, or on hover/active states of certain elements
 .icon-white,
-.nav-tabs > .active > a > [class^="icon-"],
-.nav-tabs > .active > a > [class*=" icon-"],
 .nav-pills > .active > a > [class^="icon-"],
 .nav-pills > .active > a > [class*=" icon-"],
 .nav-list > .active > a > [class^="icon-"],
@@ -39,7 +37,9 @@
 .dropdown-menu > li > a:hover > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"]
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"]
   background-image: image-url($iconWhiteSpritePath)
 
 .icon-glass

data/vendor/assets/stylesheets/twitter/bootstrap/_tables.sass

@@ -62,7 +62,7 @@ table
   border-collapse: separate  // Done so we can round those corners!
   *border-collapse: collapse  // IE7 can't round corners anyway
   border-left: 0
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)
   th,
   td
     border-left: 1px solid $tableBorder
@@ -116,7 +116,7 @@ table
   colgroup + tbody tr:first-child td:last-child
     -webkit-border-top-right-radius: 4px
     border-top-right-radius: 4px
-    -moz-border-radius-topleft: 4px
+    -moz-border-radius-topright: 4px
 
 
 // ZEBRA-STRIPING
@@ -144,62 +144,41 @@ table
 // -----------------
 
 // Reset default grid behavior
-table [class*=span],
-.row-fluid table [class*=span]
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"]
   display: table-cell
   float: none  // undo default grid column styles
   margin-left: 0  // undo default grid column styles
 
 // Change the column widths to account for td/th padding
-.table
-  .span1
+.table td,
+.table th
+  &.span1
     +table-columns(1)
-  .span2
+  &.span2
     +table-columns(2)
-  .span3
+  &.span3
     +table-columns(3)
-  .span4
+  &.span4
     +table-columns(4)
-  .span5
+  &.span5
     +table-columns(5)
-  .span6
+  &.span6
     +table-columns(6)
-  .span7
+  &.span7
     +table-columns(7)
-  .span8
+  &.span8
     +table-columns(8)
-  .span9
+  &.span9
     +table-columns(9)
-  .span10
+  &.span10
     +table-columns(10)
-  .span11
+  &.span11
     +table-columns(11)
-  .span12
+  &.span12
     +table-columns(12)
-  .span13
-    +table-columns(13)
-  .span14
-    +table-columns(14)
-  .span15
-    +table-columns(15)
-  .span16
-    +table-columns(16)
-  .span17
-    +table-columns(17)
-  .span18
-    +table-columns(18)
-  .span19
-    +table-columns(19)
-  .span20
-    +table-columns(20)
-  .span21
-    +table-columns(21)
-  .span22
-    +table-columns(22)
-  .span23
-    +table-columns(23)
-  .span24
-    +table-columns(24)
 
 
 // TABLE BACKGROUNDS

data/vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.sass

@@ -27,7 +27,7 @@
   padding: 4px
   line-height: $baseLineHeight
   border: 1px solid #ddd
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)
   +box-shadow(0 1px 3px rgba(0,0,0,.055))
   +transition(all .2s ease-in-out)
 

data/vendor/assets/stylesheets/twitter/bootstrap/_tooltip.sass

@@ -31,7 +31,7 @@
   text-align: center
   text-decoration: none
   background-color: $tooltipBackground
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)
 
 // Arrows
 .tooltip-arrow

data/vendor/assets/stylesheets/twitter/bootstrap/_type.sass

@@ -34,14 +34,26 @@ cite
 // Utility classes
 .muted
   color: $grayLight
+
 .text-warning
   color: $warningText
+a.text-warning:hover
+  color: darken($warningText, 10%)
+
 .text-error
   color: $errorText
+a.text-error:hover
+  color: darken($errorText, 10%)
+
 .text-info
   color: $infoText
+a.text-info:hover
+  color: darken($infoText, 10%)
+
 .text-success
   color: $successText
+a.text-success:hover
+  color: darken($successText, 10%)
 
 
 // Headings
@@ -55,44 +67,35 @@ h1, h2, h3, h4, h5, h6
   text-rendering: optimizelegibility  // Fix the character spacing for headings
   small
     font-weight: normal
-    line-height: 1
+    line-height: $baseLineHeight
     color: $grayLight
     
-h1
-  font-size: 36px
-  line-height: 40px
+h1,
+h2,
+h3
+  line-height: $baseLineHeight * 2
 
+h1
+  font-size: $baseFontSize * 2.75  // ~38px
 h2
-  font-size: 30px
-  line-height: 40px
-
+  font-size: $baseFontSize * 2.25  // ~32px
 h3
-  font-size: 24px
-  line-height: 40px
-
+  font-size: $baseFontSize * 1.75  // ~24px
 h4
-  font-size: 18px
-  line-height: 20px
-
+  font-size: $baseFontSize * 1.25  // ~18px
 h5
-  font-size: 14px
-  line-height: 20px
-
+  font-size: $baseFontSize
 h6
-  font-size: 12px
-  line-height: 20px
+  font-size: $baseFontSize * 0.85  // ~12px
 
 h1 small
-  font-size: 24px
-
+  font-size: $baseFontSize * 1.75  // ~24px
 h2 small
-  font-size: 18px
-
+  font-size: $baseFontSize * 1.25  // ~18px
 h3 small
-  font-size: 14px
-
+  font-size: $baseFontSize
 h4 small
-  font-size: 14px
+  font-size: $baseFontSize
 
 
 // Page header
@@ -166,7 +169,9 @@ hr
   border-bottom: 1px solid $white
 
 // Abbreviations and acronyms
-abbr[title]
+abbr[title],
+// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+abbr[data-original-title]
   cursor: help
   border-bottom: 1px dotted $grayLight
 abbr.initialism

data/vendor/assets/stylesheets/twitter/bootstrap/_variables.sass

@@ -58,6 +58,23 @@ $headingsFontWeight:    bold  // instead of browser default, bold
 $headingsColor:         inherit  // empty to use BS default, $textColor
 
 
+// Component sizing
+// -------------------------
+// Based on 14px font-size and 20px line-height
+
+$fontSizeLarge:         $baseFontSize * 1.25  // ~18px
+$fontSizeSmall:         $baseFontSize * 0.85  // ~12px
+$fontSizeMini:          $baseFontSize * 0.75  // ~11px
+
+$paddingLarge:          11px 19px  // 44px
+$paddingSmall:          2px 10px   // 26px
+$paddingMini:           1px 6px    // 24px
+
+$baseBorderRadius:      4px
+$borderRadiusLarge:     6px
+$borderRadiusSmall:     3px
+
+
 // Tables
 // -------------------------
 $tableBackground:                   transparent  // overall background-color
@@ -95,9 +112,10 @@ $btnInverseBackgroundHighlight:     $grayDarker
 // -------------------------
 $inputBackground:               $white
 $inputBorder:                   #ccc
-$inputBorderRadius:             3px
+$inputBorderRadius:             $baseBorderRadius
 $inputDisabledBackground:       $grayLighter
 $formActionsBackground:         #f5f5f5
+$inputHeight:                   $baseLineHeight + 10px  // base line-height + 8px vertical padding + 2px top/bottom border
 
 
 // Dropdowns
@@ -160,6 +178,7 @@ $wellBackground:                  #f5f5f5
 // Navbar
 // -------------------------
 $navbarCollapseWidth:             979px
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1
 
 $navbarHeight:                    40px
 $navbarBackgroundHighlight:       #ffffff

data/vendor/assets/stylesheets/twitter/bootstrap/_wells.sass

@@ -9,7 +9,7 @@
   margin-bottom: 20px
   background-color: $wellBackground
   border: 1px solid darken($wellBackground, 7%)
-  +border-radius(4px)
+  +border-radius($baseBorderRadius)
   +box-shadow(inset 0 1px 1px rgba(0,0,0,.05))
   blockquote
     border-color: #ddd
@@ -18,7 +18,8 @@
 // Sizes
 .well-large
   padding: 24px
-  +border-radius(6px)
+  +border-radius($borderRadiusLarge)
+  
 .well-small
   padding: 9px
-  +border-radius(3px)
+  +border-radius($borderRadiusSmall)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails-bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &67935950 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *67935950
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &67935640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.3
+  version_requirements: *67935640
 description: SASS version of the CSS toolkit from Twitter for Rails 3.1+ asset pipeline.
 email:
 - voidproxy@gmail.com
@@ -65,6 +55,7 @@ files:
 - vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.sass
 - vendor/assets/stylesheets/twitter/bootstrap/_sprites.sass
 - vendor/assets/stylesheets/twitter/bootstrap/_wells.sass
+- vendor/assets/stylesheets/twitter/bootstrap/_media.sass
 - vendor/assets/stylesheets/twitter/bootstrap/_responsive-1200px-min.sass
 - vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.sass
 - vendor/assets/stylesheets/twitter/bootstrap/_hero-unit.sass
@@ -133,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: SASS version of the CSS toolkit from Twitter for Rails 3.1+ asset pipeline.