bootstrap-generators 3.2.0 → 3.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +5 -3
- data/Rakefile +9 -18
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +31 -21
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +38 -24
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/starter.scss +2 -1
- data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
- data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +5 -3
- data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim +7 -4
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +10 -9
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +12 -9
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim +15 -11
- data/readme-template.md.erb +3 -1
- data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
- data/vendor/assets/javascripts/bootstrap/affix.js +43 -23
- data/vendor/assets/javascripts/bootstrap/alert.js +6 -4
- data/vendor/assets/javascripts/bootstrap/button.js +16 -10
- data/vendor/assets/javascripts/bootstrap/carousel.js +27 -10
- data/vendor/assets/javascripts/bootstrap/collapse.js +69 -28
- data/vendor/assets/javascripts/bootstrap/dropdown.js +20 -10
- data/vendor/assets/javascripts/bootstrap/modal.js +67 -23
- data/vendor/assets/javascripts/bootstrap/popover.js +13 -7
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +12 -7
- data/vendor/assets/javascripts/bootstrap/tab.js +41 -16
- data/vendor/assets/javascripts/bootstrap/tooltip.js +60 -39
- data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
- data/vendor/assets/stylesheets/bootstrap.css.erb +332 -203
- data/vendor/assets/stylesheets/bootstrap.css.map +1 -0
- data/vendor/twitter/bootstrap/less/badges.less +7 -1
- data/vendor/twitter/bootstrap/less/button-groups.less +16 -13
- data/vendor/twitter/bootstrap/less/buttons.less +7 -4
- data/vendor/twitter/bootstrap/less/carousel.less +24 -0
- data/vendor/twitter/bootstrap/less/code.less +1 -0
- data/vendor/twitter/bootstrap/less/component-animations.less +5 -2
- data/vendor/twitter/bootstrap/less/dropdowns.less +3 -5
- data/vendor/twitter/bootstrap/less/forms.less +46 -40
- data/vendor/twitter/bootstrap/less/glyphicons.less +2 -1
- data/vendor/twitter/bootstrap/less/jumbotron.less +6 -5
- data/vendor/twitter/bootstrap/less/list-group.less +1 -8
- data/vendor/twitter/bootstrap/less/media.less +27 -36
- data/vendor/twitter/bootstrap/less/mixins/buttons.less +2 -0
- data/vendor/twitter/bootstrap/less/mixins/forms.less +5 -1
- data/vendor/twitter/bootstrap/less/mixins/grid-framework.less +2 -2
- data/vendor/twitter/bootstrap/less/mixins/image.less +0 -1
- data/vendor/twitter/bootstrap/less/mixins/labels.less +1 -1
- data/vendor/twitter/bootstrap/less/mixins/vendor-prefixes.less +6 -3
- data/vendor/twitter/bootstrap/less/modals.less +3 -5
- data/vendor/twitter/bootstrap/less/navbar.less +30 -25
- data/vendor/twitter/bootstrap/less/navs.less +3 -1
- data/vendor/twitter/bootstrap/less/normalize.less +5 -3
- data/vendor/twitter/bootstrap/less/pager.less +1 -2
- data/vendor/twitter/bootstrap/less/pagination.less +1 -1
- data/vendor/twitter/bootstrap/less/panels.less +21 -3
- data/vendor/twitter/bootstrap/less/popovers.less +6 -4
- data/vendor/twitter/bootstrap/less/print.less +102 -96
- data/vendor/twitter/bootstrap/less/progress-bars.less +1 -19
- data/vendor/twitter/bootstrap/less/responsive-embed.less +2 -1
- data/vendor/twitter/bootstrap/less/scaffolding.less +1 -1
- data/vendor/twitter/bootstrap/less/tables.less +11 -10
- data/vendor/twitter/bootstrap/less/theme.less +23 -9
- data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
- data/vendor/twitter/bootstrap/less/tooltip.less +12 -4
- data/vendor/twitter/bootstrap/less/type.less +0 -11
- data/vendor/twitter/bootstrap/less/utilities.less +0 -1
- data/vendor/twitter/bootstrap/less/variables.less +31 -21
- data/vendor/twitter/bootstrap/sass/_bootstrap-compass.scss +7 -0
- data/vendor/twitter/bootstrap/sass/_bootstrap-mincer.scss +17 -0
- data/vendor/twitter/bootstrap/sass/_bootstrap-sprockets.scss +7 -0
- data/vendor/twitter/bootstrap/sass/_bootstrap.scss +50 -0
- data/vendor/twitter/bootstrap/sass/{_alerts.scss → bootstrap/_alerts.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_badges.scss → bootstrap/_badges.scss} +7 -1
- data/vendor/twitter/bootstrap/sass/{_breadcrumbs.scss → bootstrap/_breadcrumbs.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_button-groups.scss → bootstrap/_button-groups.scss} +18 -15
- data/vendor/twitter/bootstrap/sass/{_buttons.scss → bootstrap/_buttons.scss} +8 -5
- data/vendor/twitter/bootstrap/sass/{_carousel.scss → bootstrap/_carousel.scss} +25 -1
- data/vendor/twitter/bootstrap/sass/{_close.scss → bootstrap/_close.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_code.scss → bootstrap/_code.scss} +1 -0
- data/vendor/twitter/bootstrap/sass/{_component-animations.scss → bootstrap/_component-animations.scss} +5 -2
- data/vendor/twitter/bootstrap/sass/{_dropdowns.scss → bootstrap/_dropdowns.scss} +4 -6
- data/vendor/twitter/bootstrap/sass/{_forms.scss → bootstrap/_forms.scss} +53 -43
- data/vendor/twitter/bootstrap/sass/{_glyphicons.scss → bootstrap/_glyphicons.scss} +7 -10
- data/vendor/twitter/bootstrap/sass/{_grid.scss → bootstrap/_grid.scss} +4 -4
- data/vendor/twitter/bootstrap/sass/{_input-groups.scss → bootstrap/_input-groups.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_jumbotron.scss → bootstrap/_jumbotron.scss} +6 -5
- data/vendor/twitter/bootstrap/sass/{_labels.scss → bootstrap/_labels.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_list-group.scss → bootstrap/_list-group.scss} +1 -8
- data/vendor/twitter/bootstrap/sass/bootstrap/_media.scss +47 -0
- data/vendor/twitter/bootstrap/sass/{_mixins.scss → bootstrap/_mixins.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_modals.scss → bootstrap/_modals.scss} +4 -6
- data/vendor/twitter/bootstrap/sass/{_navbar.scss → bootstrap/_navbar.scss} +36 -33
- data/vendor/twitter/bootstrap/sass/{_navs.scss → bootstrap/_navs.scss} +5 -3
- data/vendor/twitter/bootstrap/sass/{_normalize.scss → bootstrap/_normalize.scss} +5 -3
- data/vendor/twitter/bootstrap/sass/{_pager.scss → bootstrap/_pager.scss} +2 -3
- data/vendor/twitter/bootstrap/sass/{_pagination.scss → bootstrap/_pagination.scss} +1 -1
- data/vendor/twitter/bootstrap/sass/{_panels.scss → bootstrap/_panels.scss} +22 -4
- data/vendor/twitter/bootstrap/sass/{_popovers.scss → bootstrap/_popovers.scss} +6 -4
- data/vendor/twitter/bootstrap/sass/bootstrap/_print.scss +107 -0
- data/vendor/twitter/bootstrap/sass/{_progress-bars.scss → bootstrap/_progress-bars.scss} +2 -20
- data/vendor/twitter/bootstrap/sass/{_responsive-embed.scss → bootstrap/_responsive-embed.scss} +2 -1
- data/vendor/twitter/bootstrap/sass/{_responsive-utilities.scss → bootstrap/_responsive-utilities.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{_scaffolding.scss → bootstrap/_scaffolding.scss} +3 -3
- data/vendor/twitter/bootstrap/sass/{_tables.scss → bootstrap/_tables.scss} +11 -10
- data/vendor/twitter/bootstrap/sass/{_theme.scss → bootstrap/_theme.scss} +27 -13
- data/vendor/twitter/bootstrap/sass/{_thumbnails.scss → bootstrap/_thumbnails.scss} +2 -2
- data/vendor/twitter/bootstrap/sass/{_tooltip.scss → bootstrap/_tooltip.scss} +12 -4
- data/vendor/twitter/bootstrap/sass/{_type.scss → bootstrap/_type.scss} +10 -16
- data/vendor/twitter/bootstrap/sass/{_utilities.scss → bootstrap/_utilities.scss} +3 -4
- data/vendor/twitter/bootstrap/sass/{_variables.scss → bootstrap/_variables.scss} +38 -24
- data/vendor/twitter/bootstrap/sass/{_wells.scss → bootstrap/_wells.scss} +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_alerts.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_background-variant.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_border-radius.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_buttons.scss +2 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_center-block.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_clearfix.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_forms.scss +5 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_gradients.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid-framework.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_grid.scss +2 -2
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_hide-text.scss +1 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_image.scss +0 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_labels.scss +1 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_list-group.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-divider.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_nav-vertical-align.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_opacity.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_pagination.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_panels.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_progress-bar.scss +1 -1
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_reset-filter.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_resize.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_responsive-visibility.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_size.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_tab-focus.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_table-row.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-emphasis.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_text-overflow.scss +0 -0
- data/vendor/twitter/bootstrap/sass/{mixins → bootstrap/mixins}/_vendor-prefixes.scss +6 -3
- metadata +76 -72
- data/vendor/twitter/bootstrap/sass/_media.scss +0 -56
- data/vendor/twitter/bootstrap/sass/_print.scss +0 -101
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -50
@@ -9,7 +9,10 @@
|
|
9
9
|
z-index: @zindex-tooltip;
|
10
10
|
display: block;
|
11
11
|
visibility: visible;
|
12
|
+
// Reset font and text propertes given new insertion method
|
13
|
+
font-family: @font-family-base;
|
12
14
|
font-size: @font-size-small;
|
15
|
+
font-weight: normal;
|
13
16
|
line-height: 1.4;
|
14
17
|
.opacity(0);
|
15
18
|
|
@@ -39,6 +42,7 @@
|
|
39
42
|
border-color: transparent;
|
40
43
|
border-style: solid;
|
41
44
|
}
|
45
|
+
// Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
|
42
46
|
.tooltip {
|
43
47
|
&.top .tooltip-arrow {
|
44
48
|
bottom: 0;
|
@@ -49,13 +53,15 @@
|
|
49
53
|
}
|
50
54
|
&.top-left .tooltip-arrow {
|
51
55
|
bottom: 0;
|
52
|
-
|
56
|
+
right: @tooltip-arrow-width;
|
57
|
+
margin-bottom: -@tooltip-arrow-width;
|
53
58
|
border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
|
54
59
|
border-top-color: @tooltip-arrow-color;
|
55
60
|
}
|
56
61
|
&.top-right .tooltip-arrow {
|
57
62
|
bottom: 0;
|
58
|
-
|
63
|
+
left: @tooltip-arrow-width;
|
64
|
+
margin-bottom: -@tooltip-arrow-width;
|
59
65
|
border-width: @tooltip-arrow-width @tooltip-arrow-width 0;
|
60
66
|
border-top-color: @tooltip-arrow-color;
|
61
67
|
}
|
@@ -82,13 +88,15 @@
|
|
82
88
|
}
|
83
89
|
&.bottom-left .tooltip-arrow {
|
84
90
|
top: 0;
|
85
|
-
|
91
|
+
right: @tooltip-arrow-width;
|
92
|
+
margin-top: -@tooltip-arrow-width;
|
86
93
|
border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
|
87
94
|
border-bottom-color: @tooltip-arrow-color;
|
88
95
|
}
|
89
96
|
&.bottom-right .tooltip-arrow {
|
90
97
|
top: 0;
|
91
|
-
|
98
|
+
left: @tooltip-arrow-width;
|
99
|
+
margin-top: -@tooltip-arrow-width;
|
92
100
|
border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;
|
93
101
|
border-bottom-color: @tooltip-arrow-color;
|
94
102
|
}
|
@@ -80,11 +80,6 @@ small,
|
|
80
80
|
font-size: floor((100% * @font-size-small / @font-size-base));
|
81
81
|
}
|
82
82
|
|
83
|
-
// Undo browser default styling
|
84
|
-
cite {
|
85
|
-
font-style: normal;
|
86
|
-
}
|
87
|
-
|
88
83
|
mark,
|
89
84
|
.mark {
|
90
85
|
background-color: @state-warning-bg;
|
@@ -299,12 +294,6 @@ blockquote.pull-right {
|
|
299
294
|
}
|
300
295
|
}
|
301
296
|
|
302
|
-
// Quotes
|
303
|
-
blockquote:before,
|
304
|
-
blockquote:after {
|
305
|
-
content: "";
|
306
|
-
}
|
307
|
-
|
308
297
|
// Addresses
|
309
298
|
address {
|
310
299
|
margin-bottom: @line-height-computed;
|
@@ -7,13 +7,14 @@
|
|
7
7
|
//
|
8
8
|
//## Gray and brand colors for use across Bootstrap.
|
9
9
|
|
10
|
-
@gray-
|
11
|
-
@gray-
|
12
|
-
@gray:
|
13
|
-
@gray
|
14
|
-
@gray-
|
15
|
-
|
16
|
-
|
10
|
+
@gray-base: #000;
|
11
|
+
@gray-darker: lighten(@gray-base, 13.5%); // #222
|
12
|
+
@gray-dark: lighten(@gray-base, 20%); // #333
|
13
|
+
@gray: lighten(@gray-base, 33.5%); // #555
|
14
|
+
@gray-light: lighten(@gray-base, 46.7%); // #777
|
15
|
+
@gray-lighter: lighten(@gray-base, 93.5%); // #eee
|
16
|
+
|
17
|
+
@brand-primary: darken(#428bca, 6.5%);
|
17
18
|
@brand-success: #5cb85c;
|
18
19
|
@brand-info: #5bc0de;
|
19
20
|
@brand-warning: #f0ad4e;
|
@@ -33,6 +34,8 @@
|
|
33
34
|
@link-color: @brand-primary;
|
34
35
|
//** Link hover color set via `darken()` function.
|
35
36
|
@link-hover-color: darken(@link-color, 15%);
|
37
|
+
//** Link hover decoration.
|
38
|
+
@link-hover-decoration: underline;
|
36
39
|
|
37
40
|
|
38
41
|
//== Typography
|
@@ -181,13 +184,20 @@
|
|
181
184
|
@input-color: @gray;
|
182
185
|
//** `<input>` border color
|
183
186
|
@input-border: #ccc;
|
184
|
-
|
187
|
+
|
188
|
+
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
|
189
|
+
//** Default `.form-control` border radius
|
185
190
|
@input-border-radius: @border-radius-base;
|
191
|
+
//** Large `.form-control` border radius
|
192
|
+
@input-border-radius-large: @border-radius-large;
|
193
|
+
//** Small `.form-control` border radius
|
194
|
+
@input-border-radius-small: @border-radius-small;
|
195
|
+
|
186
196
|
//** Border color for inputs on focus
|
187
197
|
@input-border-focus: #66afe9;
|
188
198
|
|
189
199
|
//** Placeholder text color
|
190
|
-
@input-color-placeholder:
|
200
|
+
@input-color-placeholder: #999;
|
191
201
|
|
192
202
|
//** Default `.form-control` height
|
193
203
|
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
|
@@ -204,6 +214,9 @@
|
|
204
214
|
//** Border color for textual input addons
|
205
215
|
@input-group-addon-border-color: @input-border;
|
206
216
|
|
217
|
+
//** Disabled cursor for form controls and buttons.
|
218
|
+
@cursor-disabled: not-allowed;
|
219
|
+
|
207
220
|
|
208
221
|
//== Dropdowns
|
209
222
|
//
|
@@ -252,8 +265,7 @@
|
|
252
265
|
@zindex-popover: 1060;
|
253
266
|
@zindex-tooltip: 1070;
|
254
267
|
@zindex-navbar-fixed: 1030;
|
255
|
-
@zindex-modal
|
256
|
-
@zindex-modal: 1050;
|
268
|
+
@zindex-modal: 1040;
|
257
269
|
|
258
270
|
|
259
271
|
//== Media queries breakpoints
|
@@ -315,17 +327,17 @@
|
|
315
327
|
//## Define the maximum width of `.container` for different screen sizes.
|
316
328
|
|
317
329
|
// Small screen / tablet
|
318
|
-
@container-tablet: (
|
330
|
+
@container-tablet: (720px + @grid-gutter-width);
|
319
331
|
//** For `@screen-sm-min` and up.
|
320
332
|
@container-sm: @container-tablet;
|
321
333
|
|
322
334
|
// Medium screen / desktop
|
323
|
-
@container-desktop: (
|
335
|
+
@container-desktop: (940px + @grid-gutter-width);
|
324
336
|
//** For `@screen-md-min` and up.
|
325
337
|
@container-md: @container-desktop;
|
326
338
|
|
327
339
|
// Large screen / wide desktop
|
328
|
-
@container-large-desktop: (
|
340
|
+
@container-large-desktop: (1140px + @grid-gutter-width);
|
329
341
|
//** For `@screen-lg-min` and up.
|
330
342
|
@container-lg: @container-large-desktop;
|
331
343
|
|
@@ -368,12 +380,12 @@
|
|
368
380
|
|
369
381
|
// Inverted navbar
|
370
382
|
// Reset inverted navbar basics
|
371
|
-
@navbar-inverse-color: @gray-light;
|
383
|
+
@navbar-inverse-color: lighten(@gray-light, 15%);
|
372
384
|
@navbar-inverse-bg: #222;
|
373
385
|
@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
|
374
386
|
|
375
387
|
// Inverted navbar links
|
376
|
-
@navbar-inverse-link-color: @gray-light;
|
388
|
+
@navbar-inverse-link-color: lighten(@gray-light, 15%);
|
377
389
|
@navbar-inverse-link-hover-color: #fff;
|
378
390
|
@navbar-inverse-link-hover-bg: transparent;
|
379
391
|
@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
|
@@ -403,8 +415,6 @@
|
|
403
415
|
@nav-disabled-link-color: @gray-light;
|
404
416
|
@nav-disabled-link-hover-color: @gray-light;
|
405
417
|
|
406
|
-
@nav-open-link-hover-color: #fff;
|
407
|
-
|
408
418
|
//== Tabs
|
409
419
|
@nav-tabs-border-color: #ddd;
|
410
420
|
|
@@ -529,7 +539,7 @@
|
|
529
539
|
//** Popover arrow width
|
530
540
|
@popover-arrow-width: 10px;
|
531
541
|
//** Popover arrow color
|
532
|
-
@popover-arrow-color:
|
542
|
+
@popover-arrow-color: @popover-bg;
|
533
543
|
|
534
544
|
//** Popover outer arrow width
|
535
545
|
@popover-arrow-outer-width: (@popover-arrow-width + 1);
|
@@ -628,6 +638,8 @@
|
|
628
638
|
@progress-bg: #f5f5f5;
|
629
639
|
//** Progress bar text color
|
630
640
|
@progress-bar-color: #fff;
|
641
|
+
//** Variable for setting rounded corners on progress bar.
|
642
|
+
@progress-border-radius: @border-radius-base;
|
631
643
|
|
632
644
|
//** Default progress bar color
|
633
645
|
@progress-bar-bg: @brand-primary;
|
@@ -842,5 +854,3 @@
|
|
842
854
|
@dl-horizontal-offset: @component-offset-horizontal;
|
843
855
|
//** Horizontal line color.
|
844
856
|
@hr-border: @gray-lighter;
|
845
|
-
|
846
|
-
|
@@ -0,0 +1,17 @@
|
|
1
|
+
// Mincer asset helper functions
|
2
|
+
//
|
3
|
+
// This must be imported into a .css.ejs.scss file.
|
4
|
+
// Then, <% %>-interpolations will be parsed as strings by Sass, and evaluated by EJS after Sass compilation.
|
5
|
+
|
6
|
+
|
7
|
+
@function twbs-font-path($path) {
|
8
|
+
// do something like following
|
9
|
+
// from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>"
|
10
|
+
// from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>"
|
11
|
+
// or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>"
|
12
|
+
@return "<%- asset_path('#{$path}'.replace(/[#?].*$/, '')) + '#{$path}'.replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>";
|
13
|
+
}
|
14
|
+
|
15
|
+
@function twbs-image-path($file) {
|
16
|
+
@return "<%- asset_path('#{$file}') %>";
|
17
|
+
}
|
@@ -0,0 +1,50 @@
|
|
1
|
+
// Core variables and mixins
|
2
|
+
@import "bootstrap/variables";
|
3
|
+
@import "bootstrap/mixins";
|
4
|
+
|
5
|
+
// Reset and dependencies
|
6
|
+
@import "bootstrap/normalize";
|
7
|
+
@import "bootstrap/print";
|
8
|
+
@import "bootstrap/glyphicons";
|
9
|
+
|
10
|
+
// Core CSS
|
11
|
+
@import "bootstrap/scaffolding";
|
12
|
+
@import "bootstrap/type";
|
13
|
+
@import "bootstrap/code";
|
14
|
+
@import "bootstrap/grid";
|
15
|
+
@import "bootstrap/tables";
|
16
|
+
@import "bootstrap/forms";
|
17
|
+
@import "bootstrap/buttons";
|
18
|
+
|
19
|
+
// Components
|
20
|
+
@import "bootstrap/component-animations";
|
21
|
+
@import "bootstrap/dropdowns";
|
22
|
+
@import "bootstrap/button-groups";
|
23
|
+
@import "bootstrap/input-groups";
|
24
|
+
@import "bootstrap/navs";
|
25
|
+
@import "bootstrap/navbar";
|
26
|
+
@import "bootstrap/breadcrumbs";
|
27
|
+
@import "bootstrap/pagination";
|
28
|
+
@import "bootstrap/pager";
|
29
|
+
@import "bootstrap/labels";
|
30
|
+
@import "bootstrap/badges";
|
31
|
+
@import "bootstrap/jumbotron";
|
32
|
+
@import "bootstrap/thumbnails";
|
33
|
+
@import "bootstrap/alerts";
|
34
|
+
@import "bootstrap/progress-bars";
|
35
|
+
@import "bootstrap/media";
|
36
|
+
@import "bootstrap/list-group";
|
37
|
+
@import "bootstrap/panels";
|
38
|
+
@import "bootstrap/responsive-embed";
|
39
|
+
@import "bootstrap/wells";
|
40
|
+
@import "bootstrap/close";
|
41
|
+
|
42
|
+
// Components w/ JavaScript
|
43
|
+
@import "bootstrap/modals";
|
44
|
+
@import "bootstrap/tooltip";
|
45
|
+
@import "bootstrap/popovers";
|
46
|
+
@import "bootstrap/carousel";
|
47
|
+
|
48
|
+
// Utility classes
|
49
|
+
@import "bootstrap/utilities";
|
50
|
+
@import "bootstrap/responsive-utilities";
|
File without changes
|
@@ -36,11 +36,17 @@
|
|
36
36
|
// [converter] extracted a& to a.badge
|
37
37
|
|
38
38
|
// Account for badges in navs
|
39
|
-
|
39
|
+
.list-group-item.active > &,
|
40
40
|
.nav-pills > .active > a > & {
|
41
41
|
color: $badge-active-color;
|
42
42
|
background-color: $badge-active-bg;
|
43
43
|
}
|
44
|
+
.list-group-item > & {
|
45
|
+
float: right;
|
46
|
+
}
|
47
|
+
.list-group-item > & + & {
|
48
|
+
margin-right: 5px;
|
49
|
+
}
|
44
50
|
.nav-pills > li > a > & {
|
45
51
|
margin-left: 3px;
|
46
52
|
}
|
File without changes
|
@@ -18,10 +18,6 @@
|
|
18
18
|
&.active {
|
19
19
|
z-index: 2;
|
20
20
|
}
|
21
|
-
&:focus {
|
22
|
-
// Remove focus outline when dropdown JS adds it after closing the menu
|
23
|
-
outline: 0;
|
24
|
-
}
|
25
21
|
}
|
26
22
|
}
|
27
23
|
|
@@ -38,7 +34,7 @@
|
|
38
34
|
// Optional: Group multiple button groups together for a toolbar
|
39
35
|
.btn-toolbar {
|
40
36
|
margin-left: -5px; // Offset the first child's margin
|
41
|
-
@include clearfix
|
37
|
+
@include clearfix;
|
42
38
|
|
43
39
|
.btn-group,
|
44
40
|
.input-group {
|
@@ -156,7 +152,7 @@
|
|
156
152
|
|
157
153
|
// Clear floats so dropdown menus can be properly placed
|
158
154
|
> .btn-group {
|
159
|
-
@include clearfix
|
155
|
+
@include clearfix;
|
160
156
|
> .btn {
|
161
157
|
float: none;
|
162
158
|
}
|
@@ -198,7 +194,6 @@
|
|
198
194
|
}
|
199
195
|
|
200
196
|
|
201
|
-
|
202
197
|
// Justified button groups
|
203
198
|
// ----------------------
|
204
199
|
|
@@ -226,15 +221,23 @@
|
|
226
221
|
// Checkbox and radio options
|
227
222
|
//
|
228
223
|
// In order to support the browser's form validation feedback, powered by the
|
229
|
-
// `required` attribute, we have to "hide" the inputs via `
|
230
|
-
//
|
224
|
+
// `required` attribute, we have to "hide" the inputs via `clip`. We cannot use
|
225
|
+
// `display: none;` or `visibility: hidden;` as that also hides the popover.
|
226
|
+
// Simply visually hiding the inputs via `opacity` would leave them clickable in
|
227
|
+
// certain cases which is prevented by using `clip` and `pointer-events`.
|
231
228
|
// This way, we ensure a DOM element is visible to position the popover from.
|
232
229
|
//
|
233
|
-
// See https://github.com/twbs/bootstrap/pull/12794
|
230
|
+
// See https://github.com/twbs/bootstrap/pull/12794 and
|
231
|
+
// https://github.com/twbs/bootstrap/pull/14559 for more information.
|
234
232
|
|
235
|
-
[data-toggle="buttons"]
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
233
|
+
[data-toggle="buttons"] {
|
234
|
+
> .btn,
|
235
|
+
> .btn-group > .btn {
|
236
|
+
input[type="radio"],
|
237
|
+
input[type="checkbox"] {
|
238
|
+
position: absolute;
|
239
|
+
clip: rect(0,0,0,0);
|
240
|
+
pointer-events: none;
|
241
|
+
}
|
242
|
+
}
|
240
243
|
}
|
@@ -12,6 +12,7 @@
|
|
12
12
|
font-weight: $btn-font-weight;
|
13
13
|
text-align: center;
|
14
14
|
vertical-align: middle;
|
15
|
+
touch-action: manipulation;
|
15
16
|
cursor: pointer;
|
16
17
|
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
17
18
|
border: 1px solid transparent;
|
@@ -22,13 +23,15 @@
|
|
22
23
|
&,
|
23
24
|
&:active,
|
24
25
|
&.active {
|
25
|
-
&:focus
|
26
|
-
|
26
|
+
&:focus,
|
27
|
+
&.focus {
|
28
|
+
@include tab-focus;
|
27
29
|
}
|
28
30
|
}
|
29
31
|
|
30
32
|
&:hover,
|
31
|
-
&:focus
|
33
|
+
&:focus,
|
34
|
+
&.focus {
|
32
35
|
color: $btn-default-color;
|
33
36
|
text-decoration: none;
|
34
37
|
}
|
@@ -43,7 +46,7 @@
|
|
43
46
|
&.disabled,
|
44
47
|
&[disabled],
|
45
48
|
fieldset[disabled] & {
|
46
|
-
cursor:
|
49
|
+
cursor: $cursor-disabled;
|
47
50
|
pointer-events: none; // Future-proof disabling of clicks
|
48
51
|
@include opacity(.65);
|
49
52
|
@include box-shadow(none);
|
@@ -85,11 +88,11 @@
|
|
85
88
|
.btn-link {
|
86
89
|
color: $link-color;
|
87
90
|
font-weight: normal;
|
88
|
-
cursor: pointer;
|
89
91
|
border-radius: 0;
|
90
92
|
|
91
93
|
&,
|
92
94
|
&:active,
|
95
|
+
&.active,
|
93
96
|
&[disabled],
|
94
97
|
fieldset[disabled] & {
|
95
98
|
background-color: transparent;
|