twitter-bootstrap-rails 2.0 → 2.0.1

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

@@ -38,8 +38,8 @@
         , title = this.getTitle()
         , content = this.getContent()
 
-      $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
-      $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
+      $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
+      $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
 
       $tip.removeClass('fade top bottom left right in')
     }
@@ -89,7 +89,7 @@
   $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
     placement: 'right'
   , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
+  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
   })
 
 }( window.jQuery )

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

@@ -27,10 +27,11 @@
   function ScrollSpy( element, options) {
     var process = $.proxy(this.process, this)
       , $element = $(element).is('body') ? $(window) : $(element)
+      , href
     this.options = $.extend({}, $.fn.scrollspy.defaults, options)
     this.$scrollElement = $element.on('scroll.scroll.data-api', process)
     this.selector = (this.options.target
-      || $(element).attr('href')
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
       || '') + ' .nav li > a'
     this.$body = $('body').on('click.scroll.data-api', this.selector, process)
     this.refresh()
@@ -121,4 +122,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -36,9 +36,14 @@
   , show: function () {
       var $this = this.element
         , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , href = $this.attr('data-target') || $this.attr('href')
+        , selector = $this.attr('data-target')
         , previous
-        , $href
+        , $target
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
 
       if ( $this.parent('li').hasClass('active') ) return
 
@@ -49,10 +54,10 @@
       , relatedTarget: previous
       })
 
-      $href = $(href)
+      $target = $(selector)
 
       this.activate($this.parent('li'), $ul)
-      this.activate($href, $href.parent(), function () {
+      this.activate($target, $target.parent(), function () {
         $this.trigger({
           type: 'shown'
         , relatedTarget: previous
@@ -122,4 +127,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )

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

@@ -48,4 +48,4 @@
 
   })
   
-}( window.jQuery )
+}( window.jQuery )

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

@@ -24,8 +24,11 @@
   var Typeahead = function ( element, options ) {
     this.$element = $(element)
     this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
     this.$menu = $(this.options.menu).appendTo('body')
-    this.data = this.options.data
+    this.source = this.options.source
     this.shown = false
     this.listen()
   }
@@ -34,11 +37,6 @@
 
     constructor: Typeahead
 
-  , matcher: function (item, query) {
-      // ;_; http://jsperf.com/asdfdfasdfa
-      return ~item.toLowerCase().indexOf(query)
-    }
-
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element.val(val)
@@ -77,12 +75,12 @@
         return this.shown ? this.hide() : this
       }
 
-      q = this.query.toLowerCase()
-
-      items = this.data.filter(function (item) {
-        if (that.matcher(item, q)) return item
+      items = $.grep(this.source, function (item) {
+        if (that.matcher(item)) return item
       })
 
+      items = this.sorter(items)
+
       if (!items.length) {
         return this.shown ? this.hide() : this
       }
@@ -90,17 +88,37 @@
       return this.render(items.slice(0, this.options.items)).show()
     }
 
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
   , render: function (items) {
       var that = this
-        , QUERY = new RegExp('(' + this.query + ')', 'ig')
 
       items = $(items).map(function (i, item) {
         i = $(that.options.item).attr('data-value', item)
-
-        i.find('a').html(item.replace(QUERY, function ($1, match) {
-          return '<strong>' + match + '</strong>'
-        }))
-
+        i.find('a').html(that.highlighter(item))
         return i[0]
       })
 
@@ -157,6 +175,7 @@
 
         case 9: // tab
         case 13: // enter
+          if (!this.shown) return
           this.select()
           break
 
@@ -172,6 +191,7 @@
 
   , keypress: function (e) {
       e.stopPropagation()
+      if (!this.shown) return
 
       switch(e.keyCode) {
         case 9: // tab
@@ -181,13 +201,11 @@
           break
 
         case 38: // up arrow
-          if (!this.shown) return
           e.preventDefault()
           this.prev()
           break
 
         case 40: // down arrow
-          if (!this.shown) return
           e.preventDefault()
           this.next()
           break
@@ -229,7 +247,8 @@
   }
 
   $.fn.typeahead.defaults = {
-    items: 8
+    source: []
+  , items: 8
   , menu: '<ul class="typeahead dropdown-menu"></ul>'
   , item: '<li><a href="#"></a></li>'
   }
@@ -249,4 +268,4 @@
     })
   })
 
-}( window.jQuery )
+}( window.jQuery )

data/vendor/toolkit/twitter/bootstrap/accordion.less

@@ -9,15 +9,16 @@
 
 // Group == heading + body
 .accordion-group {
-  background-color: #f5f5f5;
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
   .border-radius(4px);
 }
 .accordion-heading {
-  padding: 8px 15px;
   border-bottom: 0;
 }
-.accordion-body {
-  margin-bottom: 2px;
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
 }
 
 // Inner needs the styles because you can't animate properly with any styles on the element

data/vendor/toolkit/twitter/bootstrap/alerts.less

@@ -18,6 +18,7 @@
 // Adjust close link position
 .alert .close {
   position: relative;
+  top: -2px;
   right: -21px;
   line-height: 18px;
 }

data/vendor/toolkit/twitter/bootstrap/bootstrap.less

@@ -1,12 +1,11 @@
 /*!
- * Bootstrap @VERSION
+ * Bootstrap v2.0.0
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
  */
 
 // CSS Reset
@@ -18,9 +17,12 @@
 
 // Grid system and page structure
 @import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
 
 // Base CSS
 @import "type.less";
+@import "code.less";
 @import "forms.less";
 @import "tables.less";
 
@@ -31,6 +33,11 @@
 @import "component-animations.less";
 @import "close.less";
 
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
 // Components: Nav
 @import "navs.less";
 @import "navbar.less";
@@ -43,18 +50,13 @@
 @import "tooltip.less";
 @import "popovers.less";
 
-// Components: Buttons & Alerts
-@import "buttons.less";
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
 // Components: Misc
 @import "thumbnails.less";
 @import "labels.less";
 @import "progress-bars.less";
 @import "accordion.less";
 @import "carousel.less";
-@import "responsive.less";
+@import "hero-unit.less";
 
 // Utility classes
 @import "utilities.less"; // Has to be last to override when necessary

data/vendor/toolkit/twitter/bootstrap/button-groups.less

@@ -6,6 +6,7 @@
 .btn-group {
   position: relative;
   .clearfix(); // clears the floated buttons
+  .ie7-restore-left-whitespace();
 }
 
 // Space out series of button groups
@@ -15,8 +16,11 @@
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
+  margin-top: @baseLineHeight / 2;
+  margin-bottom: @baseLineHeight / 2;
   .btn-group {
     display: inline-block;
+    .ie7-inline-block();
   }
 }
 
@@ -25,7 +29,7 @@
   position: relative;
   float: left;
   margin-left: -1px;
-  .border-radius(0);
+  .border-radius(0px);
 }
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group .btn:first-child {
@@ -69,10 +73,18 @@
 // On hover/focus/active, bring the proper btn to front
 .btn-group .btn:hover,
 .btn-group .btn:focus,
-.btn-group .btn:active {
+.btn-group .btn:active,
+.btn-group .btn.active {
   z-index: 2;
 }
 
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+
 
 // Split button dropdowns
 // ----------------------
@@ -81,36 +93,54 @@
 .btn-group .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @shadow: inset 1px 0 0 rgba(255,255,255,.125), 0 1px 2px rgba(0,0,0,.05);
+  @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);
   .box-shadow(@shadow);
+  *padding-top: 5px;
+  *padding-bottom: 5px;
 }
 
-// Reposition menu on open and round all corners
-.btn-group.open .dropdown-menu {
-  display: block;
-  margin-top: 1px;
-  .border-radius(5px);
-}
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-  .box-shadow(@shadow);
+.btn-group.open {
+  // 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;
+
+  // Reposition menu on open and round all corners
+  .dropdown-menu {
+    display: block;
+    margin-top: 1px;
+    .border-radius(5px);
+  }
+
+  .dropdown-toggle {
+    background-image: none;
+    @shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+    .box-shadow(@shadow);
+  }
 }
 
 // Reposition the caret
 .btn .caret {
-  margin-top: 6px;
+  margin-top: 7px;
   margin-left: 0;
 }
+.btn:hover .caret,
+.open.btn-group .caret {
+  .opacity(100);
+}
+
 
 // Account for other colors
-.primary,
-.danger,
-.info,
-.success {
+.btn-primary,
+.btn-danger,
+.btn-info,
+.btn-success {
   .caret {
     border-top-color: @white;
     .opacity(75);
   }
 }
 
+// Small button dropdowns
+.btn-small .caret {
+  margin-top: 4px;
+}

data/vendor/toolkit/twitter/bootstrap/buttons.less

@@ -1,40 +1,18 @@
 // BUTTON STYLES
 // -------------
 
-// Shared colors for buttons and alerts
-.btn {
-  // Set text color
-  &.danger,
-  &.danger:hover,
-  &.success,
-  &.success:hover,
-  &.info,
-  &.info:hover {
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    color: @white
-  }
-  // Danger and error appear as red
-  &.danger {
-    .gradientBar(#ee5f5b, #c43c35);
-  }
-  // Success appears as green
-  &.success {
-    .gradientBar(#62c462, #57a957);
-  }
-  // Info appears as a neutral blue
-  &.info {
-    .gradientBar(#5bc0de, #339bb9);
-  }
-}
 
-// Base .btn styles
+// Base styles
+// --------------------------------------------------
+
+// Core
 .btn {
-  // Button Base
   display: inline-block;
-  padding: 5px 10px 6px;
+  padding: 4px 10px 4px;
   font-size: @baseFontSize;
-  line-height: normal;
+  line-height: @baseLineHeight;
   color: @grayDark;
+  text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
   border: 1px solid #ccc;
@@ -44,73 +22,144 @@
   .box-shadow(@shadow);
   cursor: pointer;
 
-  &:hover {
-    color: @grayDark;
-    text-decoration: none;
-    background-position: 0 -15px;
-  }
+  // Give IE7 some love
+  .ie7-restore-left-whitespace();
+}
 
-  // Focus state for keyboard and accessibility
-  &:focus {
-    outline: 1px dotted #666;
-  }
+// Hover state
+.btn:hover {
+  color: @grayDark;
+  text-decoration: none;
+  background-color: darken(@white, 10%);
+  background-position: 0 -15px;
 
-  // Primary Button Type
-  &.primary {
-    color: @white;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    .gradientBar(@blue, @blueDark)
-  }
+  // transition is only when going to hover, otherwise the background
+  // behind the gradient (there for IE<=9 fallback) gets mismatched
+  .transition(background-position .1s linear);
+}
 
-   // Transitions
-  .transition(.1s linear all);
+// Focus state for keyboard and accessibility
+.btn:focus {
+  .tab-focus();
+}
 
-  // Active and Disabled states
-  &.active,
-  &:active {
-    background-image: none;
-    @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
-  }
-  &.disabled {
-    cursor: default;
-    background-image: none;
-    .reset-filter();
-    .opacity(65);
-    .box-shadow(none);
-  }
-  &[disabled] {
-    // disabled pseudo can't be included with .disabled
-    // def because IE8 and below will drop it ;_;
-    cursor: default;
-    background-image: none;
-    .reset-filter();
-    .opacity(65);
-    .box-shadow(none);
-  }
+// Active state
+.btn.active,
+.btn:active {
+  background-image: none;
+  @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  .box-shadow(@shadow);
+  background-color: darken(@white, 10%);
+  background-color: darken(@white, 15%) e("\9");
+  color: rgba(0,0,0,.5);
+  outline: 0;
+}
 
-  // Button Sizes
-  &.large {
-    padding: 9px 14px 9px;
-    font-size: @baseFontSize + 2px;
-    line-height: normal;
-    .border-radius(5px);
-  }
-  &.small {
-    padding: 7px 9px 7px;
-    font-size: @baseFontSize - 2px;
-  }
+// Disabled state
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: darken(@white, 10%);
+  .opacity(65);
+  .box-shadow(none);
 }
-// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
-:root .btn {
-  border-radius: 0 \0;
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+  padding: 9px 14px;
+  font-size: @baseFontSize + 2px;
+  line-height: normal;
+  .border-radius(5px);
 }
+.btn-large .icon {
+  margin-top: 1px;
+}
+
+// Small
+.btn-small {
+  padding: 5px 9px;
+  font-size: @baseFontSize - 2px;
+  line-height: @baseLineHeight - 2px;
+}
+.btn-small .icon {
+  margin-top: -1px;
+}
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+// Set text color
+// -------------------------
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover {
+  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  color: @white;
+}
+// Provide *some* extra contrast for those who can get it
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active {
+  color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn-primary {
+  .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
+}
+// Warning appears are orange
+.btn-warning {
+  .buttonBackground(lighten(@orange, 15%), @orange);
+}
+// Danger and error appear as red
+.btn-danger {
+  .buttonBackground(#ee5f5b, #bd362f);
+}
+// Success appears as green
+.btn-success {
+  .buttonBackground(#62c462, #51a351);
+}
+// Info appears as a neutral blue
+.btn-info {
+  .buttonBackground(#5bc0de, #2f96b4);
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
 
-// Help Firefox not be a jerk about adding extra padding to buttons
 button.btn,
-input[type=submit].btn {
+input[type="submit"].btn {
   &::-moz-focus-inner {
-  	padding: 0;
-  	border: 0;
+  padding: 0;
+    border: 0;
   }
-}
+
+  // IE7 has some default padding on button controls
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+  &.large {
+    *padding-top: 7px;
+    *padding-bottom: 7px;
+  }
+  &.small {
+    *padding-top: 3px;
+    *padding-bottom: 3px;
+  }
+}