anjlab-bootstrap-rails 3.0.2.0 → 3.0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2b9d8187387ac35d2c470b5f10b0ec16ac21a8c
-  data.tar.gz: a06fb6e823a3f15a754b3aeb0de2489aaa0193a6
+  metadata.gz: 08327e7bd4624d6942b466b669a2ce2689a7e492
+  data.tar.gz: ef8bb31e7f1d0b29b4b9b6b6a1a217bc9ed63de3
 SHA512:
-  metadata.gz: c5c388e6086e806fab4ad25d92578a4391dc9a590712f4c2f3ac853906c1bfbc26d90c3637a5dd1b15553175aa7407efa50be63e9b42c0b6038abca2d350ea3f
-  data.tar.gz: 4697a2411d21d08ea6b1c37d4bea029f125c9b776ab4bb90ba987831b95dcf9a7e4ee4db93d248e5c4e0ce7dc9612ccd27235c20824a2a2da9d02c01396c5ed2
+  metadata.gz: 862f4e261b3c17b9159da25b3f80b10a30a1f9f53f146fb2962065dbab298d8116735a2cefee77578ad239c9700eda78502da6a7cd1409966e77d6885548ca44
+  data.tar.gz: 4605c4aa8b0aaccf58dcb268835ef2789f723d157150070bfb91c1f19d59cdbb0bfb06bc38c5edcd9978ba8171271931119a1826100a5c97d675c4eab2cf5dd1

data/README.md

@@ -1,5 +1,5 @@
-# Twitter Bootstrap v3.0.1 for Rails 3/4
-Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
+# Bootstrap v3.0.3 for Rails 3/4
+Bootstrap is a toolkit originated at Twitter that's designed to kickstart development of webapps and sites.
 It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
 
 Note: if you are looking for bootstrapped date and time pickers please take a look at [anjlab-widgets](https://github.com/anjlab/anjlab-widgets) gem.
@@ -19,7 +19,7 @@ You can install from latest build via git
 
 ``` ruby
 
-gem 'anjlab-bootstrap-rails', '~> 3.0.1.0', :require => 'bootstrap-rails'
+gem 'anjlab-bootstrap-rails', '~> 3.0.3.0', :require => 'bootstrap-rails'
 ```
 
 and run bundle install.
@@ -27,7 +27,7 @@ and run bundle install.
 ## Stylesheets
 
 1. Rename application.css to application.css.scss
-2. Import twitter bootstrap `@import "twitter/bootstrap";`
+2. Import bootstrap `@import "twitter/bootstrap";`
 3. You can override vars above `@import "twitter/bootstrap";`
 
 ```scss
@@ -46,7 +46,7 @@ $link-color: red;
 Add necessary javascript(s) files to app/assets/javascripts/application.js
 
 ``` javascript
-// Include all twitter's javascripts
+// Include all bootstrap javascripts
 //= require twitter/bootstrap
 
 // Or peek any of them yourself
@@ -70,7 +70,7 @@ Add necessary javascript(s) files to app/assets/javascripts/application.js
 
 ## Thanks
 Thanks Twitter for Bootstrap
-http://twitter.github.com/bootstrap
+http://getbootstrap.com
 
 Inspired by Seyhun Akyürek and his [twitter-bootstrap-rails gem](https://github.com/seyhunak/twitter-bootstrap-rails)
 

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/testtask'
 
 namespace :twitter do
 
-  desc "Pulls Twitter's Bootstrap Scss"
+  desc "Pulls Bootstrap Scss"
   task :pull do
     if !system "cd bootstrap && git pull"
       abort "...."
@@ -30,10 +30,10 @@ namespace :twitter do
     file target => [source] { cp source, target, verbose: true }
   end
 
-  desc "Update Twitter's Bootstrap Fonts"
+  desc "Update Bootstrap Fonts"
   task :fonts => ASSETS_FONTS
 
-  desc "Update Twitter's Bootstrap JS"
+  desc "Update Bootstrap JS"
   task :js => ASSETS_JS do
     js = {}
     ASSETS_JS.pathmap("%f").each { |f| js[f] = 1 }
@@ -46,7 +46,7 @@ namespace :twitter do
     File.write "app/assets/javascripts/twitter/bootstrap.js", list.map {|f| "//= require #{f}"}.join("\n")
   end
 
-  desc "Update Twitter's icons"
+  desc "Update Bootstrap Glyphicons icons"
   task :icons do
     vars_path = 'app/assets/stylesheets/twitter/bootstrap/_variables.scss'
     variables = File.read vars_path
@@ -59,7 +59,7 @@ namespace :twitter do
     File.write(icons_path, icons)
   end
 
-  desc "Update Twitter's Bootstrap SCSS"
+  desc "Update Bootstrap SCSS"
   task :scss => ASSETS_SCSS do
     File.write "app/assets/stylesheets/twitter/bootstrap.scss", '@import "twitter/bootstrap/bootstrap";'
   end
@@ -72,7 +72,7 @@ namespace :twitter do
     FileUtils.mkpath 'app/assets/stylesheets/twitter/bootstrap'
   end
 
-  desc "Update Twitter's Bootstrap Assets"
+  desc "Update Bootstrap Assets"
   task :assets => [:pull, :clean, :fonts, :scss, :js, :icons]
 
 end

data/app/assets/javascripts/twitter/bootstrap/affix.js

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.0.2
+ * Bootstrap: affix.js v3.0.3
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.0.2
+ * Bootstrap: alert.js v3.0.3
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.0.2
+ * Bootstrap: button.js v3.0.3
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -54,15 +54,21 @@
 
   Button.prototype.toggle = function () {
     var $parent = this.$element.closest('[data-toggle="buttons"]')
+    var changed = true
 
     if ($parent.length) {
       var $input = this.$element.find('input')
-        .prop('checked', !this.$element.hasClass('active'))
-        .trigger('change')
-      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
+      if ($input.prop('type') === 'radio') {
+        // see if clicking on current one
+        if ($input.prop('checked') && this.$element.hasClass('active'))
+          changed = false
+        else
+          $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
     }
 
-    this.$element.toggleClass('active')
+    if (changed) this.$element.toggleClass('active')
   }
 
 

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.2
+ * Bootstrap: carousel.js v3.0.3
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -69,7 +69,7 @@
 
     if (pos > (this.$items.length - 1) || pos < 0) return
 
-    if (this.sliding)       return this.$element.one('slid', function () { that.to(pos) })
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
     if (activeIndex == pos) return this.pause().cycle()
 
     return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -121,7 +121,7 @@
 
     if (this.$indicators.length) {
       this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid', function () {
+      this.$element.one('slid.bs.carousel', function () {
         var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
         $nextIndicator && $nextIndicator.addClass('active')
       })
@@ -139,7 +139,7 @@
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
           that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
+          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
         })
         .emulateTransitionEnd(600)
     } else {
@@ -148,7 +148,7 @@
       $active.removeClass('active')
       $next.addClass('active')
       this.sliding = false
-      this.$element.trigger('slid')
+      this.$element.trigger('slid.bs.carousel')
     }
 
     isCycling && this.cycle()

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.2
+ * Bootstrap: collapse.js v3.0.3
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.2
+ * Bootstrap: dropdown.js v3.0.3
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -26,7 +26,7 @@
   var backdrop = '.dropdown-backdrop'
   var toggle   = '[data-toggle=dropdown]'
   var Dropdown = function (element) {
-    var $el = $(element).on('click.bs.dropdown', this.toggle)
+    $(element).on('click.bs.dropdown', this.toggle)
   }
 
   Dropdown.prototype.toggle = function (e) {
@@ -41,7 +41,7 @@
 
     if (!isActive) {
       if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we we use a backdrop because click events don't delegate
+        // if mobile we use a backdrop because click events don't delegate
         $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
       }
 
@@ -123,9 +123,9 @@
   $.fn.dropdown = function (option) {
     return this.each(function () {
       var $this = $(this)
-      var data  = $this.data('dropdown')
+      var data  = $this.data('bs.dropdown')
 
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.0.2
+ * Bootstrap: modal.js v3.0.3
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.0.2
+ * Bootstrap: popover.js v3.0.3
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.2
+ * Bootstrap: scrollspy.js v3.0.3
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2013 Twitter, Inc.
@@ -113,7 +113,7 @@
         .addClass('active')
     }
 
-    active.trigger('activate')
+    active.trigger('activate.bs.scrollspy')
   }
 
 

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.0.2
+ * Bootstrap: tab.js v3.0.3
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.2
+ * Bootstrap: tooltip.js v3.0.3
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================

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

@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.0.2
+ * Bootstrap: transition.js v3.0.3
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2013 Twitter, Inc.

data/app/assets/stylesheets/twitter/bootstrap/_badges.scss

@@ -24,6 +24,12 @@
   }
 }
 
+// Quick fix for badges in buttons
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+
 // Hover state, but only for links
 a.badge {
   &:hover,
@@ -34,12 +40,6 @@ a.badge {
   }
 }
 
-// Quick fix for labels/badges in buttons
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
 // Account for counters in navs
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {

data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss

@@ -2,37 +2,6 @@
 // Button groups
 // --------------------------------------------------
 
-// Button carets
-//
-// Match the button text color to the arrow/caret for indicating dropdown-ness.
-
-.caret {
-  .btn-default & {
-    border-top-color: $btn-default-color;
-  }
-  .btn-primary &,
-  .btn-success &,
-  .btn-warning &,
-  .btn-danger &,
-  .btn-info & {
-    border-top-color: #fff;
-  }
-}
-.dropup {
-  .btn-default .caret {
-    border-bottom-color: $btn-default-color;
-  }
-  .btn-primary,
-  .btn-success,
-  .btn-warning,
-  .btn-danger,
-  .btn-info {
-   .caret {
-      border-bottom-color: #fff;
-    }
-  }
-}
-
 // Make the div behave like a button
 .btn-group,
 .btn-group-vertical {
@@ -178,7 +147,8 @@
 
 .btn-group-vertical {
   > .btn,
-  > .btn-group {
+  > .btn-group,
+  > .btn-group > .btn {
     display: block;
     float: none;
     width: 100%;
@@ -238,11 +208,15 @@
   width: 100%;
   table-layout: fixed;
   border-collapse: separate;
-  .btn {
+  > .btn,
+  > .btn-group {
     float: none;
     display: table-cell;
     width: 1%;
   }
+  > .btn-group .btn {
+    width: 100%;
+  }
 }
 
 

data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss

@@ -6,7 +6,6 @@
 // Base styles
 // --------------------------------------------------
 
-// Core styles
 .btn {
   display: inline-block;
   margin-bottom: 0; // For input.btn
@@ -45,7 +44,6 @@
     @include opacity(.65);
     @include box-shadow(none);
   }
-
 }
 
 
@@ -121,7 +119,7 @@
   @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 @mixin btn-xs {
-  padding: 1px 5px;
+  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 
 .btn-lg {@include btn-lg}

data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss

@@ -91,6 +91,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
+    outline: none;
     color: $carousel-control-color;
     text-decoration: none;
     @include opacity(.9);

data/app/assets/stylesheets/twitter/bootstrap/_component-animations.scss

@@ -5,7 +5,7 @@
 // Heads up!
 //
 // We don't use the `.opacity()` mixin here since it causes a bug with text
-// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.
+// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
 
 .fade {
   opacity: 0;

data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss

@@ -10,12 +10,9 @@
   height: 0;
   margin-left: 2px;
   vertical-align: middle;
-  border-top:   $caret-width-base solid $dropdown-caret-color;
+  border-top:   $caret-width-base solid;
   border-right: $caret-width-base solid transparent;
   border-left:  $caret-width-base solid transparent;
-  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
-  // we can just straight up remove this.
-  border-bottom: 0 dotted;
 }
 
 // The dropdown wrapper (div)
@@ -163,10 +160,8 @@
 .navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
-    // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
-    // gets fixed, restore `border-top: 0;`.
-    border-top: 0 dotted;
-    border-bottom: $caret-width-base solid $dropdown-caret-color;
+    border-top: 0;
+    border-bottom: $caret-width-base solid;
     content: "";
   }
   // Different positioning for bottom up menu