Upgrade Boostrap to v3.3.1

nicomollet · Dec 1, 2014 · 57fd259 · 57fd259
1 parent 6ca0e80
commit 57fd259
Show file tree

Hide file tree

Showing 17 changed files with 70 additions and 109 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 * EULA cookie consent
 * Analytics cookie consent
 
+### 0.1.8: December 1st, 2014
+* Upgrade Boostrap to v3.3.1
+
 ### 0.1.7: November 8th, 2014
 * Upgrade Boostrap to v3.3.0
 

diff --git a/functions.php b/functions.php
@@ -31,7 +31,7 @@
 		'respond' => '1.4.2',
 		'lessjs' => '1.6.2',
 		'selectivizr' => '1.0.2',
-		'bootstrap' => '3.3.0',
+		'bootstrap' => '3.3.1',
 		'bootstrap-select' => '1.6.2',
 		'jquery' => '1.11.1',
 		//'jquery-cycle' => '3.03',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "stormbinger",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "repository" : {
     "type" : "git",
     "url" : "http://github.com/nicomollet/stormbringer.git"

diff --git a/scss/bootstrap/_badges.scss b/scss/bootstrap/_badges.scss
@@ -36,11 +36,17 @@
   // [converter] extracted a& to a.badge
 
   // Account for badges in navs
-  a.list-group-item.active > &,
+  .list-group-item.active > &,
   .nav-pills > .active > a > & {
     color: $badge-active-color;
     background-color: $badge-active-bg;
   }
+  .list-group-item > & {
+    float: right;
+  }
+  .list-group-item > & + & {
+    margin-right: 5px;
+  }
   .nav-pills > li > a > & {
     margin-left: 3px;
   }

diff --git a/scss/bootstrap/_button-groups.scss b/scss/bootstrap/_button-groups.scss
@@ -18,10 +18,6 @@
     &.active {
       z-index: 2;
     }
-    &:focus {
-      // Remove focus outline when dropdown JS adds it after closing the menu
-      outline: 0;
-    }
   }
 }
 

diff --git a/scss/bootstrap/_forms.scss b/scss/bootstrap/_forms.scss
@@ -170,41 +170,28 @@ input[type="search"] {
 // Special styles for iOS temporal inputs
 //
 // In Mobile Safari, setting `display: block` on temporal inputs causes the
-// text within the input to become vertically misaligned.
-// As a workaround, we set a pixel line-height that matches the
-// given height of the input. Since this fucks up everything else, we have to
-// appropriately reset it for Internet Explorer and the size variations.
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
-  line-height: $input-height-base;
-  // IE8+ misaligns the text within date inputs, so we reset
-  line-height: $line-height-base #{\0};
-
-  &.input-sm {
+// text within the input to become vertically misaligned. As a workaround, we
+// set a pixel line-height that matches the given height of the input, but only
+// for Safari.
+
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  input[type="date"],
+  input[type="time"],
+  input[type="datetime-local"],
+  input[type="month"] {
+    line-height: $input-height-base;
+  }
+  input[type="date"].input-sm,
+  input[type="time"].input-sm,
+  input[type="datetime-local"].input-sm,
+  input[type="month"].input-sm {
     line-height: $input-height-small;
-    line-height: $line-height-small #{\0};
   }
-  &.input-lg {
+  input[type="date"].input-lg,
+  input[type="time"].input-lg,
+  input[type="datetime-local"].input-lg,
+  input[type="month"].input-lg {
     line-height: $input-height-large;
-    line-height: $line-height-large #{\0};
-  }
-}
-
-// IE 11 hack to reverse the iOS temporal input hack.
-_:-ms-fullscreen, :root input[type="date"],
-_:-ms-fullscreen, :root input[type="time"],
-_:-ms-fullscreen, :root input[type="datetime-local"],
-_:-ms-fullscreen, :root input[type="month"] {
-  line-height: $line-height-base;
-
-  &.input-sm {
-    line-height: $line-height-small;
-  }
-  &.input-lg {
-    line-height: $line-height-large;
   }
 }
 
@@ -325,9 +312,11 @@ input[type="checkbox"] {
 // Build on `.form-control` with modifier classes to decrease or increase the
 // height and font-size of form controls.
 
-@include input-size('.input-sm, .form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
+@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
+@include input-size('.form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
 
-@include input-size('.input-lg, .form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
+@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
+@include input-size('.form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
 
 
 // Form control feedback states

diff --git a/scss/bootstrap/_jumbotron.scss b/scss/bootstrap/_jumbotron.scss
@@ -35,7 +35,8 @@
   @media screen and (min-width: $screen-sm-min) {
     padding: ($jumbotron-padding * 1.6) 0;
 
-    .container & {
+    .container &,
+    .container-fluid & {
       padding-left:  ($jumbotron-padding * 2);
       padding-right: ($jumbotron-padding * 2);
     }

diff --git a/scss/bootstrap/_list-group.scss b/scss/bootstrap/_list-group.scss
@@ -35,14 +35,6 @@
     margin-bottom: 0;
     @include border-bottom-radius($list-group-border-radius);
   }
-
-  // Align badges within list items
-  > .badge {
-    float: right;
-  }
-  > .badge + .badge {
-    margin-right: 5px;
-  }
 }
 
 

diff --git a/scss/bootstrap/_modals.scss b/scss/bootstrap/_modals.scss
@@ -62,10 +62,9 @@
 
 // Modal background
 .modal-backdrop {
-  position: fixed;
+  position: absolute;
   top: 0;
   right: 0;
-  bottom: 0;
   left: 0;
   background-color: $modal-backdrop-bg;
   // Fade for backdrop

diff --git a/scss/bootstrap/_navbar.scss b/scss/bootstrap/_navbar.scss
@@ -331,6 +331,7 @@
 }
 // Menu position and menu caret support for dropups via extra dropup class
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  @include border-top-radius($navbar-border-radius);
   @include border-bottom-radius(0);
 }
 

diff --git a/scss/bootstrap/_popovers.scss b/scss/bootstrap/_popovers.scss
@@ -12,6 +12,7 @@
   max-width: $popover-max-width;
   padding: 1px;
   // Reset font and text propertes given new insertion method
+  font-family: $font-family-base;
   font-size: $font-size-base;
   font-weight: normal;
   line-height: $line-height-base;

diff --git a/scss/bootstrap/_responsive-utilities.scss b/scss/bootstrap/_responsive-utilities.scss
@@ -26,7 +26,10 @@
 // Visibility utilities
 // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
 
-@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
+@include responsive-invisibility('.visible-xs');
+@include responsive-invisibility('.visible-sm');
+@include responsive-invisibility('.visible-md');
+@include responsive-invisibility('.visible-lg');
 
 .visible-xs-block,
 .visible-xs-inline,

diff --git a/scss/bootstrap/_theme.scss b/scss/bootstrap/_theme.scss
@@ -151,6 +151,18 @@
   border-radius: 0;
 }
 
+// Fix active state of dropdown items in collapsed mode
+@media (max-width: $grid-float-breakpoint-max) {
+  .navbar .navbar-nav .open .dropdown-menu > .active > a {
+    &,
+    &:hover,
+    &:focus {
+      color: #fff;
+      @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
+    }
+  }
+}
+
 
 //
 // Alerts

diff --git a/scss/bootstrap/_tooltip.scss b/scss/bootstrap/_tooltip.scss
@@ -9,7 +9,10 @@
   z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
+  // Reset font and text propertes given new insertion method
+  font-family: $font-family-base;
   font-size: $font-size-small;
+  font-weight: normal;
   line-height: 1.4;
   @include opacity(0);
 
@@ -39,6 +42,7 @@
   border-color: transparent;
   border-style: solid;
 }
+// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
 .tooltip {
   &.top .tooltip-arrow {
     bottom: 0;
@@ -49,13 +53,15 @@
   }
   &.top-left .tooltip-arrow {
     bottom: 0;
-    left: $tooltip-arrow-width;
+    right: $tooltip-arrow-width;
+    margin-bottom: -$tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
   &.top-right .tooltip-arrow {
     bottom: 0;
-    right: $tooltip-arrow-width;
+    left: $tooltip-arrow-width;
+    margin-bottom: -$tooltip-arrow-width;
     border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
     border-top-color: $tooltip-arrow-color;
   }
@@ -82,13 +88,15 @@
   }
   &.bottom-left .tooltip-arrow {
     top: 0;
-    left: $tooltip-arrow-width;
+    right: $tooltip-arrow-width;
+    margin-top: -$tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }
   &.bottom-right .tooltip-arrow {
     top: 0;
-    right: $tooltip-arrow-width;
+    left: $tooltip-arrow-width;
+    margin-top: -$tooltip-arrow-width;
     border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
     border-bottom-color: $tooltip-arrow-color;
   }

diff --git a/scss/bootstrap/_variables.scss b/scss/bootstrap/_variables.scss
@@ -19,7 +19,7 @@ $gray:                   lighten($gray-base, 33.5%) !default; // #555
 $gray-light:             lighten($gray-base, 46.7%) !default; // #777
 $gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
 
-$brand-primary:         #428bca !default;
+$brand-primary:         darken(#428bca, 6.5%) !default;
 $brand-success:         #5cb85c !default;
 $brand-info:            #5bc0de !default;
 $brand-warning:         #f0ad4e !default;

diff --git a/scss/bootstrap/bootstrap.scss b/scss/bootstrap/bootstrap.scss
diff --git a/style.css b/style.css
@@ -3,7 +3,7 @@ Theme Name: Stormbringer
 Theme URI: http://www.nicolasmollet.com
 Github Theme URI: https://github.com/nicomollet/stormbringer
 Description: A simple responsive theme based on twitter's bootstrap framework. 
-Version: 0.1.7
+Version: 0.1.8
 Author: Nicolas Mollet
 Author URI: http://www.nicolasmollet.com
 Tags: twitter-bootstrap, cdnjs