sass-rails-bootstrap 2.0.3a → 2.0.4

data/README.md

@@ -20,7 +20,7 @@ end
 Then include the following line in your Gemfile and you're all set:
 
 ```ruby
-gem 'sass-rails-bootstrap'
+gem 'sass-rails-bootstrap', '2.0.4'
 ```
 
 
@@ -76,8 +76,8 @@ Alternatively, you could include only the files you need:
 
 This gem will directly track the semantic versioning releases of the Twitter Bootstrap project. Our major and minor versions will always match to theirs.
 
-Currently, this gem reflects the Bootstrap version 2.0.3 up to the commit:
-https://github.com/twitter/bootstrap/commit/b261f9781bbf31f499cb55c49451dc0c0ad43062
+Currently, this gem reflects the Bootstrap version 2.0.4 up to the commit:
+https://github.com/twitter/bootstrap/commit/857b8fb8be81178d14f59c126c1381b09aff7c0f
 
 
 ## Copyright and license

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

@@ -1,3 +1,3 @@
 module SassRailsBootstrap
-  VERSION = "2.0.3a"
+  VERSION = "2.0.4"
 end

data/vendor/assets/javascripts/twitter/bootstrap/alert.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.3
+ * bootstrap-alert.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#alerts
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/button.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-button.js v2.0.3
+ * bootstrap-button.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#buttons
  * ============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/carousel.js

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-carousel.js v2.0.3
+ * bootstrap-carousel.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/collapse.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.3
+ * bootstrap-collapse.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.3
+ * bootstrap-dropdown.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/modal.js

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.0.3
+ * bootstrap-modal.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/popover.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-popover.js v2.0.3
+ * bootstrap-popover.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#popovers
  * ===========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-scrollspy.js v2.0.3
+ * bootstrap-scrollspy.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
  * =============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/tab.js

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.0.3
+ * bootstrap-tab.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js

@@ -1,5 +1,5 @@
 /* ===========================================================
- * bootstrap-tooltip.js v2.0.3
+ * bootstrap-tooltip.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -84,9 +84,9 @@
   , leave: function (e) {
       var self = $(e.currentTarget)[this.type](this._options).data(this.type)
 
+      if (this.timeout) clearTimeout(this.timeout)
       if (!self.options.delay || !self.options.delay.hide) return self.hide()
 
-      clearTimeout(this.timeout)
       self.hoverState = 'out'
       this.timeout = setTimeout(function() {
         if (self.hoverState == 'out') self.hide()

data/vendor/assets/javascripts/twitter/bootstrap/transition.js

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.0.3
+ * bootstrap-transition.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#transitions
  * ===================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-typeahead.js v2.0.3
+ * bootstrap-typeahead.js v2.0.4
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.

data/vendor/assets/stylesheets/twitter/_bootstrap-responsive.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.0.3
+ * Bootstrap Responsive v2.0.4
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

data/vendor/assets/stylesheets/twitter/_bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.0.3
+ * Bootstrap v2.0.4
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

data/vendor/assets/stylesheets/twitter/bootstrap/_component-animations.sass

@@ -2,10 +2,10 @@
 // --------------------
 
 .fade
-  +opacity(0)
+  opacity: 0
   +transition(opacity .15s linear)
   &.in
-    +opacity(1)
+    opacity: 1
 
 .collapse
   position: relative

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

@@ -67,7 +67,7 @@
 
   // Dividers (basically an hr) within the dropdown
   .divider
-    +nav-divider
+    +nav-divider($dropdownDividerTop, $dropdownDividerBottom)
 
   // Links within the dropdown menu
   a
@@ -94,12 +94,12 @@
   // IE7's z-index only goes to the nearest positioned ancestor, which would
   // make the menu appear below buttons that appeared later on the page
   *z-index: $zindexDropdown
-  .dropdown-menu
+  > .dropdown-menu
     display: block
     
 // Right aligned dropdowns
 // ---------------------------
-.pull-right .dropdown-menu
+.pull-right > .dropdown-menu
   right: 0
   left: auto
   

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

@@ -24,7 +24,7 @@ legend
   line-height: $baseLineHeight * 2
   color: $grayDark
   border: 0
-  border-bottom: 1px solid #eee
+  border-bottom: 1px solid #e5e5e5
   // Small
   small
     font-size: $baseLineHeight * 0.75
@@ -48,66 +48,94 @@ text-area
 label
   display: block
   margin-bottom: 5px
-  color: $grayDark
 
-// Inputs, Textareas, Selects
-input,
-textarea,
+// Form controls
+// -------------------------
+
+// Shared size and type resets
 select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
 .uneditable-input
   display: inline-block
-  width: 210px
   height: $baseLineHeight
   padding: 4px
   margin-bottom: 9px
   font-size: $baseFontSize
   line-height: $baseLineHeight
   color: $gray
+  
+// Reset appearance properties for textual inputs and textarea
+// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
+input,
+textarea
+  width: 210px
+// Reset height since textareas have rows
+textarea
+  height: auto
+// Everything else
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input
   background-color: $inputBackground
   border: 1px solid $inputBorder
   +border-radius($inputBorderRadius)
-  
-.uneditable-textarea
-  width: auto
-  height: auto
-
-// Inputs within a label
-label input,
-label textarea,
-label select
-  display: block
+  +box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075))
+  $transition: border linear 0.2s, box-shadow linear 0.2s
+  +transition($transition)
 
-// Mini reset for unique input types
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"]
-  width: auto
-  height: auto
-  padding: 0
+  // Focus state
+  &:focus
+    border-color: rgba(82, 168, 236, 0.8)
+    outline: 0
+    outline: thin dotted \9  /* IE6-9 */
+    $shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6)
+    +box-shadow($shadow)
+  
+//Position radios and checkboxes better
+input[type="radio"],
+input[type="checkbox"]
   margin: 3px 0
-  *margin-top: 0  // IE7
+  *margin-top: 0  /* IE7 */
   line-height: normal
   cursor: pointer
-  background-color: transparent
-  border: 0 \9  // IE9 and down
-  +border-radius(0)
   
-input[type="image"]
-  border: 0
-
-// Reset the file input to browser defaults
-input[type="file"]
-  padding: initial
-  line-height: initial
-  background-color: $inputBackground
-  background-color: initial
-  border: initial
-  +box-shadow(none)
-
-// Help out input buttons
-input[type="button"],
+// Reset width of input buttons, radios, checkboxes
+input[type="submit"],
 input[type="reset"],
-input[type="submit"]
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"]
+  width: auto  // Override of generic input selector
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea
   width: auto
   height: auto
 
@@ -118,31 +146,22 @@ input[type="file"]
   *margin-top: 4px  /* For IE7, add top margin to align select with labels */
   line-height: 28px
   
-// Reset line-height for IE
-input[type="file"]
-  line-height: 18px \9
-
-// Chrome on Linux and Mobile Safari need background-color
+// Make select elements obey height by applying a border
 select
   width: 220px  // default input width + 10px of padding that doesn't get applied
-  background-color: $inputBackground
-
+  border: 1px solid #bbb
+  
 // Make multiple select elements height not fixed
 select[multiple],
 select[size]
   height: auto
-
-// Remove shadow from image inputs
-input[type="image"]
-  +box-shadow(none)
-
-// Make textarea height behave
-textarea
-  height: auto
-
-// Hidden inputs
-input[type="hidden"]
-  display: none
+  
+// Focus for select, file, radio, and checkbox
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus
+  +tab-focus
 
 
 
@@ -179,32 +198,6 @@ input[type="hidden"]
 
 
 
-// FOCUS STATE
-// -----------
-
-input,
-textarea
-  +box-shadow(inset 0 1px 1px rgba(0,0,0,.075))
-  $transition: border linear .2s, box-shadow linear .2s
-  +transition($transition)
-
-input:focus,
-textarea:focus
-  border-color: rgba(82,168,236,.8)
-  outline: 0
-  outline: thin dotted \9  /* IE6-9 */
-  $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)
-  +box-shadow($shadow)
-
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus
-  +tab-focus
-  +box-shadow(none)  // override for file inputs
-
-
-
 // INPUT SIZES
 // -----------
 
@@ -227,7 +220,6 @@ input[class*="span"],
 select[class*="span"],
 textarea[class*="span"],
 .uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
 .row-fluid input[class*="span"],
 .row-fluid select[class*="span"],
 .row-fluid textarea[class*="span"],
@@ -235,6 +227,15 @@ textarea[class*="span"],
   float: none
   margin-left: 0
 
+// Ensure input-prepend/append never wraps
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"]
+  display: inline-block
+
 
 
 // GRID SIZING FOR INPUTS
@@ -298,7 +299,7 @@ select:focus:required:invalid
   margin-top: $baseLineHeight
   margin-bottom: $baseLineHeight
   background-color: $formActionsBackground
-  border-top: 1px solid #ddd
+  border-top: 1px solid #e5e5e5
   +clearfix  // Adding clearfix to allow for .pull-right button containers
 
 // For text that needs to appear as an input but should not be an input
@@ -312,7 +313,7 @@ select:focus:required:invalid
   +box-shadow(inset 0 1px 2px rgba(0,0,0,.025))
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
-+placeholder($grayLight)
++placeholder()
 
 
 

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

@@ -68,6 +68,8 @@
 =placeholder($color: $placeholderText)
   \:-moz-placeholder
     color: $color
+  \:-ms-input-placeholder
+    color: $color
   ::-webkit-input-placeholder
     color: $color
 
@@ -136,6 +138,8 @@
   .help-inline
     color: $textColor
   // Style inputs accordingly
+  .checkbox,
+  .radio,
   input,
   select,
   textarea
@@ -266,6 +270,15 @@
   -webkit-column-gap: $columnGap
   -moz-column-gap: $columnGap
   column-gap: $columnGap
+  
+// Optional hyphenation
+=hyphens($mode: auto)
+  word-wrap: break-word
+  -webkit-hyphens: $mode
+  -moz-hyphens: $mode
+  -ms-hyphens: $mode
+  -o-hyphens: $mode
+  hyphens: $mode
 
 // Opacity
 =opacity($opacity)
@@ -363,7 +376,7 @@
 // Horizontal dividers
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
-=nav-divider
+=nav-divider($top: #e5e5e5, $bottom: $white)
   // IE7 needs a set width since we gave a height. Restricting just
   // to IE7 to keep the 1px left/right space in other browsers.
   // It is unclear where IE is getting the extra space that we need
@@ -373,8 +386,8 @@
   margin: 5px 1px
   *margin: -5px 0 5px
   overflow: hidden
-  background-color: #e5e5e5
-  border-bottom: 1px solid $white
+  background-color: $top
+  border-bottom: 1px solid $bottom
 
 // Button backgrounds
 // ---------------------------------------

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

@@ -113,11 +113,7 @@
     +box-shadow($shadow)
     +transition(none)
 
-    // Placeholder text gets special styles; can't be a grouped selector
-    &:-moz-placeholder
-      color: $navbarSearchPlaceholderColor
-    &::-webkit-input-placeholder
-      color: $navbarSearchPlaceholderColor
+    +placeholder($navbarSearchPlaceholderColor)
 
     // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,

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

@@ -57,7 +57,7 @@
 .nav-list > li > a
   padding: 3px 15px
 
-.nav-list > .active > a
+.nav-list > .active > a,
 .nav-list > .active > a:hover
   color: $white
   text-shadow: 0 -1px 0 rgba(0,0,0,.2)

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

@@ -70,6 +70,10 @@ img
   vertical-align: middle
   border: 0
   -ms-interpolation-mode: bicubic
+  
+// Prevent max-width from affecting Google Maps
+#map_canvas img
+  max-width: none
 
 // Forms
 // -------------------------

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

@@ -8,11 +8,18 @@
     padding-top: 0
     
   // Unfix the navbar
-  .navbar-fixed-top
+  .navbar-fixed-top,
+  .navbar-fixed-bottom
     position: static
+    
+  .navbar-fixed-top
     margin-bottom: $baseLineHeight
     
-  .navbar-fixed-top .navbar-inner
+  .navbar-fixed-bottom
+    margin-top: $baseLineHeight
+    
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner
     padding: 5px
     
   .navbar .container

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

@@ -7,9 +7,6 @@
 
 p
   margin: 0 0 $baseLineHeight / 2
-  font-family: $baseFontFamily
-  font-size: $baseFontSize
-  line-height: $baseLineHeight
   small
     font-size: $baseFontSize - 2
     color: $grayLight
@@ -158,7 +155,7 @@ em
 // Abbreviations and acronyms
 abbr[title]
   cursor: help
-  border-bottom: 1px dotted #ddd
+  border-bottom: 1px dotted $grayLight
 abbr.initialism
   font-size: 90%
   text-transform: uppercase

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

@@ -107,6 +107,8 @@ $dropdownBorder:                rgba(0, 0, 0, 0.2)
 $dropdownLinkColor:             $grayDark
 $dropdownLinkColorHover:        $white
 $dropdownLinkBackgroundHover:   $linkColor
+$dropdownDividerTop:            #e5e5e5
+$dropdownDividerBottom:         $white
 
 
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sass-rails-bootstrap
 version: !ruby/object:Gem::Version
-  version: 2.0.3a
-  prerelease: 5
+  version: 2.0.4
+  prerelease: 
 platform: ruby
 authors:
 - voidseeker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,9 +110,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -120,3 +120,4 @@ signing_key:
 specification_version: 3
 summary: SASS version of the CSS toolkit from Twitter for Rails 3.1+ asset pipeline.
 test_files: []
+has_rdoc: