Skip to content

Commit 57fd259

Browse files
committed
Upgrade Boostrap to v3.3.1
1 parent 6ca0e80 commit 57fd259

17 files changed

+70
-109
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* EULA cookie consent
44
* Analytics cookie consent
55

6+
### 0.1.8: December 1st, 2014
7+
* Upgrade Boostrap to v3.3.1
8+
69
### 0.1.7: November 8th, 2014
710
* Upgrade Boostrap to v3.3.0
811

functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
'respond' => '1.4.2',
3232
'lessjs' => '1.6.2',
3333
'selectivizr' => '1.0.2',
34-
'bootstrap' => '3.3.0',
34+
'bootstrap' => '3.3.1',
3535
'bootstrap-select' => '1.6.2',
3636
'jquery' => '1.11.1',
3737
//'jquery-cycle' => '3.03',

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "stormbinger",
3-
"version": "0.1.7",
3+
"version": "0.1.8",
44
"repository" : {
55
"type" : "git",
66
"url" : "http://github.com/nicomollet/stormbringer.git"

scss/bootstrap/_badges.scss

+7-1
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,17 @@
3636
// [converter] extracted a& to a.badge
3737

3838
// Account for badges in navs
39-
a.list-group-item.active > &,
39+
.list-group-item.active > &,
4040
.nav-pills > .active > a > & {
4141
color: $badge-active-color;
4242
background-color: $badge-active-bg;
4343
}
44+
.list-group-item > & {
45+
float: right;
46+
}
47+
.list-group-item > & + & {
48+
margin-right: 5px;
49+
}
4450
.nav-pills > li > a > & {
4551
margin-left: 3px;
4652
}

scss/bootstrap/_button-groups.scss

-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
&.active {
1919
z-index: 2;
2020
}
21-
&:focus {
22-
// Remove focus outline when dropdown JS adds it after closing the menu
23-
outline: 0;
24-
}
2521
}
2622
}
2723

scss/bootstrap/_forms.scss

+23-34
Original file line numberDiff line numberDiff line change
@@ -170,41 +170,28 @@ input[type="search"] {
170170
// Special styles for iOS temporal inputs
171171
//
172172
// In Mobile Safari, setting `display: block` on temporal inputs causes the
173-
// text within the input to become vertically misaligned.
174-
// As a workaround, we set a pixel line-height that matches the
175-
// given height of the input. Since this fucks up everything else, we have to
176-
// appropriately reset it for Internet Explorer and the size variations.
177-
178-
input[type="date"],
179-
input[type="time"],
180-
input[type="datetime-local"],
181-
input[type="month"] {
182-
line-height: $input-height-base;
183-
// IE8+ misaligns the text within date inputs, so we reset
184-
line-height: $line-height-base #{\0};
185-
186-
&.input-sm {
173+
// text within the input to become vertically misaligned. As a workaround, we
174+
// set a pixel line-height that matches the given height of the input, but only
175+
// for Safari.
176+
177+
@media screen and (-webkit-min-device-pixel-ratio: 0) {
178+
input[type="date"],
179+
input[type="time"],
180+
input[type="datetime-local"],
181+
input[type="month"] {
182+
line-height: $input-height-base;
183+
}
184+
input[type="date"].input-sm,
185+
input[type="time"].input-sm,
186+
input[type="datetime-local"].input-sm,
187+
input[type="month"].input-sm {
187188
line-height: $input-height-small;
188-
line-height: $line-height-small #{\0};
189189
}
190-
&.input-lg {
190+
input[type="date"].input-lg,
191+
input[type="time"].input-lg,
192+
input[type="datetime-local"].input-lg,
193+
input[type="month"].input-lg {
191194
line-height: $input-height-large;
192-
line-height: $line-height-large #{\0};
193-
}
194-
}
195-
196-
// IE 11 hack to reverse the iOS temporal input hack.
197-
_:-ms-fullscreen, :root input[type="date"],
198-
_:-ms-fullscreen, :root input[type="time"],
199-
_:-ms-fullscreen, :root input[type="datetime-local"],
200-
_:-ms-fullscreen, :root input[type="month"] {
201-
line-height: $line-height-base;
202-
203-
&.input-sm {
204-
line-height: $line-height-small;
205-
}
206-
&.input-lg {
207-
line-height: $line-height-large;
208195
}
209196
}
210197

@@ -325,9 +312,11 @@ input[type="checkbox"] {
325312
// Build on `.form-control` with modifier classes to decrease or increase the
326313
// height and font-size of form controls.
327314

328-
@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);
315+
@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
316+
@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);
329317

330-
@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);
318+
@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
319+
@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);
331320

332321

333322
// Form control feedback states

scss/bootstrap/_jumbotron.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
@media screen and (min-width: $screen-sm-min) {
3636
padding: ($jumbotron-padding * 1.6) 0;
3737

38-
.container & {
38+
.container &,
39+
.container-fluid & {
3940
padding-left: ($jumbotron-padding * 2);
4041
padding-right: ($jumbotron-padding * 2);
4142
}

scss/bootstrap/_list-group.scss

-8
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,6 @@
3535
margin-bottom: 0;
3636
@include border-bottom-radius($list-group-border-radius);
3737
}
38-
39-
// Align badges within list items
40-
> .badge {
41-
float: right;
42-
}
43-
> .badge + .badge {
44-
margin-right: 5px;
45-
}
4638
}
4739

4840

scss/bootstrap/_modals.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@
6262

6363
// Modal background
6464
.modal-backdrop {
65-
position: fixed;
65+
position: absolute;
6666
top: 0;
6767
right: 0;
68-
bottom: 0;
6968
left: 0;
7069
background-color: $modal-backdrop-bg;
7170
// Fade for backdrop

scss/bootstrap/_navbar.scss

+1
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@
331331
}
332332
// Menu position and menu caret support for dropups via extra dropup class
333333
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
334+
@include border-top-radius($navbar-border-radius);
334335
@include border-bottom-radius(0);
335336
}
336337

scss/bootstrap/_popovers.scss

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
max-width: $popover-max-width;
1313
padding: 1px;
1414
// Reset font and text propertes given new insertion method
15+
font-family: $font-family-base;
1516
font-size: $font-size-base;
1617
font-weight: normal;
1718
line-height: $line-height-base;

scss/bootstrap/_responsive-utilities.scss

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
// Visibility utilities
2727
// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
2828

29-
@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
29+
@include responsive-invisibility('.visible-xs');
30+
@include responsive-invisibility('.visible-sm');
31+
@include responsive-invisibility('.visible-md');
32+
@include responsive-invisibility('.visible-lg');
3033

3134
.visible-xs-block,
3235
.visible-xs-inline,

scss/bootstrap/_theme.scss

+12
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,18 @@
151151
border-radius: 0;
152152
}
153153

154+
// Fix active state of dropdown items in collapsed mode
155+
@media (max-width: $grid-float-breakpoint-max) {
156+
.navbar .navbar-nav .open .dropdown-menu > .active > a {
157+
&,
158+
&:hover,
159+
&:focus {
160+
color: #fff;
161+
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
162+
}
163+
}
164+
}
165+
154166

155167
//
156168
// Alerts

scss/bootstrap/_tooltip.scss

+12-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
z-index: $zindex-tooltip;
1010
display: block;
1111
visibility: visible;
12+
// Reset font and text propertes given new insertion method
13+
font-family: $font-family-base;
1214
font-size: $font-size-small;
15+
font-weight: normal;
1316
line-height: 1.4;
1417
@include opacity(0);
1518

@@ -39,6 +42,7 @@
3942
border-color: transparent;
4043
border-style: solid;
4144
}
45+
// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
4246
.tooltip {
4347
&.top .tooltip-arrow {
4448
bottom: 0;
@@ -49,13 +53,15 @@
4953
}
5054
&.top-left .tooltip-arrow {
5155
bottom: 0;
52-
left: $tooltip-arrow-width;
56+
right: $tooltip-arrow-width;
57+
margin-bottom: -$tooltip-arrow-width;
5358
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
5459
border-top-color: $tooltip-arrow-color;
5560
}
5661
&.top-right .tooltip-arrow {
5762
bottom: 0;
58-
right: $tooltip-arrow-width;
63+
left: $tooltip-arrow-width;
64+
margin-bottom: -$tooltip-arrow-width;
5965
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
6066
border-top-color: $tooltip-arrow-color;
6167
}
@@ -82,13 +88,15 @@
8288
}
8389
&.bottom-left .tooltip-arrow {
8490
top: 0;
85-
left: $tooltip-arrow-width;
91+
right: $tooltip-arrow-width;
92+
margin-top: -$tooltip-arrow-width;
8693
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
8794
border-bottom-color: $tooltip-arrow-color;
8895
}
8996
&.bottom-right .tooltip-arrow {
9097
top: 0;
91-
right: $tooltip-arrow-width;
98+
left: $tooltip-arrow-width;
99+
margin-top: -$tooltip-arrow-width;
92100
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
93101
border-bottom-color: $tooltip-arrow-color;
94102
}

scss/bootstrap/_variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555
1919
$gray-light: lighten($gray-base, 46.7%) !default; // #777
2020
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
2121

22-
$brand-primary: #428bca !default;
22+
$brand-primary: darken(#428bca, 6.5%) !default;
2323
$brand-success: #5cb85c !default;
2424
$brand-info: #5bc0de !default;
2525
$brand-warning: #f0ad4e !default;

scss/bootstrap/bootstrap.scss

-50
This file was deleted.

style.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Theme Name: Stormbringer
33
Theme URI: http://www.nicolasmollet.com
44
Github Theme URI: https://github.com/nicomollet/stormbringer
55
Description: A simple responsive theme based on twitter's bootstrap framework.
6-
Version: 0.1.7
6+
Version: 0.1.8
77
Author: Nicolas Mollet
88
Author URI: http://www.nicolasmollet.com
99
Tags: twitter-bootstrap, cdnjs

0 commit comments

Comments
 (0)