bootstrap-sass 3.3.1.0 → 3.3.6
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bootstrap-sass might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.travis.yml +8 -8
- data/CHANGELOG.md +44 -0
- data/CONTRIBUTING.md +8 -1
- data/Gemfile +1 -1
- data/LICENSE +1 -1
- data/README.md +69 -49
- data/Rakefile +46 -4
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +273 -214
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
- data/assets/javascripts/bootstrap/affix.js +7 -7
- data/assets/javascripts/bootstrap/alert.js +3 -3
- data/assets/javascripts/bootstrap/button.js +14 -10
- data/assets/javascripts/bootstrap/carousel.js +11 -14
- data/assets/javascripts/bootstrap/collapse.js +9 -9
- data/assets/javascripts/bootstrap/dropdown.js +49 -45
- data/assets/javascripts/bootstrap/modal.js +45 -32
- data/assets/javascripts/bootstrap/popover.js +9 -20
- data/assets/javascripts/bootstrap/scrollspy.js +18 -21
- data/assets/javascripts/bootstrap/tab.js +7 -5
- data/assets/javascripts/bootstrap/tooltip.js +82 -46
- data/assets/javascripts/bootstrap/transition.js +2 -2
- data/assets/javascripts/bootstrap-sprockets.js +2 -2
- data/assets/javascripts/bootstrap.js +1210 -1151
- data/assets/javascripts/bootstrap.min.js +7 -0
- data/assets/stylesheets/_bootstrap-compass.scss +2 -0
- data/assets/stylesheets/_bootstrap-mincer.scss +4 -2
- data/assets/stylesheets/_bootstrap-sprockets.scss +2 -0
- data/assets/stylesheets/_bootstrap.scss +6 -0
- data/assets/stylesheets/bootstrap/_alerts.scss +5 -0
- data/assets/stylesheets/bootstrap/_badges.scss +7 -2
- data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
- data/assets/stylesheets/bootstrap/_button-groups.scss +5 -4
- data/assets/stylesheets/bootstrap/_buttons.scss +14 -6
- data/assets/stylesheets/bootstrap/_carousel.scss +16 -13
- data/assets/stylesheets/bootstrap/_close.scss +1 -0
- data/assets/stylesheets/bootstrap/_component-animations.scss +1 -2
- data/assets/stylesheets/bootstrap/_dropdowns.scss +6 -3
- data/assets/stylesheets/bootstrap/_forms.scss +98 -29
- data/assets/stylesheets/bootstrap/_glyphicons.scss +83 -10
- data/assets/stylesheets/bootstrap/_input-groups.scss +8 -3
- data/assets/stylesheets/bootstrap/_jumbotron.scss +8 -3
- data/assets/stylesheets/bootstrap/_list-group.scss +9 -3
- data/assets/stylesheets/bootstrap/_media.scss +19 -0
- data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
- data/assets/stylesheets/bootstrap/_modals.scss +4 -2
- data/assets/stylesheets/bootstrap/_navbar.scss +1 -1
- data/assets/stylesheets/bootstrap/_navs.scss +0 -2
- data/assets/stylesheets/bootstrap/_normalize.scss +8 -11
- data/assets/stylesheets/bootstrap/_pagination.scss +4 -3
- data/assets/stylesheets/bootstrap/_panels.scss +11 -1
- data/assets/stylesheets/bootstrap/_popovers.scss +4 -8
- data/assets/stylesheets/bootstrap/_print.scss +0 -6
- data/assets/stylesheets/bootstrap/_responsive-embed.scss +8 -8
- data/assets/stylesheets/bootstrap/_responsive-utilities.scss +8 -3
- data/assets/stylesheets/bootstrap/_scaffolding.scss +11 -0
- data/assets/stylesheets/bootstrap/_tables.scss +3 -3
- data/assets/stylesheets/bootstrap/_theme.scss +26 -7
- data/assets/stylesheets/bootstrap/_tooltip.scss +4 -6
- data/assets/stylesheets/bootstrap/_type.scss +2 -2
- data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
- data/assets/stylesheets/bootstrap/_variables.scss +20 -10
- data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_buttons.scss +19 -6
- data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +3 -3
- data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
- data/assets/stylesheets/bootstrap/mixins/_opacity.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
- data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +3 -3
- data/bootstrap-sass.gemspec +9 -9
- data/bower.json +5 -19
- data/composer.json +1 -1
- data/lib/bootstrap-sass/engine.rb +6 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/lib/bootstrap-sass.rb +27 -5
- data/package.json +6 -6
- data/sache.json +1 -1
- data/tasks/bower.rake +2 -5
- data/tasks/converter/fonts_conversion.rb +1 -1
- data/tasks/converter/js_conversion.rb +7 -5
- data/tasks/converter/less_conversion.rb +41 -29
- data/tasks/converter/network.rb +10 -5
- data/tasks/converter.rb +1 -1
- data/templates/project/_bootstrap-variables.sass +20 -11
- data/templates/project/styles.sass +3 -0
- data/test/dummy_rails/app/assets/stylesheets/{application.css.sass → application.sass} +0 -0
- data/test/dummy_rails/app/views/pages/root.html.slim +43 -0
- data/test/dummy_rails/config/application.rb +1 -1
- data/test/dummy_rails/config/environments/development.rb +0 -3
- data/test/dummy_rails/config/environments/production.rb +7 -1
- data/test/dummy_rails/config/environments/test.rb +9 -1
- data/test/dummy_sass_only/Gemfile +1 -1
- data/test/gemfiles/rails_head.gemfile +17 -0
- data/test/node_mincer_test.rb +2 -3
- data/test/node_sass_compile_test.sh +2 -2
- data/test/sprockets_rails_test.rb +1 -1
- data/test/support/reporting.rb +10 -0
- data/test/test_helper.rb +1 -1
- metadata +36 -34
- data/test/dummy_rails/log/development.log +0 -0
- data/test/gemfiles/sass_3_2.gemfile +0 -6
@@ -11,12 +11,11 @@
|
|
11
11
|
display: none;
|
12
12
|
max-width: $popover-max-width;
|
13
13
|
padding: 1px;
|
14
|
-
//
|
15
|
-
font
|
14
|
+
// Our parent element can be arbitrary since popovers are by default inserted as a sibling of their target element.
|
15
|
+
// So reset our font and text properties to avoid inheriting weird values.
|
16
|
+
@include reset-text;
|
16
17
|
font-size: $font-size-base;
|
17
|
-
|
18
|
-
line-height: $line-height-base;
|
19
|
-
text-align: left;
|
18
|
+
|
20
19
|
background-color: $popover-bg;
|
21
20
|
background-clip: padding-box;
|
22
21
|
border: 1px solid $popover-fallback-border-color;
|
@@ -24,9 +23,6 @@
|
|
24
23
|
border-radius: $border-radius-large;
|
25
24
|
@include box-shadow(0 5px 10px rgba(0,0,0,.2));
|
26
25
|
|
27
|
-
// Overrides for proper insertion
|
28
|
-
white-space: normal;
|
29
|
-
|
30
26
|
// Offset the popover to account for the popover arrow
|
31
27
|
&.top { margin-top: -$popover-arrow-width; }
|
32
28
|
&.right { margin-left: $popover-arrow-width; }
|
@@ -67,12 +67,6 @@
|
|
67
67
|
}
|
68
68
|
|
69
69
|
// Bootstrap specific changes start
|
70
|
-
//
|
71
|
-
// Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
|
72
|
-
// Once fixed, we can just straight up remove this.
|
73
|
-
select {
|
74
|
-
background: #fff !important;
|
75
|
-
}
|
76
70
|
|
77
71
|
// Bootstrap components
|
78
72
|
.navbar {
|
@@ -22,14 +22,14 @@
|
|
22
22
|
width: 100%;
|
23
23
|
border: 0;
|
24
24
|
}
|
25
|
+
}
|
25
26
|
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
27
|
+
// Modifier class for 16:9 aspect ratio
|
28
|
+
.embed-responsive-16by9 {
|
29
|
+
padding-bottom: 56.25%;
|
30
|
+
}
|
30
31
|
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
}
|
32
|
+
// Modifier class for 4:3 aspect ratio
|
33
|
+
.embed-responsive-4by3 {
|
34
|
+
padding-bottom: 75%;
|
35
35
|
}
|
@@ -18,15 +18,20 @@
|
|
18
18
|
// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
|
19
19
|
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
|
20
20
|
|
21
|
-
|
22
|
-
|
21
|
+
@at-root {
|
22
|
+
@-ms-viewport {
|
23
|
+
width: device-width;
|
24
|
+
}
|
23
25
|
}
|
24
26
|
|
25
27
|
|
26
28
|
// Visibility utilities
|
27
29
|
// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
|
28
30
|
|
29
|
-
@include responsive-invisibility('.visible-xs
|
31
|
+
@include responsive-invisibility('.visible-xs');
|
32
|
+
@include responsive-invisibility('.visible-sm');
|
33
|
+
@include responsive-invisibility('.visible-md');
|
34
|
+
@include responsive-invisibility('.visible-lg');
|
30
35
|
|
31
36
|
.visible-xs-block,
|
32
37
|
.visible-xs-inline,
|
@@ -148,3 +148,14 @@ hr {
|
|
148
148
|
clip: auto;
|
149
149
|
}
|
150
150
|
}
|
151
|
+
|
152
|
+
|
153
|
+
// iOS "clickable elements" fix for role="button"
|
154
|
+
//
|
155
|
+
// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
|
156
|
+
// for traditionally non-focusable elements with role="button"
|
157
|
+
// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
|
158
|
+
|
159
|
+
[role="button"] {
|
160
|
+
cursor: pointer;
|
161
|
+
}
|
@@ -111,7 +111,7 @@ th {
|
|
111
111
|
// Default zebra-stripe styles (alternating gray and transparent backgrounds)
|
112
112
|
|
113
113
|
.table-striped {
|
114
|
-
> tbody > tr:nth-
|
114
|
+
> tbody > tr:nth-of-type(odd) {
|
115
115
|
background-color: $table-bg-accent;
|
116
116
|
}
|
117
117
|
}
|
@@ -133,7 +133,7 @@ th {
|
|
133
133
|
// Reset default table behavior
|
134
134
|
|
135
135
|
table col[class*="col-"] {
|
136
|
-
position: static; // Prevent border hiding in Firefox and IE9
|
136
|
+
position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
|
137
137
|
float: none;
|
138
138
|
display: table-column;
|
139
139
|
}
|
@@ -141,7 +141,7 @@ table {
|
|
141
141
|
td,
|
142
142
|
th {
|
143
143
|
&[class*="col-"] {
|
144
|
-
position: static; // Prevent border hiding in Firefox and IE9
|
144
|
+
position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
|
145
145
|
float: none;
|
146
146
|
display: table-cell;
|
147
147
|
}
|
@@ -1,3 +1,8 @@
|
|
1
|
+
/*!
|
2
|
+
* Bootstrap v3.3.6 (http://getbootstrap.com)
|
3
|
+
* Copyright 2011-2015 Twitter, Inc.
|
4
|
+
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
|
5
|
+
*/
|
1
6
|
|
2
7
|
//
|
3
8
|
// Load core variables and mixins
|
@@ -28,6 +33,12 @@
|
|
28
33
|
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
|
29
34
|
}
|
30
35
|
|
36
|
+
&.disabled,
|
37
|
+
&[disabled],
|
38
|
+
fieldset[disabled] & {
|
39
|
+
@include box-shadow(none);
|
40
|
+
}
|
41
|
+
|
31
42
|
.badge {
|
32
43
|
text-shadow: none;
|
33
44
|
}
|
@@ -36,7 +47,7 @@
|
|
36
47
|
// Mixin for generating new styles
|
37
48
|
@mixin btn-styles($btn-color: #555) {
|
38
49
|
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
|
39
|
-
@include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
|
50
|
+
@include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
|
40
51
|
background-repeat: repeat-x;
|
41
52
|
border-color: darken($btn-color, 14%);
|
42
53
|
|
@@ -52,10 +63,18 @@
|
|
52
63
|
border-color: darken($btn-color, 14%);
|
53
64
|
}
|
54
65
|
|
55
|
-
|
56
|
-
&[disabled]
|
57
|
-
|
58
|
-
|
66
|
+
&.disabled,
|
67
|
+
&[disabled],
|
68
|
+
fieldset[disabled] & {
|
69
|
+
&,
|
70
|
+
&:hover,
|
71
|
+
&:focus,
|
72
|
+
&.focus,
|
73
|
+
&:active,
|
74
|
+
&.active {
|
75
|
+
background-color: darken($btn-color, 12%);
|
76
|
+
background-image: none;
|
77
|
+
}
|
59
78
|
}
|
60
79
|
}
|
61
80
|
|
@@ -130,8 +149,8 @@
|
|
130
149
|
// Inverted navbar
|
131
150
|
.navbar-inverse {
|
132
151
|
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
|
133
|
-
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
134
|
-
|
152
|
+
@include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
|
153
|
+
border-radius: $navbar-border-radius;
|
135
154
|
.navbar-nav > .open > a,
|
136
155
|
.navbar-nav > .active > a {
|
137
156
|
@include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
|
@@ -8,12 +8,11 @@
|
|
8
8
|
position: absolute;
|
9
9
|
z-index: $zindex-tooltip;
|
10
10
|
display: block;
|
11
|
-
|
12
|
-
//
|
13
|
-
|
11
|
+
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
|
12
|
+
// So reset our font and text properties to avoid inheriting weird values.
|
13
|
+
@include reset-text;
|
14
14
|
font-size: $font-size-small;
|
15
|
-
|
16
|
-
line-height: 1.4;
|
15
|
+
|
17
16
|
@include opacity(0);
|
18
17
|
|
19
18
|
&.in { @include opacity($tooltip-opacity); }
|
@@ -29,7 +28,6 @@
|
|
29
28
|
padding: 3px 8px;
|
30
29
|
color: $tooltip-color;
|
31
30
|
text-align: center;
|
32
|
-
text-decoration: none;
|
33
31
|
background-color: $tooltip-bg;
|
34
32
|
border-radius: $border-radius-base;
|
35
33
|
}
|
@@ -207,7 +207,7 @@ dd {
|
|
207
207
|
@include clearfix; // Clear the floated `dt` if an empty `dd` is present
|
208
208
|
}
|
209
209
|
|
210
|
-
@media (min-width: $
|
210
|
+
@media (min-width: $dl-horizontal-breakpoint) {
|
211
211
|
dt {
|
212
212
|
float: left;
|
213
213
|
width: ($dl-horizontal-offset - 20);
|
@@ -234,7 +234,7 @@ abbr[data-original-title] {
|
|
234
234
|
}
|
235
235
|
.initialism {
|
236
236
|
font-size: 90%;
|
237
|
-
text-
|
237
|
+
@extend .text-uppercase;
|
238
238
|
}
|
239
239
|
|
240
240
|
// Blockquotes
|
@@ -1,8 +1,4 @@
|
|
1
|
-
|
2
|
-
// When there no function is defined, `fn('')` is parsed as string that equals the right hand side
|
3
|
-
// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
|
4
|
-
$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
|
5
|
-
|
1
|
+
$bootstrap-sass-asset-helper: false !default;
|
6
2
|
//
|
7
3
|
// Variables
|
8
4
|
// --------------------------------------------------
|
@@ -19,7 +15,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555
|
|
19
15
|
$gray-light: lighten($gray-base, 46.7%) !default; // #777
|
20
16
|
$gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
|
21
17
|
|
22
|
-
$brand-primary: darken(#428bca, 6.5%) !default;
|
18
|
+
$brand-primary: darken(#428bca, 6.5%) !default; // #337ab7
|
23
19
|
$brand-success: #5cb85c !default;
|
24
20
|
$brand-info: #5bc0de !default;
|
25
21
|
$brand-warning: #f0ad4e !default;
|
@@ -82,7 +78,8 @@ $headings-color: inherit !default;
|
|
82
78
|
|
83
79
|
//** Load fonts from this directory.
|
84
80
|
|
85
|
-
// [converter]
|
81
|
+
// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
|
82
|
+
// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
|
86
83
|
$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
|
87
84
|
|
88
85
|
//** File name for all font files.
|
@@ -107,7 +104,7 @@ $padding-small-horizontal: 10px !default;
|
|
107
104
|
$padding-xs-vertical: 1px !default;
|
108
105
|
$padding-xs-horizontal: 5px !default;
|
109
106
|
|
110
|
-
$line-height-large: 1.
|
107
|
+
$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
|
111
108
|
$line-height-small: 1.5 !default;
|
112
109
|
|
113
110
|
$border-radius-base: 4px !default;
|
@@ -178,6 +175,11 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
|
|
178
175
|
|
179
176
|
$btn-link-disabled-color: $gray-light !default;
|
180
177
|
|
178
|
+
// Allows for customizing button radius independently from global border radius
|
179
|
+
$btn-border-radius-base: $border-radius-base !default;
|
180
|
+
$btn-border-radius-large: $border-radius-large !default;
|
181
|
+
$btn-border-radius-small: $border-radius-small !default;
|
182
|
+
|
181
183
|
|
182
184
|
//== Forms
|
183
185
|
//
|
@@ -195,6 +197,7 @@ $input-border: #ccc !default;
|
|
195
197
|
|
196
198
|
// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
|
197
199
|
//** Default `.form-control` border radius
|
200
|
+
// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
|
198
201
|
$input-border-radius: $border-radius-base !default;
|
199
202
|
//** Large `.form-control` border radius
|
200
203
|
$input-border-radius-large: $border-radius-large !default;
|
@@ -214,6 +217,9 @@ $input-height-large: (ceil($font-size-large * $line-height-large) +
|
|
214
217
|
//** Small `.form-control` height
|
215
218
|
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
|
216
219
|
|
220
|
+
//** `.form-group` margin
|
221
|
+
$form-group-margin-bottom: 15px !default;
|
222
|
+
|
217
223
|
$legend-color: $gray-dark !default;
|
218
224
|
$legend-border-color: #e5e5e5 !default;
|
219
225
|
|
@@ -273,7 +279,8 @@ $zindex-dropdown: 1000 !default;
|
|
273
279
|
$zindex-popover: 1060 !default;
|
274
280
|
$zindex-tooltip: 1070 !default;
|
275
281
|
$zindex-navbar-fixed: 1030 !default;
|
276
|
-
$zindex-modal:
|
282
|
+
$zindex-modal-background: 1040 !default;
|
283
|
+
$zindex-modal: 1050 !default;
|
277
284
|
|
278
285
|
|
279
286
|
//== Media queries breakpoints
|
@@ -386,7 +393,7 @@ $navbar-default-toggle-icon-bar-bg: #888 !default;
|
|
386
393
|
$navbar-default-toggle-border-color: #ddd !default;
|
387
394
|
|
388
395
|
|
389
|
-
|
396
|
+
//=== Inverted navbar
|
390
397
|
// Reset inverted navbar basics
|
391
398
|
$navbar-inverse-color: lighten($gray-light, 15%) !default;
|
392
399
|
$navbar-inverse-bg: #222 !default;
|
@@ -487,6 +494,7 @@ $jumbotron-color: inherit !default;
|
|
487
494
|
$jumbotron-bg: $gray-lighter !default;
|
488
495
|
$jumbotron-heading-color: inherit !default;
|
489
496
|
$jumbotron-font-size: ceil(($font-size-base * 1.5)) !default;
|
497
|
+
$jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;
|
490
498
|
|
491
499
|
|
492
500
|
//== Form states and alerts
|
@@ -860,5 +868,7 @@ $blockquote-border-color: $gray-lighter !default;
|
|
860
868
|
$page-header-border-color: $gray-lighter !default;
|
861
869
|
//** Width of horizontal description list titles
|
862
870
|
$dl-horizontal-offset: $component-offset-horizontal !default;
|
871
|
+
//** Point at which .dl-horizontal becomes horizontal
|
872
|
+
$dl-horizontal-breakpoint: $grid-float-breakpoint !default;
|
863
873
|
//** Horizontal line color.
|
864
874
|
$hr-border: $gray-lighter !default;
|
@@ -8,15 +8,31 @@
|
|
8
8
|
background-color: $background;
|
9
9
|
border-color: $border;
|
10
10
|
|
11
|
-
&:hover,
|
12
11
|
&:focus,
|
13
|
-
&.focus
|
12
|
+
&.focus {
|
13
|
+
color: $color;
|
14
|
+
background-color: darken($background, 10%);
|
15
|
+
border-color: darken($border, 25%);
|
16
|
+
}
|
17
|
+
&:hover {
|
18
|
+
color: $color;
|
19
|
+
background-color: darken($background, 10%);
|
20
|
+
border-color: darken($border, 12%);
|
21
|
+
}
|
14
22
|
&:active,
|
15
23
|
&.active,
|
16
24
|
.open > &.dropdown-toggle {
|
17
25
|
color: $color;
|
18
26
|
background-color: darken($background, 10%);
|
19
27
|
border-color: darken($border, 12%);
|
28
|
+
|
29
|
+
&:hover,
|
30
|
+
&:focus,
|
31
|
+
&.focus {
|
32
|
+
color: $color;
|
33
|
+
background-color: darken($background, 17%);
|
34
|
+
border-color: darken($border, 25%);
|
35
|
+
}
|
20
36
|
}
|
21
37
|
&:active,
|
22
38
|
&.active,
|
@@ -26,12 +42,9 @@
|
|
26
42
|
&.disabled,
|
27
43
|
&[disabled],
|
28
44
|
fieldset[disabled] & {
|
29
|
-
&,
|
30
45
|
&:hover,
|
31
46
|
&:focus,
|
32
|
-
&.focus
|
33
|
-
&:active,
|
34
|
-
&.active {
|
47
|
+
&.focus {
|
35
48
|
background-color: $background;
|
36
49
|
border-color: $border;
|
37
50
|
}
|
@@ -13,8 +13,8 @@
|
|
13
13
|
// Prevent columns from collapsing when empty
|
14
14
|
min-height: 1px;
|
15
15
|
// Inner gutter via padding
|
16
|
-
padding-left: ($grid-gutter-width / 2);
|
17
|
-
padding-right: ($grid-gutter-width / 2);
|
16
|
+
padding-left: ceil(($grid-gutter-width / 2));
|
17
|
+
padding-right: floor(($grid-gutter-width / 2));
|
18
18
|
}
|
19
19
|
}
|
20
20
|
|
@@ -6,15 +6,15 @@
|
|
6
6
|
@mixin container-fixed($gutter: $grid-gutter-width) {
|
7
7
|
margin-right: auto;
|
8
8
|
margin-left: auto;
|
9
|
-
padding-left: ($gutter / 2);
|
10
|
-
padding-right: ($gutter / 2);
|
9
|
+
padding-left: floor(($gutter / 2));
|
10
|
+
padding-right: ceil(($gutter / 2));
|
11
11
|
@include clearfix;
|
12
12
|
}
|
13
13
|
|
14
14
|
// Creates a wrapper for a series of columns
|
15
15
|
@mixin make-row($gutter: $grid-gutter-width) {
|
16
|
-
margin-left: ($gutter / -2);
|
17
|
-
margin-right: ($gutter / -2);
|
16
|
+
margin-left: ceil(($gutter / -2));
|
17
|
+
margin-right: floor(($gutter / -2));
|
18
18
|
@include clearfix;
|
19
19
|
}
|
20
20
|
|
@@ -1,14 +1,14 @@
|
|
1
1
|
// CSS image replacement
|
2
2
|
//
|
3
|
-
// Heads up! v3 launched with
|
3
|
+
// Heads up! v3 launched with only `.hide-text()`, but per our pattern for
|
4
4
|
// mixins being reused as classes with the same name, this doesn't hold up. As
|
5
5
|
// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
|
6
6
|
//
|
7
7
|
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
|
8
8
|
|
9
|
-
// Deprecated as of v3.0.1 (
|
9
|
+
// Deprecated as of v3.0.1 (has been removed in v4)
|
10
10
|
@mixin hide-text() {
|
11
|
-
font:
|
11
|
+
font: 0/0 a;
|
12
12
|
color: transparent;
|
13
13
|
text-shadow: none;
|
14
14
|
background-color: transparent;
|
@@ -5,10 +5,11 @@
|
|
5
5
|
color: $color;
|
6
6
|
background-color: $background;
|
7
7
|
|
8
|
-
// [converter] extracted a& to a.list-group-item-#{$state}
|
8
|
+
// [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state}
|
9
9
|
}
|
10
10
|
|
11
|
-
a.list-group-item-#{$state}
|
11
|
+
a.list-group-item-#{$state},
|
12
|
+
button.list-group-item-#{$state} {
|
12
13
|
color: $color;
|
13
14
|
|
14
15
|
.list-group-item-heading {
|
@@ -1,11 +1,12 @@
|
|
1
1
|
// Pagination
|
2
2
|
|
3
|
-
@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
|
3
|
+
@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
|
4
4
|
> li {
|
5
5
|
> a,
|
6
6
|
> span {
|
7
7
|
padding: $padding-vertical $padding-horizontal;
|
8
8
|
font-size: $font-size;
|
9
|
+
line-height: $line-height;
|
9
10
|
}
|
10
11
|
&:first-child {
|
11
12
|
> a,
|
@@ -0,0 +1,18 @@
|
|
1
|
+
@mixin reset-text() {
|
2
|
+
font-family: $font-family-base;
|
3
|
+
// We deliberately do NOT reset font-size.
|
4
|
+
font-style: normal;
|
5
|
+
font-weight: normal;
|
6
|
+
letter-spacing: normal;
|
7
|
+
line-break: auto;
|
8
|
+
line-height: $line-height-base;
|
9
|
+
text-align: left; // Fallback for where `start` is not supported
|
10
|
+
text-align: start;
|
11
|
+
text-decoration: none;
|
12
|
+
text-shadow: none;
|
13
|
+
text-transform: none;
|
14
|
+
white-space: normal;
|
15
|
+
word-break: normal;
|
16
|
+
word-spacing: normal;
|
17
|
+
word-wrap: normal;
|
18
|
+
}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
// Vendor Prefixes
|
2
2
|
//
|
3
3
|
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
|
4
|
-
// Autoprefixer in our Gruntfile. They
|
4
|
+
// Autoprefixer in our Gruntfile. They have been removed in v4.
|
5
5
|
|
6
6
|
// - Animations
|
7
7
|
// - Backface visibility
|
@@ -54,7 +54,7 @@
|
|
54
54
|
// Prevent browsers from flickering when using CSS 3D transforms.
|
55
55
|
// Default value is `visible`, but can be changed to `hidden`
|
56
56
|
|
57
|
-
@mixin backface-visibility($visibility){
|
57
|
+
@mixin backface-visibility($visibility) {
|
58
58
|
-webkit-backface-visibility: $visibility;
|
59
59
|
-moz-backface-visibility: $visibility;
|
60
60
|
backface-visibility: $visibility;
|
@@ -102,7 +102,7 @@
|
|
102
102
|
// Firefox
|
103
103
|
&::-moz-placeholder {
|
104
104
|
color: $color;
|
105
|
-
opacity: 1; //
|
105
|
+
opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
|
106
106
|
}
|
107
107
|
&:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
|
108
108
|
&::-webkit-input-placeholder { color: $color; } // Safari and Chrome
|
data/bootstrap-sass.gemspec
CHANGED
@@ -3,28 +3,28 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
3
3
|
require 'bootstrap-sass/version'
|
4
4
|
|
5
5
|
Gem::Specification.new do |s|
|
6
|
-
s.name =
|
6
|
+
s.name = 'bootstrap-sass'
|
7
7
|
s.version = Bootstrap::VERSION
|
8
|
-
s.authors = [
|
8
|
+
s.authors = ['Thomas McDonald']
|
9
9
|
s.email = 'tom@conceptcoding.co.uk'
|
10
|
-
s.summary =
|
11
|
-
s.homepage =
|
10
|
+
s.summary = 'bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.'
|
11
|
+
s.homepage = 'https://github.com/twbs/bootstrap-sass'
|
12
12
|
s.license = 'MIT'
|
13
13
|
|
14
|
-
s.add_runtime_dependency 'sass', '
|
14
|
+
s.add_runtime_dependency 'sass', '>= 3.3.4'
|
15
|
+
s.add_runtime_dependency 'autoprefixer-rails', '>= 5.2.1'
|
15
16
|
|
16
17
|
# Testing dependencies
|
17
|
-
s.add_development_dependency 'minitest', '~> 5.
|
18
|
-
s.add_development_dependency 'minitest-reporters', '~> 1.
|
18
|
+
s.add_development_dependency 'minitest', '~> 5.8'
|
19
|
+
s.add_development_dependency 'minitest-reporters', '~> 1.1'
|
19
20
|
# Integration testing
|
20
|
-
s.add_development_dependency 'capybara'
|
21
|
+
s.add_development_dependency 'capybara', '>= 2.5.0'
|
21
22
|
s.add_development_dependency 'poltergeist'
|
22
23
|
# Dummy Rails app dependencies
|
23
24
|
s.add_development_dependency 'actionpack', '>= 4.1.5'
|
24
25
|
s.add_development_dependency 'activesupport', '>= 4.1.5'
|
25
26
|
s.add_development_dependency 'json', '>= 1.8.1'
|
26
27
|
s.add_development_dependency 'sprockets-rails', '>= 2.1.3'
|
27
|
-
s.add_development_dependency 'autoprefixer-rails', '~> 1.1'
|
28
28
|
s.add_development_dependency 'jquery-rails', '>= 3.1.0'
|
29
29
|
s.add_development_dependency 'slim-rails'
|
30
30
|
s.add_development_dependency 'uglifier'
|
data/bower.json
CHANGED
@@ -1,6 +1,5 @@
|
|
1
1
|
{
|
2
2
|
"name": "bootstrap-sass",
|
3
|
-
"version": "3.3.1",
|
4
3
|
"homepage": "https://github.com/twbs/bootstrap-sass",
|
5
4
|
"authors": [
|
6
5
|
"Thomas McDonald",
|
@@ -8,25 +7,11 @@
|
|
8
7
|
"Peter Gumeson",
|
9
8
|
"Gleb Mazovetskiy"
|
10
9
|
],
|
11
|
-
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
|
10
|
+
"description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
|
11
|
+
"moduleType": "globals",
|
12
12
|
"main": [
|
13
13
|
"assets/stylesheets/_bootstrap.scss",
|
14
|
-
"assets/
|
15
|
-
"assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
|
16
|
-
"assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
|
17
|
-
"assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
|
18
|
-
"assets/javascripts/bootstrap/affix.js",
|
19
|
-
"assets/javascripts/bootstrap/alert.js",
|
20
|
-
"assets/javascripts/bootstrap/button.js",
|
21
|
-
"assets/javascripts/bootstrap/carousel.js",
|
22
|
-
"assets/javascripts/bootstrap/collapse.js",
|
23
|
-
"assets/javascripts/bootstrap/dropdown.js",
|
24
|
-
"assets/javascripts/bootstrap/tab.js",
|
25
|
-
"assets/javascripts/bootstrap/transition.js",
|
26
|
-
"assets/javascripts/bootstrap/scrollspy.js",
|
27
|
-
"assets/javascripts/bootstrap/modal.js",
|
28
|
-
"assets/javascripts/bootstrap/tooltip.js",
|
29
|
-
"assets/javascripts/bootstrap/popover.js"
|
14
|
+
"assets/javascripts/bootstrap.js"
|
30
15
|
],
|
31
16
|
"keywords": [
|
32
17
|
"twbs",
|
@@ -46,5 +31,6 @@
|
|
46
31
|
],
|
47
32
|
"dependencies": {
|
48
33
|
"jquery": ">= 1.9.0"
|
49
|
-
}
|
34
|
+
},
|
35
|
+
"version": "3.3.6"
|
50
36
|
}
|
data/composer.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "twbs/bootstrap-sass",
|
3
|
-
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
|
3
|
+
"description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
|
4
4
|
"keywords": ["bootstrap", "css", "sass"],
|
5
5
|
"homepage": "http://github.com/twbs/bootstrap-sass",
|
6
6
|
"authors": [
|