anjlab-bootstrap-rails 2.0.1.1 → 2.0.2.0

data/README.md

@@ -1,4 +1,4 @@
-# Twitter Bootstrap v2 for Rails 3
+# Twitter Bootstrap v 2.0.1 for Rails 3
 Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
 It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
 
@@ -48,6 +48,7 @@ $gridGutterWidth: 10px;
 @import "bootstrap";
 @import "responsive";
 ```
+ NOTE: restart `pow` if you are using it.
 
 ## Javascripts
 

data/lib/bootstrap-rails/version.rb

@@ -1,5 +1,5 @@
 module Bootstrap
   module Rails
-    VERSION = "2.0.1.1"
+    VERSION = "2.0.2.0"
   end
 end

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

@@ -1,5 +1,5 @@
 /* ==========================================================
- * bootstrap-alert.js v2.0.1
+ * bootstrap-alert.js v2.0.2
  * 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.1
+ * bootstrap-button.js v2.0.2
  * 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.1
+ * bootstrap-carousel.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#carousel
  * ==========================================================
  * Copyright 2012 Twitter, Inc.
@@ -29,6 +29,9 @@
     this.$element = $(element)
     this.options = $.extend({}, $.fn.carousel.defaults, options)
     this.options.slide && this.slide(this.options.slide)
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
   }
 
   Carousel.prototype = {
@@ -83,14 +86,14 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
-      if (!$next.length) return
-
       this.sliding = true
 
       isCycling && this.pause()
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
+      if ($next.hasClass('active')) return
+
       if (!$.support.transition && this.$element.hasClass('slide')) {
         this.$element.trigger('slide')
         $active.removeClass('active')
@@ -136,6 +139,7 @@
 
   $.fn.carousel.defaults = {
     interval: 5000
+  , pause: 'hover'
   }
 
   $.fn.carousel.Constructor = Carousel

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

@@ -1,5 +1,5 @@
 /* =============================================================
- * bootstrap-collapse.js v2.0.1
+ * bootstrap-collapse.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#collapse
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -74,7 +74,9 @@
         [dimension](size || 'auto')
         [0].offsetWidth
 
-      this.$element.addClass('collapse')
+      this.$element[size ? 'addClass' : 'removeClass']('collapse')
+
+      return this
     }
 
   , transition: function ( method, startEvent, completeEvent ) {

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

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.1
+ * bootstrap-dropdown.js v2.0.2
  * 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.1
+ * bootstrap-modal.js v2.0.2
  * 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.1
+ * bootstrap-popover.js v2.0.2
  * 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.1
+ * bootstrap-scrollspy.js v2.0.2
  * 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.1
+ * bootstrap-tab.js v2.0.2
  * 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.1
+ * bootstrap-tooltip.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ===========================================================
@@ -206,7 +206,7 @@
       title = $e.attr('data-original-title')
         || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
 
-      title = title.toString().replace(/(^\s*|\s*$)/, "")
+      title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
 
       return title
     }

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

@@ -1,5 +1,5 @@
 /* ===================================================
- * bootstrap-transition.js v2.0.1
+ * bootstrap-transition.js v2.0.2
  * 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.1
+ * bootstrap-typeahead.js v2.0.2
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
  * =============================================================
  * Copyright 2012 Twitter, Inc.
@@ -40,6 +40,7 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element.val(val)
+      this.$element.change();
       return this.hide()
     }
 
@@ -165,9 +166,6 @@
     }
 
   , keyup: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-
       switch(e.keyCode) {
         case 40: // down arrow
         case 38: // up arrow
@@ -180,6 +178,7 @@
           break
 
         case 27: // escape
+          if (!this.shown) return
           this.hide()
           break
 
@@ -187,10 +186,11 @@
           this.lookup()
       }
 
+      e.stopPropagation()
+      e.preventDefault()
   }
 
   , keypress: function (e) {
-      e.stopPropagation()
       if (!this.shown) return
 
       switch(e.keyCode) {
@@ -210,12 +210,12 @@
           this.next()
           break
       }
+
+      e.stopPropagation()
     }
 
   , blur: function (e) {
       var that = this
-      e.stopPropagation()
-      e.preventDefault()
       setTimeout(function () { that.hide() }, 150)
     }
 

data/vendor/assets/stylesheets/alerts.scss

@@ -9,10 +9,10 @@
   background-color: $warningBackground;
   border: 1px solid $warningBorder;
   @include border-radius(4px);
+  color: $warningText;
 }
-.alert,
 .alert-heading {
-  color: $warningText;
+  color: inherit;
 }
 
 // Adjust close link position
@@ -29,32 +29,20 @@
 .alert-success {
   background-color: $successBackground;
   border-color: $successBorder;  
-}
-.alert-success,
-.alert-success .alert-heading {
   color: $successText;
 }
 .alert-danger,
 .alert-error {
   background-color: $errorBackground;
   border-color: $errorBorder;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
   color: $errorText;
 }
 .alert-info {
   background-color: $infoBackground;
   border-color: $infoBorder;
-}
-.alert-info,
-.alert-info .alert-heading {
   color: $infoText;
 }
 
-
 // Block alerts
 // ------------------------
 .alert-block {

data/vendor/assets/stylesheets/badges.scss

@@ -0,0 +1,36 @@
+// BADGES
+// ------
+
+// Base
+.badge {
+  padding: 1px 9px 2px;
+  font-size: $baseFontSize * .925;
+  font-weight: bold;
+  white-space: nowrap;
+  color: $white;
+  background-color: $grayLight;
+  @include border-radius(9px);
+}
+
+// Hover state
+.badge:hover {
+  color: $white;
+  text-decoration: none;
+  cursor: pointer;
+}
+
+// Colors
+.badge-error            { background-color: $errorText; }
+.badge-error:hover      { background-color: darken($errorText, 10%); }
+
+.badge-warning          { background-color: $orange; }
+.badge-warning:hover    { background-color: darken($orange, 10%); }
+
+.badge-success          { background-color: $successText; }
+.badge-success:hover    { background-color: darken($successText, 10%); }
+
+.badge-info             { background-color: $infoText; }
+.badge-info:hover       { background-color: darken($infoText, 10%); }
+
+.badge-inverse          { background-color: $grayDark; }
+.badge-inverse:hover    { background-color: darken($grayDark, 10%); }

data/vendor/assets/stylesheets/bootstrap.scss

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.0.2
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -53,6 +53,7 @@
 // Components: Misc
 @import "thumbnails.scss";
 @import "labels.scss";
+@import "badges.scss";
 @import "progress-bars.scss";
 @import "accordion.scss";
 @import "carousel.scss";

data/vendor/assets/stylesheets/breadcrumbs.scss

@@ -4,12 +4,14 @@
 .breadcrumb {
   padding: 7px 14px;
   margin: 0 0 $baseLineHeight;
+  list-style: none;
   @include gradient-vertical($white, #f5f5f5);
   border: 1px solid #ddd;
   @include border-radius(3px);
   @include box-shadow(inset 0 1px 0 $white);
   li {
     display: inline-block;
+    @include ie7-inline-block();
     text-shadow: 0 1px 0 $white;
   }
   .divider {

data/vendor/assets/stylesheets/button-groups.scss

@@ -95,8 +95,22 @@
   padding-right: 8px;
   $shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   @include box-shadow($shadow);
-  *padding-top: 5px;
-  *padding-bottom: 5px;
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+.btn-group .btn-mini.dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+.btn-group .btn-small.dropdown-toggle {
+  *padding-top: 4px;
+  *padding-bottom: 4px;
+}
+.btn-group .btn-large.dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
 }
 
 .btn-group.open {
@@ -127,22 +141,32 @@
 .open.btn-group .caret {
   @include opacity(100);
 }
+// Carets in other button sizes
+.btn-mini .caret {
+  margin-top: 5px;
+}
+.btn-small .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  margin-top: 6px;
+  border-left:  5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top:   5px solid $black;
+}
 
 
 // Account for other colors
 .btn-primary,
+.btn-warning,
 .btn-danger,
 .btn-info,
 .btn-success,
 .btn-inverse {
   .caret {
     border-top-color: $white;
+    border-bottom-color: $white;
     @include opacity(75);
   }
 }
 
-// Small button dropdowns
-.btn-small .caret {
-  margin-top: 4px;
-}
-

data/vendor/assets/stylesheets/buttons.scss

@@ -8,6 +8,7 @@
 // Core
 .btn {
   display: inline-block;
+  @include ie7-inline-block();
   padding: 4px 10px 4px;
   margin-bottom: 0; // For input.btn
   font-size: $baseFontSize;
@@ -16,16 +17,15 @@
   text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   vertical-align: middle;
-  @include button-background($white, darken($white, 10%));
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
+  @include button-background($btnBackground, $btnBackgroundHighlight);
+  border: 1px solid $btnBorder;
+  border-bottom-color: darken($btnBorder, 10%);
   @include border-radius(4px);
   $shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
   @include box-shadow($shadow);
   cursor: pointer;
 
   // Give IE7 some love
-  @include reset-filter();
   @include ie7-restore-left-whitespace();
 }
 
@@ -126,34 +126,34 @@
 .btn-danger.active,
 .btn-success.active,
 .btn-info.active,
-.btn-dark.active {
+.btn-inverse.active {
   color: rgba(255,255,255,.75);
 }
 
 // Set the backgrounds
 // -------------------------
 .btn-primary {
-  @include button-background($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
+  @include button-background($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
 }
 // Warning appears are orange
 .btn-warning {
-  @include button-background(lighten($orange, 15%), $orange);
+  @include button-background($btnWarningBackground, $btnWarningBackgroundHighlight);
 }
 // Danger and error appear as red
 .btn-danger {
-  @include button-background(#ee5f5b, #bd362f);
+  @include button-background($btnDangerBackground, $btnDangerBackgroundHighlight);
 }
 // Success appears as green
 .btn-success {
-  @include button-background(#62c462, #51a351);
+  @include button-background($btnSuccessBackground, $btnSuccessBackgroundHighlight);
 }
 // Info appears as a neutral blue
 .btn-info {
-  @include button-background(#5bc0de, #2f96b4);
+  @include button-background($btnInfoBackground, $btnInfoBackgroundHighlight);
 }
 // Inverse appears as dark gray
 .btn-inverse {
-  @include button-background(#454545, #262626);
+  @include button-background($btnInverseBackground, $btnInverseBackgroundHighlight);
 }
 
 
@@ -172,12 +172,16 @@ input[type="submit"].btn {
   // IE7 has some default padding on button controls
   *padding-top: 2px;
   *padding-bottom: 2px;
-  &.large {
+  &.btn-large {
     *padding-top: 7px;
     *padding-bottom: 7px;
   }
-  &.small {
+  &.btn-small {
     *padding-top: 3px;
     *padding-bottom: 3px;
   }
+  &.btn-mini {
+    *padding-top: 1px;
+    *padding-bottom: 1px;
+  }
 }