rake convert

lib/bootstrap-sass/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.1.1.0'
-  BOOTSTRAP_SHA = '385fb6898128bbfdc3def581bb92e01818fa0525'
+  BOOTSTRAP_SHA = '7bfd2cc0af988d0136993dbe20d0abfa6fb19eb9'
 end

vendor/assets/javascripts/bootstrap/dropdown.js

@@ -44,7 +44,7 @@
         .toggleClass('open')
         .trigger('shown.bs.dropdown', relatedTarget)
 
-      $this.focus()
+      $this.trigger('focus')
     }
 
     return false
@@ -64,8 +64,8 @@
     var isActive = $parent.hasClass('open')
 
     if (!isActive || (isActive && e.keyCode == 27)) {
-      if (e.which == 27) $parent.find(toggle).focus()
-      return $this.click()
+      if (e.which == 27) $parent.find(toggle).trigger('focus')
+      return $this.trigger('click')
     }
 
     var desc = ' li:not(.divider):visible a'
@@ -79,7 +79,7 @@
     if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
     if (!~index)                                      index = 0
 
-    $items.eq(index).focus()
+    $items.eq(index).trigger('focus')
   }
 
   function clearMenus(e) {

vendor/assets/javascripts/bootstrap/modal.js

@@ -78,10 +78,10 @@
       transition ?
         that.$element.find('.modal-dialog') // wait for modal to slide in
           .one($.support.transition.end, function () {
-            that.$element.focus().trigger(e)
+            that.$element.trigger('focus').trigger(e)
           })
           .emulateTransitionEnd(300) :
-        that.$element.focus().trigger(e)
+        that.$element.trigger('focus').trigger(e)
     })
   }
 
@@ -117,7 +117,7 @@
       .off('focusin.bs.modal') // guard against infinite focus loop
       .on('focusin.bs.modal', $.proxy(function (e) {
         if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-          this.$element.focus()
+          this.$element.trigger('focus')
         }
       }, this))
   }
@@ -232,7 +232,7 @@
     $target
       .modal(option, this)
       .one('hide', function () {
-        $this.is(':visible') && $this.focus()
+        $this.is(':visible') && $this.trigger('focus')
       })
   })
 

vendor/assets/stylesheets/bootstrap/_forms.scss

@@ -51,7 +51,7 @@ input[type="search"] {
 input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0 0;
-  margin-top: 1px \9; /* IE8-9 */
+  margin-top: 1px \9; // IE8-9
   line-height: normal;
 }
 
@@ -416,6 +416,7 @@ input[type="checkbox"],
 
   .form-control-static {
     padding-top: ($padding-base-vertical + 1);
+    padding-bottom: ($padding-base-vertical + 1);
   }
 
   // Only right align form labels here when the columns stop stacking

vendor/assets/stylesheets/bootstrap/_glyphicons.scss

@@ -1,3 +1,7 @@
+//= depend_on_asset "glyphicons-halflings-regular.eot"
+//= depend_on_asset "glyphicons-halflings-regular.svg"
+//= depend_on_asset "glyphicons-halflings-regular.ttf"
+//= depend_on_asset "glyphicons-halflings-regular.woff"
 //
 // Glyphicons for Bootstrap
 //

vendor/assets/stylesheets/bootstrap/_mixins.scss

@@ -148,31 +148,45 @@
 }
 
 // Transformations
-@mixin rotate($degrees) {
-  -webkit-transform: rotate($degrees);
-      -ms-transform: rotate($degrees); // IE9 only
-          transform: rotate($degrees);
+@mixin scale($ratio...) {
+  -webkit-transform: scale($ratio);
+      -ms-transform: scale($ratio); // IE9 only
+          transform: scale($ratio);
 }
-@mixin scale($scale-args...) {
-  -webkit-transform: scale($scale-args);
-      -ms-transform: scale($scale-args); // IE9 only
-          transform: scale($scale-args);
+@mixin scale($ratioX, $ratioY...) {
+  -webkit-transform: scale($ratioX, $ratioY);
+      -ms-transform: scale($ratioX, $ratioY); // IE9 only
+          transform: scale($ratioX, $ratioY);
 }
-@mixin translate($x, $y) {
-  -webkit-transform: translate($x, $y);
-      -ms-transform: translate($x, $y); // IE9 only
-          transform: translate($x, $y);
+@mixin scaleX($ratio) {
+  -webkit-transform: scaleX($ratio);
+      -ms-transform: scaleX($ratio); // IE9 only
+          transform: scaleX($ratio);
+}
+@mixin scaleY($ratio) {
+  -webkit-transform: scaleY($ratio);
+      -ms-transform: scaleY($ratio); // IE9 only
+          transform: scaleY($ratio);
 }
 @mixin skew($x, $y) {
   -webkit-transform: skew($x, $y);
       -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
           transform: skew($x, $y);
 }
+@mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
+      -ms-transform: translate($x, $y); // IE9 only
+          transform: translate($x, $y);
+}
 @mixin translate3d($x, $y, $z) {
   -webkit-transform: translate3d($x, $y, $z);
           transform: translate3d($x, $y, $z);
 }
-
+@mixin rotate($degrees) {
+  -webkit-transform: rotate($degrees);
+      -ms-transform: rotate($degrees); // IE9 only
+          transform: rotate($degrees);
+}
 @mixin rotateX($degrees) {
   -webkit-transform: rotateX($degrees);
       -ms-transform: rotateX($degrees); // IE9 only
@@ -409,12 +423,12 @@
     background-color: $heading-bg-color;
     border-color: $heading-border;
 
-    + .panel-collapse .panel-body {
+    + .panel-collapse > .panel-body {
       border-top-color: $border;
     }
   }
   & > .panel-footer {
-    + .panel-collapse .panel-body {
+    + .panel-collapse > .panel-body {
       border-bottom-color: $border;
     }
   }

vendor/assets/stylesheets/bootstrap/_modals.scss

@@ -98,8 +98,7 @@
 
 // Footer (for actions)
 .modal-footer {
-  margin-top: 15px;
-  padding: ($modal-inner-padding - 1) $modal-inner-padding $modal-inner-padding;
+  padding: $modal-inner-padding;
   text-align: right; // right align buttons
   border-top: 1px solid $modal-footer-border-color;
   @include clearfix(); // clear it in case folks use .pull-* classes on buttons

vendor/assets/stylesheets/bootstrap/_navbar.scss

@@ -496,6 +496,20 @@
     }
   }
 
+  .btn-link {
+    color: $navbar-default-link-color;
+    &:hover,
+    &:focus {
+      color: $navbar-default-link-hover-color;
+    }
+    &[disabled],
+    fieldset[disabled] & {
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-disabled-color;
+      }
+    }
+  }
 }
 
 // Inverse navbar
@@ -617,4 +631,18 @@
     }
   }
 
+  .btn-link {
+    color: $navbar-inverse-link-color;
+    &:hover,
+    &:focus {
+      color: $navbar-inverse-link-hover-color;
+    }
+    &[disabled],
+    fieldset[disabled] & {
+      &:hover,
+      &:focus {
+        color: $navbar-inverse-link-disabled-color;
+      }
+    }
+  }
 }

vendor/assets/stylesheets/bootstrap/_tables.scss

@@ -168,8 +168,8 @@ table {
 // by enabling horizontal scrolling. Only applies <768px. Everything above that
 // will display normally.
 
-@media (max-width: $screen-xs-max) {
-  .table-responsive {
+.table-responsive {
+  @media (max-width: $screen-xs-max) {
     width: 100%;
     margin-bottom: ($line-height-computed * 0.75);
     overflow-y: hidden;

vendor/assets/stylesheets/bootstrap/_type.scss

@@ -132,7 +132,7 @@ cite    { font-style: normal; }
 
 
 // Lists
-// --------------------------------------------------
+// -------------------------
 
 // Unordered and Ordered lists
 ul,
@@ -186,8 +186,12 @@ dd {
 // Defaults to being stacked without any of the below styles applied, until the
 // grid breakpoint is reached (default of ~768px).
 
-@media (min-width: $grid-float-breakpoint) {
-  .dl-horizontal {
+.dl-horizontal {
+  dd {
+    @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
+  }
+
+  @media (min-width: $grid-float-breakpoint) {
     dt {
       float: left;
       width: ($component-offset-horizontal - 20);
@@ -197,13 +201,13 @@ dd {
     }
     dd {
       margin-left: $component-offset-horizontal;
-      @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
     }
   }
 }
 
-// MISC
-// ----
+
+// Misc
+// -------------------------
 
 // Abbreviations and acronyms
 abbr[title],

vendor/assets/stylesheets/bootstrap/_variables.scss

@@ -562,7 +562,7 @@ $label-link-hover-color:      #fff !default;
 //##
 
 //** Padding applied to the modal body
-$modal-inner-padding:         20px !default;
+$modal-inner-padding:         15px !default;
 
 //** Padding applied to the modal title
 $modal-title-padding:         15px !default;