bootstrap-generators 3.1.0 → 3.1.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 +3 -8
- data/Rakefile +4 -5
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +25 -23
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +25 -23
- data/readme-template.md.erb +1 -6
- data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +47 -47
- data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/vendor/assets/javascripts/bootstrap/affix.js +1 -1
- data/vendor/assets/javascripts/bootstrap/alert.js +1 -1
- data/vendor/assets/javascripts/bootstrap/button.js +1 -1
- data/vendor/assets/javascripts/bootstrap/carousel.js +1 -1
- data/vendor/assets/javascripts/bootstrap/collapse.js +1 -1
- data/vendor/assets/javascripts/bootstrap/dropdown.js +1 -1
- data/vendor/assets/javascripts/bootstrap/modal.js +1 -1
- data/vendor/assets/javascripts/bootstrap/popover.js +1 -1
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +1 -1
- data/vendor/assets/javascripts/bootstrap/tab.js +1 -1
- data/vendor/assets/javascripts/bootstrap/tooltip.js +1 -1
- data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
- data/vendor/assets/stylesheets/bootstrap.css +245 -291
- data/vendor/twitter/bootstrap/less/button-groups.less +3 -3
- data/vendor/twitter/bootstrap/less/buttons.less +6 -2
- data/vendor/twitter/bootstrap/less/carousel.less +3 -3
- data/vendor/twitter/bootstrap/less/forms.less +22 -3
- data/vendor/twitter/bootstrap/less/grid.less +4 -20
- data/vendor/twitter/bootstrap/less/input-groups.less +5 -0
- data/vendor/twitter/bootstrap/less/mixins.less +18 -15
- data/vendor/twitter/bootstrap/less/modals.less +3 -2
- data/vendor/twitter/bootstrap/less/navbar.less +1 -1
- data/vendor/twitter/bootstrap/less/panels.less +54 -43
- data/vendor/twitter/bootstrap/less/popovers.less +11 -11
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +6 -7
- data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
- data/vendor/twitter/bootstrap/less/type.less +2 -5
- data/vendor/twitter/bootstrap/less/variables.less +25 -23
- data/vendor/twitter/bootstrap/sass/_buttons.scss +6 -2
- data/vendor/twitter/bootstrap/sass/_carousel.scss +2 -2
- data/vendor/twitter/bootstrap/sass/_forms.scss +22 -3
- data/vendor/twitter/bootstrap/sass/_grid.scss +4 -20
- data/vendor/twitter/bootstrap/sass/_input-groups.scss +5 -0
- data/vendor/twitter/bootstrap/sass/_mixins.scss +50 -34
- data/vendor/twitter/bootstrap/sass/_modals.scss +3 -2
- data/vendor/twitter/bootstrap/sass/_navbar.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_panels.scss +54 -43
- data/vendor/twitter/bootstrap/sass/_popovers.scss +11 -11
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +1 -7
- data/vendor/twitter/bootstrap/sass/_thumbnails.scss +4 -4
- data/vendor/twitter/bootstrap/sass/_type.scss +21 -33
- data/vendor/twitter/bootstrap/sass/_variables.scss +25 -23
- metadata +2 -2
@@ -121,7 +121,6 @@
|
|
121
121
|
|
122
122
|
// Scale up the modal
|
123
123
|
@media (min-width: $screen-sm-min) {
|
124
|
-
|
125
124
|
// Automatically set modal's width for larger viewports
|
126
125
|
.modal-dialog {
|
127
126
|
width: $modal-md;
|
@@ -133,6 +132,8 @@
|
|
133
132
|
|
134
133
|
// Modal sizes
|
135
134
|
.modal-sm { width: $modal-sm; }
|
136
|
-
|
135
|
+
}
|
137
136
|
|
137
|
+
@media (min-width: $screen-md-min) {
|
138
|
+
.modal-lg { width: $modal-lg; }
|
138
139
|
}
|
@@ -18,6 +18,37 @@
|
|
18
18
|
@include clearfix();
|
19
19
|
}
|
20
20
|
|
21
|
+
// Optional heading
|
22
|
+
.panel-heading {
|
23
|
+
padding: 10px 15px;
|
24
|
+
border-bottom: 1px solid transparent;
|
25
|
+
@include border-top-radius(($panel-border-radius - 1));
|
26
|
+
|
27
|
+
> .dropdown .dropdown-toggle {
|
28
|
+
color: inherit;
|
29
|
+
}
|
30
|
+
}
|
31
|
+
|
32
|
+
// Within heading, strip any `h*` tag of its default margins for spacing.
|
33
|
+
.panel-title {
|
34
|
+
margin-top: 0;
|
35
|
+
margin-bottom: 0;
|
36
|
+
font-size: ceil(($font-size-base * 1.125));
|
37
|
+
color: inherit;
|
38
|
+
|
39
|
+
> a {
|
40
|
+
color: inherit;
|
41
|
+
}
|
42
|
+
}
|
43
|
+
|
44
|
+
// Optional footer (stays gray in every modifier class)
|
45
|
+
.panel-footer {
|
46
|
+
padding: 10px 15px;
|
47
|
+
background-color: $panel-footer-bg;
|
48
|
+
border-top: 1px solid $panel-inner-border;
|
49
|
+
@include border-bottom-radius(($panel-border-radius - 1));
|
50
|
+
}
|
51
|
+
|
21
52
|
|
22
53
|
// List groups in panels
|
23
54
|
//
|
@@ -27,25 +58,23 @@
|
|
27
58
|
.panel {
|
28
59
|
> .list-group {
|
29
60
|
margin-bottom: 0;
|
61
|
+
|
30
62
|
.list-group-item {
|
31
63
|
border-width: 1px 0;
|
32
64
|
border-radius: 0;
|
33
|
-
&:first-child {
|
34
|
-
border-top: 0;
|
35
|
-
}
|
36
|
-
&:last-child {
|
37
|
-
border-bottom: 0;
|
38
|
-
}
|
39
65
|
}
|
66
|
+
|
40
67
|
// Add border top radius for first one
|
41
68
|
&:first-child {
|
42
69
|
.list-group-item:first-child {
|
70
|
+
border-top: 0;
|
43
71
|
@include border-top-radius(($panel-border-radius - 1));
|
44
72
|
}
|
45
73
|
}
|
46
74
|
// Add border bottom radius for last one
|
47
75
|
&:last-child {
|
48
76
|
.list-group-item:last-child {
|
77
|
+
border-bottom: 0;
|
49
78
|
@include border-bottom-radius(($panel-border-radius - 1));
|
50
79
|
}
|
51
80
|
}
|
@@ -72,6 +101,8 @@
|
|
72
101
|
// Add border top radius for first one
|
73
102
|
> .table:first-child,
|
74
103
|
> .table-responsive:first-child > .table:first-child {
|
104
|
+
@include border-top-radius(($panel-border-radius - 1));
|
105
|
+
|
75
106
|
> thead:first-child,
|
76
107
|
> tbody:first-child {
|
77
108
|
> tr:first-child {
|
@@ -89,6 +120,8 @@
|
|
89
120
|
// Add border bottom radius for last one
|
90
121
|
> .table:last-child,
|
91
122
|
> .table-responsive:last-child > .table:last-child {
|
123
|
+
@include border-bottom-radius(($panel-border-radius - 1));
|
124
|
+
|
92
125
|
> tbody:last-child,
|
93
126
|
> tfoot:last-child {
|
94
127
|
> tr:last-child {
|
@@ -126,12 +159,22 @@
|
|
126
159
|
> td:last-child {
|
127
160
|
border-right: 0;
|
128
161
|
}
|
129
|
-
|
130
|
-
|
131
|
-
|
162
|
+
}
|
163
|
+
}
|
164
|
+
> thead,
|
165
|
+
> tbody {
|
166
|
+
> tr:first-child {
|
167
|
+
> td,
|
168
|
+
> th {
|
169
|
+
border-bottom: 0;
|
132
170
|
}
|
133
|
-
|
134
|
-
|
171
|
+
}
|
172
|
+
}
|
173
|
+
> tbody,
|
174
|
+
> tfoot {
|
175
|
+
> tr:last-child {
|
176
|
+
> td,
|
177
|
+
> th {
|
135
178
|
border-bottom: 0;
|
136
179
|
}
|
137
180
|
}
|
@@ -144,38 +187,6 @@
|
|
144
187
|
}
|
145
188
|
|
146
189
|
|
147
|
-
// Optional heading
|
148
|
-
.panel-heading {
|
149
|
-
padding: 10px 15px;
|
150
|
-
border-bottom: 1px solid transparent;
|
151
|
-
@include border-top-radius(($panel-border-radius - 1));
|
152
|
-
|
153
|
-
> .dropdown .dropdown-toggle {
|
154
|
-
color: inherit;
|
155
|
-
}
|
156
|
-
}
|
157
|
-
|
158
|
-
// Within heading, strip any `h*` tag of its default margins for spacing.
|
159
|
-
.panel-title {
|
160
|
-
margin-top: 0;
|
161
|
-
margin-bottom: 0;
|
162
|
-
font-size: ceil(($font-size-base * 1.125));
|
163
|
-
color: inherit;
|
164
|
-
|
165
|
-
> a {
|
166
|
-
color: inherit;
|
167
|
-
}
|
168
|
-
}
|
169
|
-
|
170
|
-
// Optional footer (stays gray in every modifier class)
|
171
|
-
.panel-footer {
|
172
|
-
padding: 10px 15px;
|
173
|
-
background-color: $panel-footer-bg;
|
174
|
-
border-top: 1px solid $panel-inner-border;
|
175
|
-
@include border-bottom-radius(($panel-border-radius - 1));
|
176
|
-
}
|
177
|
-
|
178
|
-
|
179
190
|
// Collapsable panels (aka, accordion)
|
180
191
|
//
|
181
192
|
// Wrap a series of panels in `.panel-group` to turn them into an accordion with
|
@@ -23,10 +23,10 @@
|
|
23
23
|
white-space: normal;
|
24
24
|
|
25
25
|
// Offset the popover to account for the popover arrow
|
26
|
-
&.top { margin-top: -
|
27
|
-
&.right { margin-left:
|
28
|
-
&.bottom { margin-top:
|
29
|
-
&.left { margin-left: -
|
26
|
+
&.top { margin-top: -$popover-arrow-width; }
|
27
|
+
&.right { margin-left: $popover-arrow-width; }
|
28
|
+
&.bottom { margin-top: $popover-arrow-width; }
|
29
|
+
&.left { margin-left: -$popover-arrow-width; }
|
30
30
|
}
|
31
31
|
|
32
32
|
.popover-title {
|
@@ -48,7 +48,7 @@
|
|
48
48
|
//
|
49
49
|
// .arrow is outer, .arrow:after is inner
|
50
50
|
|
51
|
-
.popover .arrow {
|
51
|
+
.popover > .arrow {
|
52
52
|
&,
|
53
53
|
&:after {
|
54
54
|
position: absolute;
|
@@ -59,16 +59,16 @@
|
|
59
59
|
border-style: solid;
|
60
60
|
}
|
61
61
|
}
|
62
|
-
.popover .arrow {
|
62
|
+
.popover > .arrow {
|
63
63
|
border-width: $popover-arrow-outer-width;
|
64
64
|
}
|
65
|
-
.popover .arrow:after {
|
65
|
+
.popover > .arrow:after {
|
66
66
|
border-width: $popover-arrow-width;
|
67
67
|
content: "";
|
68
68
|
}
|
69
69
|
|
70
70
|
.popover {
|
71
|
-
&.top .arrow {
|
71
|
+
&.top > .arrow {
|
72
72
|
left: 50%;
|
73
73
|
margin-left: -$popover-arrow-outer-width;
|
74
74
|
border-bottom-width: 0;
|
@@ -83,7 +83,7 @@
|
|
83
83
|
border-top-color: $popover-arrow-color;
|
84
84
|
}
|
85
85
|
}
|
86
|
-
&.right .arrow {
|
86
|
+
&.right > .arrow {
|
87
87
|
top: 50%;
|
88
88
|
left: -$popover-arrow-outer-width;
|
89
89
|
margin-top: -$popover-arrow-outer-width;
|
@@ -98,7 +98,7 @@
|
|
98
98
|
border-right-color: $popover-arrow-color;
|
99
99
|
}
|
100
100
|
}
|
101
|
-
&.bottom .arrow {
|
101
|
+
&.bottom > .arrow {
|
102
102
|
left: 50%;
|
103
103
|
margin-left: -$popover-arrow-outer-width;
|
104
104
|
border-top-width: 0;
|
@@ -114,7 +114,7 @@
|
|
114
114
|
}
|
115
115
|
}
|
116
116
|
|
117
|
-
&.left .arrow {
|
117
|
+
&.left > .arrow {
|
118
118
|
top: 50%;
|
119
119
|
right: -$popover-arrow-outer-width;
|
120
120
|
margin-top: -$popover-arrow-outer-width;
|
@@ -24,26 +24,20 @@
|
|
24
24
|
|
25
25
|
// Visibility utilities
|
26
26
|
|
27
|
-
@include responsive-invisibility('.visible-xs');
|
27
|
+
@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
|
28
28
|
|
29
29
|
@media (max-width: $screen-xs-max) {
|
30
30
|
@include responsive-visibility('.visible-xs');
|
31
31
|
}
|
32
32
|
|
33
|
-
@include responsive-invisibility('.visible-sm');
|
34
|
-
|
35
33
|
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
36
34
|
@include responsive-visibility('.visible-sm');
|
37
35
|
}
|
38
36
|
|
39
|
-
@include responsive-invisibility('.visible-md');
|
40
|
-
|
41
37
|
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
42
38
|
@include responsive-visibility('.visible-md');
|
43
39
|
}
|
44
40
|
|
45
|
-
@include responsive-invisibility('.visible-lg');
|
46
|
-
|
47
41
|
@media (min-width: $screen-lg-min) {
|
48
42
|
@include responsive-visibility('.visible-lg');
|
49
43
|
}
|
@@ -21,10 +21,7 @@
|
|
21
21
|
margin-right: auto;
|
22
22
|
}
|
23
23
|
|
24
|
-
//
|
25
|
-
a:hover,
|
26
|
-
a:focus,
|
27
|
-
// [converter] extracted a&.active to a.thumbnail.active
|
24
|
+
// [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
|
28
25
|
|
29
26
|
// Image captions
|
30
27
|
.caption {
|
@@ -33,6 +30,9 @@
|
|
33
30
|
}
|
34
31
|
}
|
35
32
|
|
33
|
+
// Add a hover state for linked versions only
|
34
|
+
a.thumbnail:hover,
|
35
|
+
a.thumbnail:focus,
|
36
36
|
a.thumbnail.active {
|
37
37
|
border-color: $link-color;
|
38
38
|
}
|
@@ -91,21 +91,16 @@ cite { font-style: normal; }
|
|
91
91
|
.text-muted {
|
92
92
|
color: $text-muted;
|
93
93
|
}
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
.text-success
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
.text-
|
104
|
-
@include text-emphasis-variant($state-warning-text);
|
105
|
-
}
|
106
|
-
.text-danger {
|
107
|
-
@include text-emphasis-variant($state-danger-text);
|
108
|
-
}
|
94
|
+
|
95
|
+
@include text-emphasis-variant('.text-primary', $brand-primary);
|
96
|
+
|
97
|
+
@include text-emphasis-variant('.text-success', $state-success-text);
|
98
|
+
|
99
|
+
@include text-emphasis-variant('.text-info', $state-info-text);
|
100
|
+
|
101
|
+
@include text-emphasis-variant('.text-warning', $state-warning-text);
|
102
|
+
|
103
|
+
@include text-emphasis-variant('.text-danger', $state-danger-text);
|
109
104
|
|
110
105
|
// Contextual backgrounds
|
111
106
|
// For now we'll leave these alongside the text classes until v4 when we can
|
@@ -114,20 +109,16 @@ cite { font-style: normal; }
|
|
114
109
|
// Given the contrast here, this is the only class to have its color inverted
|
115
110
|
// automatically.
|
116
111
|
color: #fff;
|
117
|
-
@include bg-variant($brand-primary);
|
118
|
-
}
|
119
|
-
.bg-success {
|
120
|
-
@include bg-variant($state-success-bg);
|
121
|
-
}
|
122
|
-
.bg-info {
|
123
|
-
@include bg-variant($state-info-bg);
|
124
|
-
}
|
125
|
-
.bg-warning {
|
126
|
-
@include bg-variant($state-warning-bg);
|
127
|
-
}
|
128
|
-
.bg-danger {
|
129
|
-
@include bg-variant($state-danger-bg);
|
130
112
|
}
|
113
|
+
@include bg-variant('.bg-primary', $brand-primary);
|
114
|
+
|
115
|
+
@include bg-variant('.bg-success', $state-success-bg);
|
116
|
+
|
117
|
+
@include bg-variant('.bg-info', $state-info-bg);
|
118
|
+
|
119
|
+
@include bg-variant('.bg-warning', $state-warning-bg);
|
120
|
+
|
121
|
+
@include bg-variant('.bg-danger', $state-danger-bg);
|
131
122
|
|
132
123
|
|
133
124
|
// Page header
|
@@ -165,15 +156,12 @@ ol {
|
|
165
156
|
// Inline turns list items into inline-block
|
166
157
|
.list-inline {
|
167
158
|
@extend .list-unstyled;
|
159
|
+
margin-left: -5px;
|
168
160
|
|
169
161
|
> li {
|
170
162
|
display: inline-block;
|
171
163
|
padding-left: 5px;
|
172
164
|
padding-right: 5px;
|
173
|
-
|
174
|
-
&:first-child {
|
175
|
-
padding-left: 0;
|
176
|
-
}
|
177
165
|
}
|
178
166
|
}
|
179
167
|
|
@@ -233,7 +221,7 @@ abbr[data-original-title] {
|
|
233
221
|
blockquote {
|
234
222
|
padding: ($line-height-computed / 2) $line-height-computed;
|
235
223
|
margin: 0 0 $line-height-computed;
|
236
|
-
font-size:
|
224
|
+
font-size: $blockquote-font-size;
|
237
225
|
border-left: 5px solid $blockquote-border-color;
|
238
226
|
|
239
227
|
p,
|
@@ -78,7 +78,7 @@ $headings-color: inherit !default;
|
|
78
78
|
|
79
79
|
$icon-font-path: "bootstrap/" !default;
|
80
80
|
$icon-font-name: "glyphicons-halflings-regular" !default;
|
81
|
-
$icon-font-svg-id:
|
81
|
+
$icon-font-svg-id: "glyphicons_halflingsregular" !default;
|
82
82
|
|
83
83
|
//== Components
|
84
84
|
//
|
@@ -305,6 +305,26 @@ $grid-float-breakpoint: $screen-sm-min !default;
|
|
305
305
|
$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
|
306
306
|
|
307
307
|
|
308
|
+
//== Container sizes
|
309
|
+
//
|
310
|
+
//## Define the maximum width of `.container` for different screen sizes.
|
311
|
+
|
312
|
+
// Small screen / tablet
|
313
|
+
$container-tablet: ((720px + $grid-gutter-width)) !default;
|
314
|
+
//** For `$screen-sm-min` and up.
|
315
|
+
$container-sm: $container-tablet !default;
|
316
|
+
|
317
|
+
// Medium screen / desktop
|
318
|
+
$container-desktop: ((940px + $grid-gutter-width)) !default;
|
319
|
+
//** For `$screen-md-min` and up.
|
320
|
+
$container-md: $container-desktop !default;
|
321
|
+
|
322
|
+
// Large screen / wide desktop
|
323
|
+
$container-large-desktop: ((1140px + $grid-gutter-width)) !default;
|
324
|
+
//** For `$screen-lg-min` and up.
|
325
|
+
$container-lg: $container-large-desktop !default;
|
326
|
+
|
327
|
+
|
308
328
|
//== Navbar
|
309
329
|
//
|
310
330
|
//##
|
@@ -509,9 +529,9 @@ $popover-arrow-color: #fff !default;
|
|
509
529
|
//** Popover outer arrow width
|
510
530
|
$popover-arrow-outer-width: ($popover-arrow-width + 1) !default;
|
511
531
|
//** Popover outer arrow color
|
512
|
-
$popover-arrow-outer-color:
|
532
|
+
$popover-arrow-outer-color: fadein($popover-border-color, 5%) !default;
|
513
533
|
//** Popover outer arrow fallback color
|
514
|
-
$popover-arrow-outer-fallback-color:
|
534
|
+
$popover-arrow-outer-fallback-color: darken($popover-fallback-border-color, 20%) !default;
|
515
535
|
|
516
536
|
|
517
537
|
//== Labels
|
@@ -794,6 +814,8 @@ $abbr-border-color: $gray-light !default;
|
|
794
814
|
$headings-small-color: $gray-light !default;
|
795
815
|
//** Blockquote small color
|
796
816
|
$blockquote-small-color: $gray-light !default;
|
817
|
+
//** Blockquote font size
|
818
|
+
$blockquote-font-size: ($font-size-base * 1.25) !default;
|
797
819
|
//** Blockquote border color
|
798
820
|
$blockquote-border-color: $gray-lighter !default;
|
799
821
|
//** Page header border color
|
@@ -809,23 +831,3 @@ $hr-border: $gray-lighter !default;
|
|
809
831
|
|
810
832
|
//** Horizontal offset for forms and lists.
|
811
833
|
$component-offset-horizontal: 180px !default;
|
812
|
-
|
813
|
-
|
814
|
-
//== Container sizes
|
815
|
-
//
|
816
|
-
//## Define the maximum width of `.container` for different screen sizes.
|
817
|
-
|
818
|
-
// Small screen / tablet
|
819
|
-
$container-tablet: ((720px + $grid-gutter-width)) !default;
|
820
|
-
//** For `$screen-sm-min` and up.
|
821
|
-
$container-sm: $container-tablet !default;
|
822
|
-
|
823
|
-
// Medium screen / desktop
|
824
|
-
$container-desktop: ((940px + $grid-gutter-width)) !default;
|
825
|
-
//** For `$screen-md-min` and up.
|
826
|
-
$container-md: $container-desktop !default;
|
827
|
-
|
828
|
-
// Large screen / wide desktop
|
829
|
-
$container-large-desktop: ((1140px + $grid-gutter-width)) !default;
|
830
|
-
//** For `$screen-lg-min` and up.
|
831
|
-
$container-lg: $container-large-desktop !default;
|