rake convert

4 files changed, 37 insertions, 30 deletions

diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb
index ee3f8d68..2ec1960c 100644
--- a/lib/bootstrap-sass/version.rb
+++ b/lib/bootstrap-sass/version.rb
@@ -1,4 +1,4 @@
 module Bootstrap
   VERSION = '3.1.1.0'
-  BOOTSTRAP_SHA = '1d6187956f3a0ae0a3527da533b21608b9e18c3e'
+  BOOTSTRAP_SHA = '0907244256d923807c3a4e55f4ea606b9558d0ca'
 end
diff --git a/vendor/assets/javascripts/bootstrap/modal.js b/vendor/assets/javascripts/bootstrap/modal.js
index ec358696..a5536372 100644
--- a/vendor/assets/javascripts/bootstrap/modal.js
+++ b/vendor/assets/javascripts/bootstrap/modal.js
@@ -14,11 +14,12 @@
   // ======================
 
   var Modal = function (element, options) {
-    this.options   = options
-    this.$body     = $(document.body)
-    this.$element  = $(element)
-    this.$backdrop =
-    this.isShown   = null
+    this.options        = options
+    this.$body          = $(document.body)
+    this.$element       = $(element)
+    this.$backdrop      =
+    this.isShown        = null
+    this.scrollbarWidth = 0
 
     if (this.options.remote) {
       this.$element
@@ -49,6 +50,7 @@
 
     this.isShown = true
 
+    this.checkScrollbar()
     this.$body.addClass('modal-open')
 
     this.setScrollbar()
@@ -195,11 +197,14 @@
     }
   }
 
+  Modal.prototype.checkScrollbar = function () {
+    if (document.body.clientWidth >= window.innerWidth) return
+    this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
+  }
+
   Modal.prototype.setScrollbar =  function () {
-    if (document.body.clientHeight <= window.innerHeight) return
-    var scrollbarWidth = this.measureScrollbar()
-    var bodyPad        = parseInt(this.$body.css('padding-right') || 0)
-    if (scrollbarWidth) this.$body.css('padding-right', bodyPad + scrollbarWidth)
+    var bodyPad = parseInt(this.$body.css('padding-right') || 0)
+    if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
   }
 
   Modal.prototype.resetScrollbar = function () {
diff --git a/vendor/assets/stylesheets/bootstrap/_normalize.scss b/vendor/assets/stylesheets/bootstrap/_normalize.scss
index 024e257c..ce04b6a2 100644
--- a/vendor/assets/stylesheets/bootstrap/_normalize.scss
+++ b/vendor/assets/stylesheets/bootstrap/_normalize.scss
@@ -1,4 +1,4 @@
-/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
 
 //
 // 1. Set default font family to sans-serif.
@@ -24,7 +24,9 @@ body {
 // ==========================================================================
 
 //
-// Correct `block` display not defined in IE 8/9.
+// Correct `block` display not defined for any HTML5 element in IE 8/9.
+// Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
+// Correct `block` display not defined for `main` in IE 11.
 //
 
 article,
@@ -66,8 +68,8 @@ audio:not([controls]) {
 }
 
 //
-// Address `[hidden]` styling not present in IE 8/9.
-// Hide the `template` element in IE, Safari, and Firefox < 22.
+// Address `[hidden]` styling not present in IE 8/9/10.
+// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
 //
 
 [hidden],
@@ -99,7 +101,7 @@ a:hover {
 // ==========================================================================
 
 //
-// Address styling not present in IE 8/9, Safari 5, and Chrome.
+// Address styling not present in IE 8/9/10/11, Safari, and Chrome.
 //
 
 abbr[title] {
@@ -107,7 +109,7 @@ abbr[title] {
 }
 
 //
-// Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
+// Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
 //
 
 b,
@@ -116,7 +118,7 @@ strong {
 }
 
 //
-// Address styling not present in Safari 5 and Chrome.
+// Address styling not present in Safari and Chrome.
 //
 
 dfn {
@@ -125,7 +127,7 @@ dfn {
 
 //
 // Address variable `h1` font-size and margin within `section` and `article`
-// contexts in Firefox 4+, Safari 5, and Chrome.
+// contexts in Firefox 4+, Safari, and Chrome.
 //
 
 h1 {
@@ -174,7 +176,7 @@ sub {
 // ==========================================================================
 
 //
-// Remove border when inside `a` element in IE 8/9.
+// Remove border when inside `a` element in IE 8/9/10.
 //
 
 img {
@@ -182,7 +184,7 @@ img {
 }
 
 //
-// Correct overflow displayed oddly in IE 9.
+// Correct overflow not hidden in IE 9/10/11.
 //
 
 svg:not(:root) {
@@ -193,7 +195,7 @@ svg:not(:root) {
 // ==========================================================================
 
 //
-// Address margin not present in IE 8/9 and Safari 5.
+// Address margin not present in IE 8/9 and Safari.
 //
 
 figure {
@@ -242,7 +244,7 @@ samp {
 // 1. Correct color not being inherited.
 //    Known issue: affects color of disabled elements.
 // 2. Correct font properties not being inherited.
-// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
+// 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
 //
 
 button,
@@ -256,7 +258,7 @@ textarea {
 }
 
 //
-// Address `overflow` set to `hidden` in IE 8/9/10.
+// Address `overflow` set to `hidden` in IE 8/9/10/11.
 //
 
 button {
@@ -266,7 +268,7 @@ button {
 //
 // Address inconsistent `text-transform` inheritance for `button` and `select`.
 // All other form control elements do not inherit `text-transform` values.
-// Correct `button` style inheritance in Firefox, IE 8+, and Opera
+// Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
 // Correct `select` style inheritance in Firefox.
 //
 
@@ -345,8 +347,8 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 //
-// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
-// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
+// 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
 //    (include `-moz` to future-proof).
 //
 
@@ -379,7 +381,7 @@ fieldset {
 }
 
 //
-// 1. Correct `color` not being inherited in IE 8/9.
+// 1. Correct `color` not being inherited in IE 8/9/10/11.
 // 2. Remove padding so people aren't caught out if they zero out fieldsets.
 //
 
@@ -389,7 +391,7 @@ legend {
 }
 
 //
-// Remove default vertical scrollbar in IE 8/9.
+// Remove default vertical scrollbar in IE 8/9/10/11.
 //
 
 textarea {
@@ -420,4 +422,4 @@ table {
 td,
 th {
   padding: 0;
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/mixins/_forms.scss b/vendor/assets/stylesheets/bootstrap/mixins/_forms.scss
index 5826dfef..ff72f0ef 100644
--- a/vendor/assets/stylesheets/bootstrap/mixins/_forms.scss
+++ b/vendor/assets/stylesheets/bootstrap/mixins/_forms.scss
@@ -39,7 +39,7 @@
 // Form control focus state
 //
 // Generate a customized focus state and for any input with the specified color,
-// which defaults to the `$input-focus-border` variable.
+// which defaults to the `$input-border-focus` variable.
 //
 // We highly encourage you to not customize the default value, but instead use
 // this to tweak colors on an as-needed basis. This aesthetic change is based on