Skip to content

Commit 0c62357

Browse files
committed
Update Bootstrap Sass to 3.3.0
1 parent 47d8f83 commit 0c62357

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+435
-358
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
### HEAD
22
* WooCommerce compatibility
33

4+
5+
### 0.1.7: November 8th, 2014
6+
* Upgrade Boostrap to v3.3.0
7+
48
### 0.1.6: September 24nd, 2014
59
* Refactoring of localization
610
* Added french (fr_FR) localization

functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'respond' => '1.4.2',
3131
'lessjs' => '1.6.2',
3232
'selectivizr' => '1.0.2',
33-
'bootstrap' => '3.2.0',
33+
'bootstrap' => '3.3.0',
3434
'bootstrap-select' => '1.6.2',
3535
'jquery' => '1.11.1',
3636
//'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.6",
3+
"version": "0.1.7",
44
"repository" : {
55
"type" : "git",
66
"url" : "http://github.com/nicomollet/stormbringer.git"

scss/bootstrap/_button-groups.scss

+18-11
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
// Optional: Group multiple button groups together for a toolbar
3939
.btn-toolbar {
4040
margin-left: -5px; // Offset the first child's margin
41-
@include clearfix();
41+
@include clearfix;
4242

4343
.btn-group,
4444
.input-group {
@@ -156,7 +156,7 @@
156156

157157
// Clear floats so dropdown menus can be properly placed
158158
> .btn-group {
159-
@include clearfix();
159+
@include clearfix;
160160
> .btn {
161161
float: none;
162162
}
@@ -198,7 +198,6 @@
198198
}
199199

200200

201-
202201
// Justified button groups
203202
// ----------------------
204203

@@ -226,15 +225,23 @@
226225
// Checkbox and radio options
227226
//
228227
// In order to support the browser's form validation feedback, powered by the
229-
// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
230-
// use `display: none;` or `visibility: hidden;` as that also hides the popover.
228+
// `required` attribute, we have to "hide" the inputs via `clip`. We cannot use
229+
// `display: none;` or `visibility: hidden;` as that also hides the popover.
230+
// Simply visually hiding the inputs via `opacity` would leave them clickable in
231+
// certain cases which is prevented by using `clip` and `pointer-events`.
231232
// This way, we ensure a DOM element is visible to position the popover from.
232233
//
233-
// See https://github.com/twbs/bootstrap/pull/12794 for more.
234+
// See https://github.com/twbs/bootstrap/pull/12794 and
235+
// https://github.com/twbs/bootstrap/pull/14559 for more information.
234236

235-
[data-toggle="buttons"] > .btn > input[type="radio"],
236-
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
237-
position: absolute;
238-
z-index: -1;
239-
@include opacity(0);
237+
[data-toggle="buttons"] {
238+
> .btn,
239+
> .btn-group > .btn {
240+
input[type="radio"],
241+
input[type="checkbox"] {
242+
position: absolute;
243+
clip: rect(0,0,0,0);
244+
pointer-events: none;
245+
}
246+
}
240247
}

scss/bootstrap/_buttons.scss

+8-5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
font-weight: $btn-font-weight;
1313
text-align: center;
1414
vertical-align: middle;
15+
touch-action: manipulation;
1516
cursor: pointer;
1617
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
1718
border: 1px solid transparent;
@@ -22,13 +23,15 @@
2223
&,
2324
&:active,
2425
&.active {
25-
&:focus {
26-
@include tab-focus();
26+
&:focus,
27+
&.focus {
28+
@include tab-focus;
2729
}
2830
}
2931

3032
&:hover,
31-
&:focus {
33+
&:focus,
34+
&.focus {
3235
color: $btn-default-color;
3336
text-decoration: none;
3437
}
@@ -43,7 +46,7 @@
4346
&.disabled,
4447
&[disabled],
4548
fieldset[disabled] & {
46-
cursor: not-allowed;
49+
cursor: $cursor-disabled;
4750
pointer-events: none; // Future-proof disabling of clicks
4851
@include opacity(.65);
4952
@include box-shadow(none);
@@ -85,11 +88,11 @@
8588
.btn-link {
8689
color: $link-color;
8790
font-weight: normal;
88-
cursor: pointer;
8991
border-radius: 0;
9092

9193
&,
9294
&:active,
95+
&.active,
9396
&[disabled],
9497
fieldset[disabled] & {
9598
background-color: transparent;

scss/bootstrap/_carousel.scss

+25-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,33 @@
2121
// Account for jankitude on images
2222
> img,
2323
> a > img {
24-
@include img-responsive();
24+
@include img-responsive;
2525
line-height: 1;
2626
}
27+
28+
// WebKit CSS3 transforms for supported devices
29+
@media all and (transform-3d), (-webkit-transform-3d) {
30+
transition: transform .6s ease-in-out;
31+
backface-visibility: hidden;
32+
perspective: 1000;
33+
34+
&.next,
35+
&.active.right {
36+
transform: translate3d(100%, 0, 0);
37+
left: 0;
38+
}
39+
&.prev,
40+
&.active.left {
41+
transform: translate3d(-100%, 0, 0);
42+
left: 0;
43+
}
44+
&.next.left,
45+
&.prev.right,
46+
&.active {
47+
transform: translate3d(0, 0, 0);
48+
left: 0;
49+
}
50+
}
2751
}
2852

2953
> .active,

scss/bootstrap/_code.scss

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ kbd {
3232
kbd {
3333
padding: 0;
3434
font-size: 100%;
35+
font-weight: bold;
3536
box-shadow: none;
3637
}
3738
}

scss/bootstrap/_component-animations.scss

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
.collapse {
1919
display: none;
20+
visibility: hidden;
2021

21-
&.in { display: block; }
22+
&.in { display: block; visibility: visible; }
2223
// [converter] extracted tr&.in to tr.collapse.in
2324
// [converter] extracted tbody&.in to tbody.collapse.in
2425
}
@@ -31,5 +32,7 @@ tbody.collapse.in { display: table-row-group; }
3132
position: relative;
3233
height: 0;
3334
overflow: hidden;
34-
@include transition(height .35s ease);
35+
@include transition-property(height, visibility);
36+
@include transition-duration(.35s);
37+
@include transition-timing-function(ease);
3538
}

scss/bootstrap/_dropdowns.scss

+4-6
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,15 @@
103103
&:focus {
104104
color: $dropdown-link-disabled-color;
105105
}
106-
}
107-
// Nuke hover/focus effects
108-
.dropdown-menu > .disabled > a {
106+
107+
// Nuke hover/focus effects
109108
&:hover,
110109
&:focus {
111110
text-decoration: none;
112111
background-color: transparent;
113112
background-image: none; // Remove CSS gradient
114-
@include reset-filter();
115-
cursor: not-allowed;
113+
@include reset-filter;
114+
cursor: $cursor-disabled;
116115
}
117116
}
118117

@@ -212,4 +211,3 @@
212211
}
213212
}
214213
}
215-

0 commit comments

Comments
 (0)