anjlab-bootstrap-rails 2.0.3.2 → 2.0.4.0

data/README.md

@@ -4,7 +4,7 @@ It includes base CSS and HTML for typography, forms, buttons, tables, grids, nav
 
 
 
-anjlab-bootstrap-rails project integrates Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects
+anjlab-bootstrap-rails project integrates Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects
 
 ## Rails > 3.1
 Include Bootstrap in Gemfile;
@@ -81,7 +81,7 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
 ## For Developers
 
  - Fork this repo if you want fix rails integration bug
- - Fork [SASS repo](https://github.com/yury/bootstrap) if you want fix SASS bug
+ - Fork [Sass repo](https://github.com/yury/bootstrap) if you want fix SASS bug
         
 ## Thanks
 Thanks Twitter for Bootstrap

data/bootstrap-rails.gemspec

@@ -4,8 +4,8 @@ require File.expand_path('../lib/bootstrap-rails/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ["Yury Korolev"]
   gem.email         = ["yury.korolev@gmail.com"]
-  gem.description   = %q{Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects}
-  gem.summary       = %q{Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects}
+  gem.description   = %q{Twitter Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
+  gem.summary       = %q{Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects}
   gem.homepage      = "https://github.com/anjlab/bootstrap-rails"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "2.0.3.2"
+    VERSION = "2.0.4.0"
   end
 end

data/vendor/assets/javascripts/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/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/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/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/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/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/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/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/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/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()
@@ -272,4 +272,4 @@
   , delay: 0
   }
 
-}(window.jQuery);
+}(window.jQuery);

data/vendor/assets/javascripts/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/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/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/component-animations.scss

@@ -2,10 +2,10 @@
 // --------------------
 
 .fade {
-  @include opacity(0);
+  opacity: 0;
   @include transition(opacity .15s linear);
   &.in {
-    @include opacity(100);
+    opacity: 1;
   }
 }
 

data/vendor/assets/stylesheets/dropdowns.scss

@@ -71,7 +71,7 @@
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    @include nav-divider();
+    @include nav-divider($dropdownDividerTop, $dropdownDividerBottom);
   }
 
   // Links within the dropdown menu
@@ -103,14 +103,14 @@
   // 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/forms.scss

@@ -27,7 +27,7 @@ legend {
   line-height: $baseLineHeight * 2;
   color: $grayDark;
   border: 0;
-  border-bottom: 1px solid #eee;
+  border-bottom: 1px solid #e5e5e5;
 
   // Small
   small {
@@ -55,71 +55,101 @@ textarea {
 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;
-  background-color: $inputBackground;
-  border: 1px solid $inputBorder;
-  @include border-radius($inputBorderRadius);
 }
-.uneditable-textarea {
-  width: auto;
+
+// 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;
+  @include border-radius($inputBorderRadius);
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  $transition: border linear .2s, box-shadow linear .2s;
+  @include transition($transition);
 
-// Inputs within a label
-label input,
-label textarea,
-label select {
-  display: block;
+  // Focus state
+  &:focus {
+    border-color: rgba(82,168,236,.8);
+    outline: 0;
+    outline: thin dotted \9; /* IE6-9 */
+    @include box-shadow((inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)));
+  }
 }
 
-// Mini reset for unique input types
-input[type="image"],
-input[type="checkbox"],
-input[type="radio"] {
-  width: auto;
-  height: auto;
-  padding: 0;
+// Position radios and checkboxes better
+input[type="radio"],
+input[type="checkbox"] {
   margin: 3px 0;
   *margin-top: 0; /* IE7 */
   line-height: normal;
   cursor: pointer;
-  border: 0 \9; /* IE9 and down */
-  @include border-radius(0);
-}
-input[type="image"] {
-  border: 0;
 }
 
-// Reset the file input to browser defaults
-input[type="file"] {
-  width: auto;
-  padding: initial;
-  line-height: initial;
-  background-color: $inputBackground;
-  background-color: initial;
-  border: initial;
-  @include box-shadow(none);
+// Reset width of input buttons, radios, checkboxes
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto; // Override of generic input selector
 }
 
-// Help out input buttons
-input[type="button"],
-input[type="reset"],
-input[type="submit"] {
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
   width: auto;
   height: auto;
 }
@@ -132,15 +162,10 @@ input[type="file"] {
   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
@@ -149,19 +174,12 @@ select[size] {
   height: auto;
 }
 
-// Remove shadow from image inputs
-input[type="image"] {
-  @include 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 {
+  @include tab-focus();
 }
 
 
@@ -203,32 +221,6 @@ input[type="hidden"] {
 
 
 
-// FOCUS STATE
-// -----------
-
-input,
-textarea {
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  $transition: border linear .2s, box-shadow linear .2s;
-  @include transition($transition);
-}
-input:focus,
-textarea:focus {
-  border-color: rgba(82,168,236,.8);
-  outline: 0;
-  outline: thin dotted \9; /* IE6-9 */
-  @include box-shadow((inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)));
-}
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus,
-select:focus {
-  @include tab-focus();
-  @include box-shadow(none); // override for file inputs
-}
-
-
-
 // INPUT SIZES
 // -----------
 
@@ -253,6 +245,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;
+}
 
 
 
@@ -263,8 +264,6 @@ textarea[class*="span"],
 
 
 
-
-
 // DISABLED STATE
 // --------------
 
@@ -329,7 +328,7 @@ select:focus:required:invalid {
   margin-top: $baseLineHeight;
   margin-bottom: $baseLineHeight;
   background-color: $formActionsBackground;
-  border-top: 1px solid #ddd;
+  border-top: 1px solid #e5e5e5;
   @include clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
@@ -344,7 +343,7 @@ select:focus:required:invalid {
 }
 
 // Placeholder text gets special styles; can't be bundled together though for some reason
-@include placeholder($grayLight);
+@include placeholder();
 
 
 

data/vendor/assets/stylesheets/mixins.scss

@@ -80,15 +80,32 @@
 
 // Placeholder text
 // -------------------------
+@mixin placeholder-input($color: $placeholderText) {
+  &:-moz-placeholder {
+    color: $color;
+  }
+  &:-ms-input-placeholder {
+    color: $color;
+  }
+  &::-webkit-input-placeholder {
+    color: $color;
+  }
+}
+
 @mixin placeholder($color: $placeholderText) {
   :-moz-placeholder {
     color: $color;
   }
+  :-ms-input-placeholder {
+    color: $color;
+  }
   ::-webkit-input-placeholder {
     color: $color;
   }
 }
 
+
+
 // Text overflow
 // -------------------------
 // Requires inline-block or block for proper styling
@@ -170,6 +187,8 @@
     color: $textColor;
   }
   // Style inputs accordingly
+  .checkbox,
+  .radio,
   input,
   select,
   textarea {
@@ -307,6 +326,16 @@
           column-gap: $columnGap;
 }
 
+// Optional hyphenation
+@mixin hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode;
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
+
 // Opacity
 @mixin opacity($opacity) {
   opacity: $opacity / 100;
@@ -416,7 +445,7 @@
 // Horizontal dividers
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
-@mixin nav-divider() {
+@mixin 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
@@ -426,8 +455,8 @@
   margin: (($baseLineHeight / 2) - 1) 1px; // 8px 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/navbar.scss

@@ -123,13 +123,7 @@
     @include box-shadow((inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)));
     @include transition(none);
 
-    // Placeholder text gets special styles; can't be a grouped selector
-    &:-moz-placeholder {
-      color: $navbarSearchPlaceholderColor;
-    }
-    &::-webkit-input-placeholder {
-      color: $navbarSearchPlaceholderColor;
-    }
+    @include placeholder-input($navbarSearchPlaceholderColor);
 
     // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
     &:focus,

data/vendor/assets/stylesheets/reset.scss

@@ -81,6 +81,11 @@ img {
   -ms-interpolation-mode: bicubic;
 }
 
+// Prevent max-width from affecting Google Maps
+#map_canvas img {
+  max-width: none;
+}
+
 // Forms
 // -------------------------
 

data/vendor/assets/stylesheets/responsive-navbar.scss

@@ -9,11 +9,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/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/type.scss

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

data/vendor/assets/stylesheets/variables.scss

@@ -107,7 +107,8 @@ $dropdownBorder:                rgba(0,0,0,.2) !default;
 $dropdownLinkColor:             $grayDark !default;
 $dropdownLinkColorHover:        $white !default;
 $dropdownLinkBackgroundHover:   $linkColor !default;
-
+$dropdownDividerTop:            #e5e5e5 !default;
+$dropdownDividerBottom:         $white !default;
 
 
 // COMPONENT VARIABLES

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anjlab-bootstrap-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.3.2
+  version: 2.0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -75,7 +75,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-description: Twitter Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3
+description: Twitter Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3
   projects
 email:
 - yury.korolev@gmail.com
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3176541500452665960
+      hash: -1818697517985896885
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,13 +173,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3176541500452665960
+      hash: -1818697517985896885
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
-summary: Bootstrap CSS (with SASS flavour) and JS toolkits for Rails 3 projects
+summary: Bootstrap CSS (with Sass flavour) and JS toolkits for Rails 3 projects
 test_files:
 - test/ie_hex_str_test.rb
 - test/test_helper.rb