jombo 0.0.1.beta12 → 0.0.1.beta13

data/lib/jombo/version.rb

@@ -1,3 +1,3 @@
 module Jombo
-  VERSION = "0.0.1.beta12"
+  VERSION = "0.0.1.beta13"
 end

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

@@ -91,7 +91,7 @@
 
   $(function () {
     $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
-      $(e.srcElement).button('toggle')
+      $(e.target).button('toggle')
     })
   })
 

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

@@ -44,10 +44,12 @@
     }
 
   , next: function () {
+      if (this.sliding) return
       return this.slide('next')
     }
 
   , prev: function () {
+      if (this.sliding) return
       return this.slide('prev')
     }
 
@@ -59,21 +61,29 @@
         , fallback  = type == 'next' ? 'first' : 'last'
         , that = this
 
+      this.sliding = true
+
       isCycling && this.pause()
 
       $next = $next.length ? $next : this.$element.find('.item')[fallback]()
 
       if (!$.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger('slide')
         $active.removeClass('active')
         $next.addClass('active')
+        this.$element.trigger('slid')
+        this.sliding = false
       } else {
         $next.addClass(type)
         $next[0].offsetWidth // force reflow
         $active.addClass(direction)
         $next.addClass(direction)
+        this.$element.trigger('slide')
         this.$element.one($.support.transition.end, function () {
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
+          that.$element.trigger('slid')
+          that.sliding = false
         })
       }
 

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

@@ -38,12 +38,14 @@
       var $this = $(this)
         , selector = $this.attr('data-target') || $this.attr('href')
         , $parent = $(selector)
+        , isActive
 
       $parent.length || ($parent = $this.parent())
+      isActive = $parent.hasClass('open')
 
       clearMenus()
 
-      !$parent.hasClass('open') && $parent.toggleClass('open')
+      !isActive && $parent.toggleClass('open')
 
       return false
     }

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

@@ -51,8 +51,9 @@
         backdrop.call(this, function () {
           var transition = $.support.transition && that.$element.hasClass('fade')
 
+          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+
           that.$element
-            .appendTo(document.body)
             .show()
 
           if (transition) {

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

@@ -77,6 +77,8 @@
         if (transition) {
           element[0].offsetWidth // reflow for transition
           element.addClass('in')
+        } else {
+          element.removeClass('fade')
         }
 
         if ( element.parent('.dropdown-menu') ) {

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

@@ -88,8 +88,8 @@
       if (!self.options.delay || !self.options.delay.hide) {
         self.hide()
       } else {
+        self.hoverState = 'out'
         setTimeout(function() {
-          self.hoverState = 'out'
           if (self.hoverState == 'out') {
             self.hide()
           }
@@ -123,7 +123,7 @@
         $tip
           .remove()
           .css({ top: 0, left: 0, display: 'block' })
-          .prependTo(inside ? this.$element : document.body)
+          .appendTo(inside ? this.$element : document.body)
 
         pos = this.getPosition(inside)
 

data/vendor/assets/stylesheets/bootstrap/bootstrap.css

@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Jan  8 02:58:37 PST 2012
+ * Date: Sun Jan  8 15:38:44 PST 2012
  */
 html, body {
   margin: 0;
@@ -241,18 +241,6 @@ a:hover {
   color: #005580;
   text-decoration: underline;
 }
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
 .row {
   margin-left: -20px;
   zoom: 1;
@@ -1493,7 +1481,7 @@ i {
   line-height: 18px;
   color: #555555;
 }
-.dropdown-menu a:hover, .dropdown-menu .active > a {
+.dropdown-menu li > a:hover {
   color: #fff;
   text-decoration: none;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
@@ -1511,6 +1499,11 @@ i {
   -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
   box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.075), inset 0 -1px rgba(0, 0, 0, 0.075);
 }
+.dropdown-menu .active > a, .dropdown-menu .active > a:hover {
+  color: #fff;
+  background-color: #999;
+  background-image: none;
+}
 .dropdown.open .dropdown-toggle {
   color: #ffffff;
   background: #ccc;
@@ -1604,11 +1597,9 @@ i {
   -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 }
-.navbar .brand:hover, .navbar .nav .active > a {
+.navbar .brand:hover {
   color: #ffffff;
   text-decoration: none;
-  background-color: #333333;
-  background-color: rgba(255, 255, 255, 0.05);
 }
 .navbar .brand {
   float: left;
@@ -1701,7 +1692,7 @@ i {
   top: 0;
   right: 0;
   left: 0;
-  z-index: 1010;
+  z-index: 1030;
 }
 .navbar .nav {
   position: relative;
@@ -1731,6 +1722,8 @@ i {
   text-decoration: none;
 }
 .navbar .nav .active > a {
+  color: #ffffff;
+  text-decoration: none;
   background-color: #222;
   background-color: rgba(0, 0, 0, 0.5);
 }
@@ -1870,7 +1863,7 @@ i {
 .tabs > li > a:hover {
   border-color: #eee #eee #ddd;
 }
-.tabs .active > a, .tabs .active > a:hover {
+.tabs > .active > a, .tabs > .active > a:hover {
   color: #555555;
   background-color: #ffffff;
   border: 1px solid #ddd;
@@ -1925,7 +1918,7 @@ i {
 .pills.stacked > li:last-child > a {
   margin-bottom: 1px;
 }
-.nav .dropdown-menu {
+.pills .dropdown-menu, .tabs .dropdown-menu {
   top: 33px;
   border-width: 1px;
 }
@@ -1934,18 +1927,26 @@ i {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.nav .dropdown-toggle .caret {
+.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret {
   border-top-color: #0088cc;
   margin-top: 6px;
 }
-.nav .dropdown-toggle:hover .caret {
+.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret {
   border-top-color: #005580;
 }
-.nav .open .dropdown-toggle {
+.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret {
+  border-top-color: #333;
+}
+.nav > .dropdown.active > a:hover {
+  color: #000;
+  cursor: pointer;
+}
+.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+  color: #fff;
   background-color: #999;
   border-color: #999;
 }
-.nav .open .caret, .nav .open a:hover .caret {
+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: #fff;
   filter: alpha(opacity=100);
   -moz-opacity: 1;
@@ -2123,7 +2124,7 @@ i {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1020;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -2138,7 +2139,7 @@ i {
   position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 1030;
+  z-index: 1050;
   max-height: 500px;
   overflow: auto;
   width: 560px;
@@ -2208,7 +2209,7 @@ i {
 }
 .twipsy {
   position: absolute;
-  z-index: 1050;
+  z-index: 1020;
   display: block;
   visibility: visible;
   padding: 5px;
@@ -2286,7 +2287,7 @@ i {
   position: absolute;
   top: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1010;
   display: none;
   padding: 5px;
 }
@@ -2789,6 +2790,9 @@ a.thumbnail:hover {
 .carousel .active, .carousel .next, .carousel .prev {
   display: block;
 }
+.carousel .active {
+  left: 0;
+}
 .carousel .next, .carousel .prev {
   position: absolute;
   top: 0;
@@ -3002,6 +3006,21 @@ a.thumbnail:hover {
   background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
   background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}
 .hidden {
   display: none;
   visibility: hidden;
@@ -3062,13 +3081,6 @@ a.thumbnail:hover {
   .navbar .nav:hover > li > a:hover {
     background-color: #333;
   }
-  .modal {
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade.in {
-    top: auto;
-  }
   .horizontal-form .control-group > label {
     float: none;
     width: auto;
@@ -3091,7 +3103,10 @@ a.thumbnail:hover {
     right: 20px;
     width: auto;
   }
-  .modal .close {
+  .modal.fade.in {
+    top: auto;
+  }
+  .modal-header .close {
     padding: 10px;
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jombo
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta12
+  version: 0.0.1.beta13
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies: []
 description: Package Bootstrap from Twitter (2.0 work-in-progress branch) assets as
   a gem.