bootstrap-sass 3.1.1.1 → 3.2.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.travis.yml +6 -2
- data/CHANGELOG.md +19 -0
- data/Gemfile +5 -10
- data/README.md +140 -75
- data/Rakefile +4 -5
- data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.svg +0 -0
- data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/{vendor/assets → assets}/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/assets/images/.keep +0 -0
- data/assets/javascripts/bootstrap-sprockets.js +12 -0
- data/assets/javascripts/bootstrap.js +2107 -0
- data/{vendor/assets → assets}/javascripts/bootstrap/affix.js +18 -11
- data/{vendor/assets → assets}/javascripts/bootstrap/alert.js +10 -6
- data/{vendor/assets → assets}/javascripts/bootstrap/button.js +11 -8
- data/{vendor/assets → assets}/javascripts/bootstrap/carousel.js +49 -31
- data/{vendor/assets → assets}/javascripts/bootstrap/collapse.js +19 -24
- data/{vendor/assets → assets}/javascripts/bootstrap/dropdown.js +9 -5
- data/{vendor/assets → assets}/javascripts/bootstrap/modal.js +25 -16
- data/{vendor/assets → assets}/javascripts/bootstrap/popover.js +9 -6
- data/{vendor/assets → assets}/javascripts/bootstrap/scrollspy.js +37 -21
- data/{vendor/assets → assets}/javascripts/bootstrap/tab.js +11 -8
- data/{vendor/assets → assets}/javascripts/bootstrap/tooltip.js +52 -17
- data/{vendor/assets → assets}/javascripts/bootstrap/transition.js +14 -3
- data/assets/stylesheets/_bootstrap-compass.scss +7 -0
- data/{vendor/assets → assets}/stylesheets/_bootstrap-mincer.scss +0 -0
- data/assets/stylesheets/_bootstrap-sprockets.scss +7 -0
- data/{vendor/assets/stylesheets/bootstrap.scss → assets/stylesheets/_bootstrap.scss} +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_alerts.scss +4 -3
- data/{vendor/assets → assets}/stylesheets/bootstrap/_badges.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_breadcrumbs.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_button-groups.scss +5 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/_buttons.scss +0 -2
- data/{vendor/assets → assets}/stylesheets/bootstrap/_carousel.scss +3 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/_close.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_code.scss +6 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_component-animations.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_dropdowns.scss +1 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_forms.scss +82 -22
- data/{vendor/assets → assets}/stylesheets/bootstrap/_glyphicons.scss +4 -4
- data/{vendor/assets → assets}/stylesheets/bootstrap/_grid.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_input-groups.scss +6 -2
- data/{vendor/assets → assets}/stylesheets/bootstrap/_jumbotron.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_labels.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_list-group.scss +3 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/_media.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_mixins.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_modals.scss +7 -4
- data/{vendor/assets → assets}/stylesheets/bootstrap/_navbar.scss +1 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_navs.scss +1 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/_normalize.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_pager.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_pagination.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_panels.scss +6 -3
- data/{vendor/assets → assets}/stylesheets/bootstrap/_popovers.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_print.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_progress-bars.scss +18 -2
- data/{vendor/assets → assets}/stylesheets/bootstrap/_responsive-embed.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_responsive-utilities.scss +2 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/_scaffolding.scss +1 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/_tables.scss +2 -2
- data/{vendor/assets → assets}/stylesheets/bootstrap/_theme.scss +11 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_thumbnails.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_tooltip.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_type.scss +16 -6
- data/{vendor/assets → assets}/stylesheets/bootstrap/_utilities.scss +1 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/_variables.scss +25 -20
- data/{vendor/assets → assets}/stylesheets/bootstrap/_wells.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_alerts.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_background-variant.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_border-radius.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_buttons.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_center-block.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_clearfix.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_forms.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_gradients.scss +1 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -8
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_grid.scss +3 -3
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_hide-text.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_image.scss +1 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_labels.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_list-group.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_nav-divider.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_opacity.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_pagination.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_panels.scss +4 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_progress-bar.scss +2 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_reset-filter.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_resize.scss +1 -1
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_responsive-visibility.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_size.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_tab-focus.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_table-row.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_text-emphasis.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_text-overflow.scss +0 -0
- data/{vendor/assets → assets}/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +5 -10
- data/bootstrap-sass.gemspec +11 -6
- data/bower.json +22 -90
- data/composer.json +1 -1
- data/lib/bootstrap-sass.rb +3 -2
- data/lib/bootstrap-sass/engine.rb +4 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/package.json +6 -1
- data/sache.json +5 -0
- data/tasks/bower.rake +6 -5
- data/tasks/converter.rb +3 -3
- data/tasks/converter/js_conversion.rb +11 -5
- data/tasks/converter/less_conversion.rb +30 -21
- data/tasks/converter/logger.rb +1 -0
- data/tasks/converter/network.rb +14 -16
- data/templates/project/{_variables.sass.erb → _bootstrap-variables.sass.erb} +0 -2
- data/templates/project/manifest.rb +17 -16
- data/templates/project/styles.sass +2 -2
- data/test/compass_test.rb +5 -4
- data/test/compilation_test.rb +10 -9
- data/test/dummy_node_mincer/manifest.js +2 -2
- data/test/dummy_rails/README.rdoc +1 -1
- data/test/dummy_rails/app/assets/javascripts/application.js +1 -1
- data/test/dummy_rails/app/assets/stylesheets/application.css.sass +2 -1
- data/test/dummy_rails/app/views/pages/root.html.slim +1 -1
- data/test/dummy_rails/config/application.rb +19 -3
- data/test/dummy_sass_only/compile.rb +4 -4
- data/test/gemfiles/sass_3_2.gemfile +1 -11
- data/test/gemfiles/sass_3_3.gemfile +2 -13
- data/test/gemfiles/sass_3_4.gemfile +7 -0
- data/test/gemfiles/sass_head.gemfile +2 -13
- data/test/node_mincer_test.rb +6 -5
- data/test/node_sass_test.rb +7 -6
- data/test/pages_test.rb +3 -3
- data/test/sass_test.rb +9 -6
- data/test/sprockets_rails_test.rb +11 -5
- data/test/support/dummy_rails_integration.rb +22 -0
- data/test/support/integration_test.rb +4 -11
- data/test/support/reporting.rb +17 -0
- data/test/test_helper.rb +22 -18
- data/test/test_helper_rails.rb +6 -0
- metadata +231 -151
- data/lib/bootstrap-sass/sass_functions.rb +0 -50
- data/vendor/assets/javascripts/bootstrap.js +0 -12
- data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +0 -50
|
File without changes
|
|
File without changes
|
|
@@ -6,6 +6,13 @@
|
|
|
6
6
|
// Bar animations
|
|
7
7
|
// -------------------------
|
|
8
8
|
|
|
9
|
+
// WebKit
|
|
10
|
+
@-webkit-keyframes progress-bar-stripes {
|
|
11
|
+
from { background-position: 40px 0; }
|
|
12
|
+
to { background-position: 0 0; }
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
// Spec and IE10+
|
|
9
16
|
@keyframes progress-bar-stripes {
|
|
10
17
|
from { background-position: 40px 0; }
|
|
11
18
|
to { background-position: 0 0; }
|
|
@@ -41,13 +48,22 @@
|
|
|
41
48
|
}
|
|
42
49
|
|
|
43
50
|
// Striped bars
|
|
44
|
-
|
|
51
|
+
//
|
|
52
|
+
// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the
|
|
53
|
+
// `.progress-bar-striped` class, which you just add to an existing
|
|
54
|
+
// `.progress-bar`.
|
|
55
|
+
.progress-striped .progress-bar,
|
|
56
|
+
.progress-bar-striped {
|
|
45
57
|
@include gradient-striped();
|
|
46
58
|
background-size: 40px 40px;
|
|
47
59
|
}
|
|
48
60
|
|
|
49
61
|
// Call animation for the active one
|
|
50
|
-
|
|
62
|
+
//
|
|
63
|
+
// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
|
|
64
|
+
// `.progress-bar.active` approach.
|
|
65
|
+
.progress.active .progress-bar,
|
|
66
|
+
.progress-bar.active {
|
|
51
67
|
@include animation(progress-bar-stripes 2s linear infinite);
|
|
52
68
|
}
|
|
53
69
|
|
|
File without changes
|
|
@@ -14,7 +14,8 @@
|
|
|
14
14
|
// For more information, see the following:
|
|
15
15
|
//
|
|
16
16
|
// Issue: https://github.com/twbs/bootstrap/issues/10497
|
|
17
|
-
// Docs: http://getbootstrap.com/getting-started/#
|
|
17
|
+
// Docs: http://getbootstrap.com/getting-started/#support-ie10-width
|
|
18
|
+
// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
|
|
18
19
|
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
|
|
19
20
|
|
|
20
21
|
@-ms-viewport {
|
|
@@ -4,7 +4,6 @@
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
table {
|
|
7
|
-
max-width: 100%;
|
|
8
7
|
background-color: $table-bg;
|
|
9
8
|
}
|
|
10
9
|
th {
|
|
@@ -16,6 +15,7 @@ th {
|
|
|
16
15
|
|
|
17
16
|
.table {
|
|
18
17
|
width: 100%;
|
|
18
|
+
max-width: 100%;
|
|
19
19
|
margin-bottom: $line-height-computed;
|
|
20
20
|
// Cells
|
|
21
21
|
> thead,
|
|
@@ -173,7 +173,7 @@ table {
|
|
|
173
173
|
width: 100%;
|
|
174
174
|
margin-bottom: ($line-height-computed * 0.75);
|
|
175
175
|
overflow-y: hidden;
|
|
176
|
-
overflow-x:
|
|
176
|
+
overflow-x: auto;
|
|
177
177
|
-ms-overflow-style: -ms-autohiding-scrollbar;
|
|
178
178
|
border: 1px solid $table-border-color;
|
|
179
179
|
-webkit-overflow-scrolling: touch;
|
|
@@ -48,6 +48,12 @@
|
|
|
48
48
|
background-color: darken($btn-color, 12%);
|
|
49
49
|
border-color: darken($btn-color, 14%);
|
|
50
50
|
}
|
|
51
|
+
|
|
52
|
+
&:disabled,
|
|
53
|
+
&[disabled] {
|
|
54
|
+
background-color: darken($btn-color, 12%);
|
|
55
|
+
background-image: none;
|
|
56
|
+
}
|
|
51
57
|
}
|
|
52
58
|
|
|
53
59
|
// Common styles
|
|
@@ -191,6 +197,11 @@
|
|
|
191
197
|
.progress-bar-warning { @include progress-bar-styles($progress-bar-warning-bg); }
|
|
192
198
|
.progress-bar-danger { @include progress-bar-styles($progress-bar-danger-bg); }
|
|
193
199
|
|
|
200
|
+
// Reset the striped class because our mixins don't do multiple gradients and
|
|
201
|
+
// the above custom styles override the new `.progress-bar-striped` in v3.2.0.
|
|
202
|
+
.progress-bar-striped {
|
|
203
|
+
@include gradient-striped();
|
|
204
|
+
}
|
|
194
205
|
|
|
195
206
|
|
|
196
207
|
//
|
|
File without changes
|
|
File without changes
|
|
@@ -62,7 +62,7 @@ p {
|
|
|
62
62
|
.lead {
|
|
63
63
|
margin-bottom: $line-height-computed;
|
|
64
64
|
font-size: floor(($font-size-base * 1.15));
|
|
65
|
-
font-weight:
|
|
65
|
+
font-weight: 300;
|
|
66
66
|
line-height: 1.4;
|
|
67
67
|
|
|
68
68
|
@media (min-width: $screen-sm-min) {
|
|
@@ -74,12 +74,16 @@ p {
|
|
|
74
74
|
// Emphasis & misc
|
|
75
75
|
// -------------------------
|
|
76
76
|
|
|
77
|
-
// Ex: 14px base font *
|
|
77
|
+
// Ex: (12px small font / 14px base font) * 100% = about 85%
|
|
78
78
|
small,
|
|
79
|
-
.small
|
|
79
|
+
.small {
|
|
80
|
+
font-size: floor((100% * $font-size-small / $font-size-base));
|
|
81
|
+
}
|
|
80
82
|
|
|
81
83
|
// Undo browser default styling
|
|
82
|
-
cite
|
|
84
|
+
cite {
|
|
85
|
+
font-style: normal;
|
|
86
|
+
}
|
|
83
87
|
|
|
84
88
|
mark,
|
|
85
89
|
.mark {
|
|
@@ -92,6 +96,12 @@ mark,
|
|
|
92
96
|
.text-right { text-align: right; }
|
|
93
97
|
.text-center { text-align: center; }
|
|
94
98
|
.text-justify { text-align: justify; }
|
|
99
|
+
.text-nowrap { white-space: nowrap; }
|
|
100
|
+
|
|
101
|
+
// Transformation
|
|
102
|
+
.text-lowercase { text-transform: lowercase; }
|
|
103
|
+
.text-uppercase { text-transform: uppercase; }
|
|
104
|
+
.text-capitalize { text-transform: capitalize; }
|
|
95
105
|
|
|
96
106
|
// Contextual colors
|
|
97
107
|
.text-muted {
|
|
@@ -200,13 +210,13 @@ dd {
|
|
|
200
210
|
@media (min-width: $grid-float-breakpoint) {
|
|
201
211
|
dt {
|
|
202
212
|
float: left;
|
|
203
|
-
width: ($
|
|
213
|
+
width: ($dl-horizontal-offset - 20);
|
|
204
214
|
clear: left;
|
|
205
215
|
text-align: right;
|
|
206
216
|
@include text-overflow();
|
|
207
217
|
}
|
|
208
218
|
dd {
|
|
209
|
-
margin-left: $
|
|
219
|
+
margin-left: $dl-horizontal-offset;
|
|
210
220
|
}
|
|
211
221
|
}
|
|
212
222
|
}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
// in Sass 3.3
|
|
1
|
+
// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
|
|
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
4
|
$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
|
|
5
|
+
|
|
5
6
|
//
|
|
6
7
|
// Variables
|
|
7
8
|
// --------------------------------------------------
|
|
@@ -14,7 +15,7 @@ $bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")
|
|
|
14
15
|
$gray-darker: lighten(#000, 13.5%) !default; // #222
|
|
15
16
|
$gray-dark: lighten(#000, 20%) !default; // #333
|
|
16
17
|
$gray: lighten(#000, 33.5%) !default; // #555
|
|
17
|
-
$gray-light: lighten(#000,
|
|
18
|
+
$gray-light: lighten(#000, 46.7%) !default; // #777
|
|
18
19
|
$gray-lighter: lighten(#000, 93.5%) !default; // #eee
|
|
19
20
|
|
|
20
21
|
$brand-primary: #428bca !default;
|
|
@@ -77,7 +78,10 @@ $headings-color: inherit !default;
|
|
|
77
78
|
//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
|
|
78
79
|
|
|
79
80
|
//** Load fonts from this directory.
|
|
80
|
-
|
|
81
|
+
|
|
82
|
+
// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
|
|
83
|
+
$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
|
|
84
|
+
|
|
81
85
|
//** File name for all font files.
|
|
82
86
|
$icon-font-name: "glyphicons-halflings-regular" !default;
|
|
83
87
|
//** Element ID within SVG icon file.
|
|
@@ -240,7 +244,7 @@ $dropdown-link-disabled-color: $gray-light !default;
|
|
|
240
244
|
//** Text color for headers within dropdown menus.
|
|
241
245
|
$dropdown-header-color: $gray-light !default;
|
|
242
246
|
|
|
243
|
-
|
|
247
|
+
//** Deprecated `$dropdown-caret-color` as of v3.1.0
|
|
244
248
|
$dropdown-caret-color: #000 !default;
|
|
245
249
|
|
|
246
250
|
|
|
@@ -265,28 +269,32 @@ $zindex-modal: 1050 !default;
|
|
|
265
269
|
//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
|
|
266
270
|
|
|
267
271
|
// Extra small screen / phone
|
|
268
|
-
|
|
269
|
-
// Note: Deprecated $screen-xs-min as of v3.2.0
|
|
272
|
+
//** Deprecated `$screen-xs` as of v3.0.1
|
|
270
273
|
$screen-xs: 480px !default;
|
|
274
|
+
//** Deprecated `$screen-xs-min` as of v3.2.0
|
|
271
275
|
$screen-xs-min: $screen-xs !default;
|
|
276
|
+
//** Deprecated `$screen-phone` as of v3.0.1
|
|
272
277
|
$screen-phone: $screen-xs-min !default;
|
|
273
278
|
|
|
274
279
|
// Small screen / tablet
|
|
275
|
-
|
|
280
|
+
//** Deprecated `$screen-sm` as of v3.0.1
|
|
276
281
|
$screen-sm: 768px !default;
|
|
277
282
|
$screen-sm-min: $screen-sm !default;
|
|
283
|
+
//** Deprecated `$screen-tablet` as of v3.0.1
|
|
278
284
|
$screen-tablet: $screen-sm-min !default;
|
|
279
285
|
|
|
280
286
|
// Medium screen / desktop
|
|
281
|
-
|
|
287
|
+
//** Deprecated `$screen-md` as of v3.0.1
|
|
282
288
|
$screen-md: 992px !default;
|
|
283
289
|
$screen-md-min: $screen-md !default;
|
|
290
|
+
//** Deprecated `$screen-desktop` as of v3.0.1
|
|
284
291
|
$screen-desktop: $screen-md-min !default;
|
|
285
292
|
|
|
286
293
|
// Large screen / wide desktop
|
|
287
|
-
|
|
294
|
+
//** Deprecated `$screen-lg` as of v3.0.1
|
|
288
295
|
$screen-lg: 1200px !default;
|
|
289
296
|
$screen-lg-min: $screen-lg !default;
|
|
297
|
+
//** Deprecated `$screen-lg-desktop` as of v3.0.1
|
|
290
298
|
$screen-lg-desktop: $screen-lg-min !default;
|
|
291
299
|
|
|
292
300
|
// So media queries don't overlap when required, provide a maximum
|
|
@@ -534,7 +542,7 @@ $popover-arrow-color: #fff !default;
|
|
|
534
542
|
//** Popover outer arrow width
|
|
535
543
|
$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
|
|
536
544
|
//** Popover outer arrow color
|
|
537
|
-
$popover-arrow-outer-color:
|
|
545
|
+
$popover-arrow-outer-color: fade_in($popover-border-color, 0.05) !default;
|
|
538
546
|
//** Popover outer arrow fallback color
|
|
539
547
|
$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default;
|
|
540
548
|
|
|
@@ -822,6 +830,8 @@ $pre-scrollable-max-height: 340px !default;
|
|
|
822
830
|
//
|
|
823
831
|
//##
|
|
824
832
|
|
|
833
|
+
//** Horizontal offset for forms and lists.
|
|
834
|
+
$component-offset-horizontal: 180px !default;
|
|
825
835
|
//** Text muted color
|
|
826
836
|
$text-muted: $gray-light !default;
|
|
827
837
|
//** Abbreviations and acronyms border color
|
|
@@ -836,14 +846,9 @@ $blockquote-font-size: ($font-size-base * 1.25) !default;
|
|
|
836
846
|
$blockquote-border-color: $gray-lighter !default;
|
|
837
847
|
//** Page header border color
|
|
838
848
|
$page-header-border-color: $gray-lighter !default;
|
|
839
|
-
|
|
840
|
-
|
|
841
|
-
//== Miscellaneous
|
|
842
|
-
//
|
|
843
|
-
//##
|
|
844
|
-
|
|
849
|
+
//** Width of horizontal description list titles
|
|
850
|
+
$dl-horizontal-offset: $component-offset-horizontal !default;
|
|
845
851
|
//** Horizontal line color.
|
|
846
852
|
$hr-border: $gray-lighter !default;
|
|
847
853
|
|
|
848
|
-
|
|
849
|
-
$component-offset-horizontal: 180px !default;
|
|
854
|
+
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// Creates two color stops, start and end, by specifying a color and position for each color stop.
|
|
8
8
|
// Color stops are not available in IE9 and below.
|
|
9
9
|
@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
|
|
10
|
-
background-image: -webkit-linear-gradient(left,
|
|
10
|
+
background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
|
|
11
11
|
background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12
|
|
12
12
|
background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
|
13
13
|
background-repeat: repeat-x;
|
|
@@ -4,10 +4,7 @@
|
|
|
4
4
|
// any value of `$grid-columns`.
|
|
5
5
|
|
|
6
6
|
// [converter] This is defined recursively in LESS, but Sass supports real loops
|
|
7
|
-
@mixin make-grid-columns() {
|
|
8
|
-
$list: '';
|
|
9
|
-
$i: 1;
|
|
10
|
-
$list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
|
|
7
|
+
@mixin make-grid-columns($i: 1, $list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}") {
|
|
11
8
|
@for $i from (1 + 1) through $grid-columns {
|
|
12
9
|
$list: "#{$list}, .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
|
|
13
10
|
}
|
|
@@ -23,10 +20,7 @@
|
|
|
23
20
|
|
|
24
21
|
|
|
25
22
|
// [converter] This is defined recursively in LESS, but Sass supports real loops
|
|
26
|
-
@mixin float-grid-columns($class) {
|
|
27
|
-
$list: '';
|
|
28
|
-
$i: 1;
|
|
29
|
-
$list: ".col-#{$class}-#{$i}";
|
|
23
|
+
@mixin float-grid-columns($class, $i: 1, $list: ".col-#{$class}-#{$i}") {
|
|
30
24
|
@for $i from (1 + 1) through $grid-columns {
|
|
31
25
|
$list: "#{$list}, .col-#{$class}-#{$i}";
|
|
32
26
|
}
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
// Generate semantic grid columns with these mixins.
|
|
4
4
|
|
|
5
5
|
// Centered container element
|
|
6
|
-
@mixin container-fixed() {
|
|
6
|
+
@mixin container-fixed($gutter: $grid-gutter-width) {
|
|
7
7
|
margin-right: auto;
|
|
8
8
|
margin-left: auto;
|
|
9
|
-
padding-left: ($
|
|
10
|
-
padding-right: ($
|
|
9
|
+
padding-left: ($gutter / 2);
|
|
10
|
+
padding-right: ($gutter / 2);
|
|
11
11
|
@include clearfix();
|
|
12
12
|
}
|
|
13
13
|
|
|
File without changes
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
// Keep images from scaling beyond the width of their parents.
|
|
9
9
|
@mixin img-responsive($display: block) {
|
|
10
10
|
display: $display;
|
|
11
|
+
width: 100% \9; // Force IE10 and below to size SVG images correctly
|
|
11
12
|
max-width: 100%; // Part 1: Set a maximum relative to the parent
|
|
12
13
|
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
|
|
13
14
|
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// Vendor Prefixes
|
|
2
2
|
//
|
|
3
|
-
// All vendor mixins are deprecated as of v3.2 due to the introduction of
|
|
3
|
+
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
|
|
4
4
|
// Autoprefixer in our Gruntfile. They will be removed in v4.
|
|
5
5
|
|
|
6
6
|
// - Animations
|
|
@@ -112,12 +112,7 @@
|
|
|
112
112
|
-o-transform: scale($ratio);
|
|
113
113
|
transform: scale($ratio);
|
|
114
114
|
}
|
|
115
|
-
|
|
116
|
-
-webkit-transform: scale($ratioX, $ratioY);
|
|
117
|
-
-ms-transform: scale($ratioX, $ratioY); // IE9 only
|
|
118
|
-
-o-transform: scale($ratioX, $ratioY);
|
|
119
|
-
transform: scale($ratioX, $ratioY);
|
|
120
|
-
}
|
|
115
|
+
|
|
121
116
|
@mixin scaleX($ratio) {
|
|
122
117
|
-webkit-transform: scaleX($ratio);
|
|
123
118
|
-ms-transform: scaleX($ratio); // IE9 only
|
|
@@ -131,10 +126,10 @@
|
|
|
131
126
|
transform: scaleY($ratio);
|
|
132
127
|
}
|
|
133
128
|
@mixin skew($x, $y) {
|
|
134
|
-
-webkit-transform:
|
|
129
|
+
-webkit-transform: skewX($x) skewY($y);
|
|
135
130
|
-ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
|
|
136
|
-
-o-transform:
|
|
137
|
-
transform:
|
|
131
|
+
-o-transform: skewX($x) skewY($y);
|
|
132
|
+
transform: skewX($x) skewY($y);
|
|
138
133
|
}
|
|
139
134
|
@mixin translate($x, $y) {
|
|
140
135
|
-webkit-transform: translate($x, $y);
|