bootstrap-generators 3.1.1.3 → 3.2.0
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 +4 -4
- data/.travis.yml +4 -5
- data/README.md +8 -8
- data/Rakefile +7 -5
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +40 -23
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +41 -24
- data/vendor/assets/javascripts/bootstrap.js +6 -6
- data/vendor/assets/javascripts/bootstrap/affix.js +19 -14
- data/vendor/assets/javascripts/bootstrap/alert.js +10 -6
- data/vendor/assets/javascripts/bootstrap/button.js +11 -8
- data/vendor/assets/javascripts/bootstrap/carousel.js +49 -31
- data/vendor/assets/javascripts/bootstrap/collapse.js +22 -22
- data/vendor/assets/javascripts/bootstrap/dropdown.js +17 -13
- data/vendor/assets/javascripts/bootstrap/modal.js +66 -29
- data/vendor/assets/javascripts/bootstrap/popover.js +10 -7
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +40 -23
- data/vendor/assets/javascripts/bootstrap/tab.js +11 -8
- data/vendor/assets/javascripts/bootstrap/tooltip.js +115 -57
- data/vendor/assets/javascripts/bootstrap/transition.js +18 -7
- data/vendor/assets/stylesheets/bootstrap.css.erb +2740 -2322
- data/vendor/twitter/bootstrap/less/alerts.less +4 -3
- data/vendor/twitter/bootstrap/less/badges.less +18 -18
- data/vendor/twitter/bootstrap/less/bootstrap.less +3 -2
- data/vendor/twitter/bootstrap/less/button-groups.less +16 -2
- data/vendor/twitter/bootstrap/less/buttons.less +0 -2
- data/vendor/twitter/bootstrap/less/carousel.less +15 -4
- data/vendor/twitter/bootstrap/less/code.less +6 -1
- data/vendor/twitter/bootstrap/less/component-animations.less +6 -4
- data/vendor/twitter/bootstrap/less/dropdowns.less +2 -0
- data/vendor/twitter/bootstrap/less/forms.less +144 -42
- data/vendor/twitter/bootstrap/less/glyphicons.less +5 -5
- data/vendor/twitter/bootstrap/less/input-groups.less +6 -2
- data/vendor/twitter/bootstrap/less/jumbotron.less +4 -0
- data/vendor/twitter/bootstrap/less/labels.less +1 -1
- data/vendor/twitter/bootstrap/less/list-group.less +22 -1
- data/vendor/twitter/bootstrap/less/mixins.less +35 -925
- data/vendor/twitter/bootstrap/less/mixins/alerts.less +14 -0
- data/vendor/twitter/bootstrap/less/mixins/background-variant.less +8 -0
- data/vendor/twitter/bootstrap/less/mixins/border-radius.less +18 -0
- data/vendor/twitter/bootstrap/less/mixins/buttons.less +50 -0
- data/vendor/twitter/bootstrap/less/mixins/center-block.less +7 -0
- data/vendor/twitter/bootstrap/less/mixins/clearfix.less +22 -0
- data/vendor/twitter/bootstrap/less/mixins/forms.less +81 -0
- data/vendor/twitter/bootstrap/less/mixins/gradients.less +59 -0
- data/vendor/twitter/bootstrap/less/mixins/grid-framework.less +91 -0
- data/vendor/twitter/bootstrap/less/mixins/grid.less +122 -0
- data/vendor/twitter/bootstrap/less/mixins/hide-text.less +21 -0
- data/vendor/twitter/bootstrap/less/mixins/image.less +34 -0
- data/vendor/twitter/bootstrap/less/mixins/labels.less +12 -0
- data/vendor/twitter/bootstrap/less/mixins/list-group.less +29 -0
- data/vendor/twitter/bootstrap/less/mixins/nav-divider.less +10 -0
- data/vendor/twitter/bootstrap/less/mixins/nav-vertical-align.less +9 -0
- data/vendor/twitter/bootstrap/less/mixins/opacity.less +8 -0
- data/vendor/twitter/bootstrap/less/mixins/pagination.less +23 -0
- data/vendor/twitter/bootstrap/less/mixins/panels.less +24 -0
- data/vendor/twitter/bootstrap/less/mixins/progress-bar.less +10 -0
- data/vendor/twitter/bootstrap/less/mixins/reset-filter.less +8 -0
- data/vendor/twitter/bootstrap/less/mixins/resize.less +6 -0
- data/vendor/twitter/bootstrap/less/mixins/responsive-visibility.less +15 -0
- data/vendor/twitter/bootstrap/less/mixins/size.less +10 -0
- data/vendor/twitter/bootstrap/less/mixins/tab-focus.less +9 -0
- data/vendor/twitter/bootstrap/less/mixins/table-row.less +28 -0
- data/vendor/twitter/bootstrap/less/mixins/text-emphasis.less +8 -0
- data/vendor/twitter/bootstrap/less/mixins/text-overflow.less +8 -0
- data/vendor/twitter/bootstrap/less/mixins/vendor-prefixes.less +224 -0
- data/vendor/twitter/bootstrap/less/modals.less +18 -7
- data/vendor/twitter/bootstrap/less/navbar.less +41 -2
- data/vendor/twitter/bootstrap/less/navs.less +1 -1
- data/vendor/twitter/bootstrap/less/normalize.less +20 -18
- data/vendor/twitter/bootstrap/less/panels.less +8 -6
- data/vendor/twitter/bootstrap/less/popovers.less +1 -1
- data/vendor/twitter/bootstrap/less/progress-bars.less +27 -2
- data/vendor/twitter/bootstrap/less/responsive-embed.less +34 -0
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +103 -1
- data/vendor/twitter/bootstrap/less/scaffolding.less +17 -1
- data/vendor/twitter/bootstrap/less/tables.less +4 -4
- data/vendor/twitter/bootstrap/less/theme.less +11 -0
- data/vendor/twitter/bootstrap/less/type.less +32 -12
- data/vendor/twitter/bootstrap/less/utilities.less +1 -0
- data/vendor/twitter/bootstrap/less/variables.less +40 -23
- data/vendor/twitter/bootstrap/sass/_alerts.scss +4 -3
- data/vendor/twitter/bootstrap/sass/_badges.scss +13 -11
- data/vendor/twitter/bootstrap/sass/_button-groups.scss +16 -2
- data/vendor/twitter/bootstrap/sass/_buttons.scss +0 -2
- data/vendor/twitter/bootstrap/sass/_carousel.scss +15 -4
- data/vendor/twitter/bootstrap/sass/_code.scss +6 -1
- data/vendor/twitter/bootstrap/sass/_component-animations.scss +10 -4
- data/vendor/twitter/bootstrap/sass/_dropdowns.scss +2 -0
- data/vendor/twitter/bootstrap/sass/_forms.scss +144 -42
- data/vendor/twitter/bootstrap/sass/_glyphicons.scss +4 -0
- data/vendor/twitter/bootstrap/sass/_input-groups.scss +6 -2
- data/vendor/twitter/bootstrap/sass/_jumbotron.scss +4 -0
- data/vendor/twitter/bootstrap/sass/_labels.scss +11 -9
- data/vendor/twitter/bootstrap/sass/_list-group.scss +22 -1
- data/vendor/twitter/bootstrap/sass/_mixins.scss +35 -943
- data/vendor/twitter/bootstrap/sass/_modals.scss +18 -7
- data/vendor/twitter/bootstrap/sass/_navbar.scss +41 -2
- data/vendor/twitter/bootstrap/sass/_navs.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_normalize.scss +20 -18
- data/vendor/twitter/bootstrap/sass/_panels.scss +8 -6
- data/vendor/twitter/bootstrap/sass/_popovers.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_progress-bars.scss +27 -2
- data/vendor/twitter/bootstrap/sass/_responsive-embed.scss +34 -0
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +101 -1
- data/vendor/twitter/bootstrap/sass/_scaffolding.scss +17 -1
- data/vendor/twitter/bootstrap/sass/_tables.scss +4 -4
- data/vendor/twitter/bootstrap/sass/_theme.scss +11 -0
- data/vendor/twitter/bootstrap/sass/_type.scss +32 -12
- data/vendor/twitter/bootstrap/sass/_utilities.scss +1 -0
- data/vendor/twitter/bootstrap/sass/_variables.scss +41 -24
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +3 -2
- data/vendor/twitter/bootstrap/sass/mixins/_alerts.scss +14 -0
- data/vendor/twitter/bootstrap/sass/mixins/_background-variant.scss +11 -0
- data/vendor/twitter/bootstrap/sass/mixins/_border-radius.scss +18 -0
- data/vendor/twitter/bootstrap/sass/mixins/_buttons.scss +50 -0
- data/vendor/twitter/bootstrap/sass/mixins/_center-block.scss +7 -0
- data/vendor/twitter/bootstrap/sass/mixins/_clearfix.scss +22 -0
- data/vendor/twitter/bootstrap/sass/mixins/_forms.scss +84 -0
- data/vendor/twitter/bootstrap/sass/mixins/_gradients.scss +58 -0
- data/vendor/twitter/bootstrap/sass/mixins/_grid-framework.scss +81 -0
- data/vendor/twitter/bootstrap/sass/mixins/_grid.scss +122 -0
- data/vendor/twitter/bootstrap/sass/mixins/_hide-text.scss +21 -0
- data/vendor/twitter/bootstrap/sass/mixins/_image.scss +34 -0
- data/vendor/twitter/bootstrap/sass/mixins/_labels.scss +12 -0
- data/vendor/twitter/bootstrap/sass/mixins/_list-group.scss +31 -0
- data/vendor/twitter/bootstrap/sass/mixins/_nav-divider.scss +10 -0
- data/vendor/twitter/bootstrap/sass/mixins/_nav-vertical-align.scss +9 -0
- data/vendor/twitter/bootstrap/sass/mixins/_opacity.scss +8 -0
- data/vendor/twitter/bootstrap/sass/mixins/_pagination.scss +23 -0
- data/vendor/twitter/bootstrap/sass/mixins/_panels.scss +24 -0
- data/vendor/twitter/bootstrap/sass/mixins/_progress-bar.scss +10 -0
- data/vendor/twitter/bootstrap/sass/mixins/_reset-filter.scss +8 -0
- data/vendor/twitter/bootstrap/sass/mixins/_resize.scss +6 -0
- data/vendor/twitter/bootstrap/sass/mixins/_responsive-visibility.scss +21 -0
- data/vendor/twitter/bootstrap/sass/mixins/_size.scss +10 -0
- data/vendor/twitter/bootstrap/sass/mixins/_tab-focus.scss +9 -0
- data/vendor/twitter/bootstrap/sass/mixins/_table-row.scss +28 -0
- data/vendor/twitter/bootstrap/sass/mixins/_text-emphasis.scss +11 -0
- data/vendor/twitter/bootstrap/sass/mixins/_text-overflow.scss +8 -0
- data/vendor/twitter/bootstrap/sass/mixins/_vendor-prefixes.scss +219 -0
- metadata +62 -2
|
@@ -28,7 +28,9 @@
|
|
|
28
28
|
|
|
29
29
|
> .active,
|
|
30
30
|
> .next,
|
|
31
|
-
> .prev {
|
|
31
|
+
> .prev {
|
|
32
|
+
display: block;
|
|
33
|
+
}
|
|
32
34
|
|
|
33
35
|
> .active {
|
|
34
36
|
left: 0;
|
|
@@ -91,7 +93,7 @@
|
|
|
91
93
|
// Hover/focus state
|
|
92
94
|
&:hover,
|
|
93
95
|
&:focus {
|
|
94
|
-
outline:
|
|
96
|
+
outline: 0;
|
|
95
97
|
color: $carousel-control-color;
|
|
96
98
|
text-decoration: none;
|
|
97
99
|
@include opacity(.9);
|
|
@@ -110,20 +112,22 @@
|
|
|
110
112
|
.icon-prev,
|
|
111
113
|
.glyphicon-chevron-left {
|
|
112
114
|
left: 50%;
|
|
115
|
+
margin-left: -10px;
|
|
113
116
|
}
|
|
114
117
|
.icon-next,
|
|
115
118
|
.glyphicon-chevron-right {
|
|
116
119
|
right: 50%;
|
|
120
|
+
margin-right: -10px;
|
|
117
121
|
}
|
|
118
122
|
.icon-prev,
|
|
119
123
|
.icon-next {
|
|
120
124
|
width: 20px;
|
|
121
125
|
height: 20px;
|
|
122
126
|
margin-top: -10px;
|
|
123
|
-
margin-left: -10px;
|
|
124
127
|
font-family: serif;
|
|
125
128
|
}
|
|
126
129
|
|
|
130
|
+
|
|
127
131
|
.icon-prev {
|
|
128
132
|
&:before {
|
|
129
133
|
content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
|
|
@@ -213,9 +217,16 @@
|
|
|
213
217
|
width: 30px;
|
|
214
218
|
height: 30px;
|
|
215
219
|
margin-top: -15px;
|
|
216
|
-
margin-left: -15px;
|
|
217
220
|
font-size: 30px;
|
|
218
221
|
}
|
|
222
|
+
.glyphicon-chevron-left,
|
|
223
|
+
.icon-prev {
|
|
224
|
+
margin-left: -15px;
|
|
225
|
+
}
|
|
226
|
+
.glyphicon-chevron-right,
|
|
227
|
+
.icon-next {
|
|
228
|
+
margin-right: -15px;
|
|
229
|
+
}
|
|
219
230
|
}
|
|
220
231
|
|
|
221
232
|
// Show and left align the captions
|
|
@@ -17,7 +17,6 @@ code {
|
|
|
17
17
|
font-size: 90%;
|
|
18
18
|
color: $code-color;
|
|
19
19
|
background-color: $code-bg;
|
|
20
|
-
white-space: nowrap;
|
|
21
20
|
border-radius: $border-radius-base;
|
|
22
21
|
}
|
|
23
22
|
|
|
@@ -29,6 +28,12 @@ kbd {
|
|
|
29
28
|
background-color: $kbd-bg;
|
|
30
29
|
border-radius: $border-radius-small;
|
|
31
30
|
box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
|
|
31
|
+
|
|
32
|
+
kbd {
|
|
33
|
+
padding: 0;
|
|
34
|
+
font-size: 100%;
|
|
35
|
+
box-shadow: none;
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
38
|
|
|
34
39
|
// Blocks of code
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
// Heads up!
|
|
6
6
|
//
|
|
7
7
|
// We don't use the `.opacity()` mixin here since it causes a bug with text
|
|
8
|
-
// fields in IE7-8. Source: https://github.com/
|
|
8
|
+
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
|
|
9
9
|
|
|
10
10
|
.fade {
|
|
11
11
|
opacity: 0;
|
|
@@ -17,10 +17,16 @@
|
|
|
17
17
|
|
|
18
18
|
.collapse {
|
|
19
19
|
display: none;
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
|
|
21
|
+
&.in { display: block; }
|
|
22
|
+
// [converter] extracted tr&.in to tr.collapse.in
|
|
23
|
+
// [converter] extracted tbody&.in to tbody.collapse.in
|
|
23
24
|
}
|
|
25
|
+
|
|
26
|
+
tr.collapse.in { display: table-row; }
|
|
27
|
+
|
|
28
|
+
tbody.collapse.in { display: table-row-group; }
|
|
29
|
+
|
|
24
30
|
.collapsing {
|
|
25
31
|
position: relative;
|
|
26
32
|
height: 0;
|
|
@@ -38,6 +38,7 @@
|
|
|
38
38
|
margin: 2px 0 0; // override default ul
|
|
39
39
|
list-style: none;
|
|
40
40
|
font-size: $font-size-base;
|
|
41
|
+
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
|
|
41
42
|
background-color: $dropdown-bg;
|
|
42
43
|
border: 1px solid $dropdown-fallback-border; // IE8 fallback
|
|
43
44
|
border: 1px solid $dropdown-border;
|
|
@@ -154,6 +155,7 @@
|
|
|
154
155
|
font-size: $font-size-small;
|
|
155
156
|
line-height: $line-height-base;
|
|
156
157
|
color: $dropdown-header-color;
|
|
158
|
+
white-space: nowrap; // as with > li > a
|
|
157
159
|
}
|
|
158
160
|
|
|
159
161
|
// Backdrop to catch body clicks on mobile, etc.
|
|
@@ -11,7 +11,7 @@ fieldset {
|
|
|
11
11
|
padding: 0;
|
|
12
12
|
margin: 0;
|
|
13
13
|
border: 0;
|
|
14
|
-
// Chrome and Firefox set a `min-width:
|
|
14
|
+
// Chrome and Firefox set a `min-width: min-content;` on fieldsets,
|
|
15
15
|
// so we reset that to ensure it behaves more like a standard block element.
|
|
16
16
|
// See https://github.com/twbs/bootstrap/issues/12359.
|
|
17
17
|
min-width: 0;
|
|
@@ -31,6 +31,7 @@ legend {
|
|
|
31
31
|
|
|
32
32
|
label {
|
|
33
33
|
display: inline-block;
|
|
34
|
+
max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
|
|
34
35
|
margin-bottom: 5px;
|
|
35
36
|
font-weight: bold;
|
|
36
37
|
}
|
|
@@ -51,7 +52,7 @@ input[type="search"] {
|
|
|
51
52
|
input[type="radio"],
|
|
52
53
|
input[type="checkbox"] {
|
|
53
54
|
margin: 4px 0 0;
|
|
54
|
-
margin-top: 1px \9;
|
|
55
|
+
margin-top: 1px \9; // IE8-9
|
|
55
56
|
line-height: normal;
|
|
56
57
|
}
|
|
57
58
|
|
|
@@ -166,13 +167,28 @@ input[type="search"] {
|
|
|
166
167
|
}
|
|
167
168
|
|
|
168
169
|
|
|
169
|
-
// Special styles for iOS
|
|
170
|
+
// Special styles for iOS temporal inputs
|
|
170
171
|
//
|
|
171
|
-
// In Mobile Safari,
|
|
172
|
-
//
|
|
173
|
-
|
|
174
|
-
input
|
|
172
|
+
// In Mobile Safari, setting `display: block` on temporal inputs causes the
|
|
173
|
+
// text within the input to become vertically misaligned.
|
|
174
|
+
// As a workaround, we set a pixel line-height that matches the
|
|
175
|
+
// given height of the input. Since this fucks up everything else, we have to
|
|
176
|
+
// appropriately reset it for Internet Explorer and the size variations.
|
|
177
|
+
|
|
178
|
+
input[type="date"],
|
|
179
|
+
input[type="time"],
|
|
180
|
+
input[type="datetime-local"],
|
|
181
|
+
input[type="month"] {
|
|
175
182
|
line-height: $input-height-base;
|
|
183
|
+
// IE8+ misaligns the text within date inputs, so we reset
|
|
184
|
+
line-height: $line-height-base #{\0};
|
|
185
|
+
|
|
186
|
+
&.input-sm {
|
|
187
|
+
line-height: $input-height-small;
|
|
188
|
+
}
|
|
189
|
+
&.input-lg {
|
|
190
|
+
line-height: $input-height-large;
|
|
191
|
+
}
|
|
176
192
|
}
|
|
177
193
|
|
|
178
194
|
|
|
@@ -192,13 +208,15 @@ input[type="date"] {
|
|
|
192
208
|
|
|
193
209
|
.radio,
|
|
194
210
|
.checkbox {
|
|
211
|
+
position: relative;
|
|
195
212
|
display: block;
|
|
196
213
|
min-height: $line-height-computed; // clear the floating input if there is no label text
|
|
197
214
|
margin-top: 10px;
|
|
198
215
|
margin-bottom: 10px;
|
|
199
|
-
|
|
216
|
+
|
|
200
217
|
label {
|
|
201
|
-
|
|
218
|
+
padding-left: 20px;
|
|
219
|
+
margin-bottom: 0;
|
|
202
220
|
font-weight: normal;
|
|
203
221
|
cursor: pointer;
|
|
204
222
|
}
|
|
@@ -207,9 +225,11 @@ input[type="date"] {
|
|
|
207
225
|
.radio-inline input[type="radio"],
|
|
208
226
|
.checkbox input[type="checkbox"],
|
|
209
227
|
.checkbox-inline input[type="checkbox"] {
|
|
210
|
-
|
|
228
|
+
position: absolute;
|
|
211
229
|
margin-left: -20px;
|
|
230
|
+
margin-top: 4px \9;
|
|
212
231
|
}
|
|
232
|
+
|
|
213
233
|
.radio + .radio,
|
|
214
234
|
.checkbox + .checkbox {
|
|
215
235
|
margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
|
|
@@ -232,19 +252,55 @@ input[type="date"] {
|
|
|
232
252
|
}
|
|
233
253
|
|
|
234
254
|
// Apply same disabled cursor tweak as for inputs
|
|
255
|
+
// Some special care is needed because <label>s don't inherit their parent's `cursor`.
|
|
235
256
|
//
|
|
236
257
|
// Note: Neither radios nor checkboxes can be readonly.
|
|
237
258
|
input[type="radio"],
|
|
238
|
-
input[type="checkbox"]
|
|
239
|
-
|
|
259
|
+
input[type="checkbox"] {
|
|
260
|
+
&[disabled],
|
|
261
|
+
&.disabled,
|
|
262
|
+
fieldset[disabled] & {
|
|
263
|
+
cursor: not-allowed;
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
// These classes are used directly on <label>s
|
|
240
267
|
.radio-inline,
|
|
241
|
-
.checkbox,
|
|
242
268
|
.checkbox-inline {
|
|
243
|
-
|
|
269
|
+
&.disabled,
|
|
244
270
|
fieldset[disabled] & {
|
|
245
271
|
cursor: not-allowed;
|
|
246
272
|
}
|
|
247
273
|
}
|
|
274
|
+
// These classes are used on elements with <label> descendants
|
|
275
|
+
.radio,
|
|
276
|
+
.checkbox {
|
|
277
|
+
&.disabled,
|
|
278
|
+
fieldset[disabled] & {
|
|
279
|
+
label {
|
|
280
|
+
cursor: not-allowed;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
}
|
|
284
|
+
|
|
285
|
+
|
|
286
|
+
// Static form control text
|
|
287
|
+
//
|
|
288
|
+
// Apply class to a `p` element to make any string of text align with labels in
|
|
289
|
+
// a horizontal form layout.
|
|
290
|
+
|
|
291
|
+
.form-control-static {
|
|
292
|
+
// Size it appropriately next to real form controls
|
|
293
|
+
padding-top: ($padding-base-vertical + 1);
|
|
294
|
+
padding-bottom: ($padding-base-vertical + 1);
|
|
295
|
+
// Remove default margin from `p`
|
|
296
|
+
margin-bottom: 0;
|
|
297
|
+
|
|
298
|
+
&.input-lg,
|
|
299
|
+
&.input-sm {
|
|
300
|
+
padding-left: 0;
|
|
301
|
+
padding-right: 0;
|
|
302
|
+
}
|
|
303
|
+
}
|
|
248
304
|
|
|
249
305
|
|
|
250
306
|
// Form control sizing
|
|
@@ -269,18 +325,28 @@ input[type="checkbox"],
|
|
|
269
325
|
.form-control {
|
|
270
326
|
padding-right: ($input-height-base * 1.25);
|
|
271
327
|
}
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
328
|
+
}
|
|
329
|
+
// Feedback icon (requires .glyphicon classes)
|
|
330
|
+
.form-control-feedback {
|
|
331
|
+
position: absolute;
|
|
332
|
+
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
|
333
|
+
right: 0;
|
|
334
|
+
z-index: 2; // Ensure icon is above input groups
|
|
335
|
+
display: block;
|
|
336
|
+
width: $input-height-base;
|
|
337
|
+
height: $input-height-base;
|
|
338
|
+
line-height: $input-height-base;
|
|
339
|
+
text-align: center;
|
|
340
|
+
}
|
|
341
|
+
.input-lg + .form-control-feedback {
|
|
342
|
+
width: $input-height-large;
|
|
343
|
+
height: $input-height-large;
|
|
344
|
+
line-height: $input-height-large;
|
|
345
|
+
}
|
|
346
|
+
.input-sm + .form-control-feedback {
|
|
347
|
+
width: $input-height-small;
|
|
348
|
+
height: $input-height-small;
|
|
349
|
+
line-height: $input-height-small;
|
|
284
350
|
}
|
|
285
351
|
|
|
286
352
|
// Feedback states
|
|
@@ -295,13 +361,9 @@ input[type="checkbox"],
|
|
|
295
361
|
}
|
|
296
362
|
|
|
297
363
|
|
|
298
|
-
//
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
// a horizontal form layout.
|
|
302
|
-
|
|
303
|
-
.form-control-static {
|
|
304
|
-
margin-bottom: 0; // Remove default margin from `p`
|
|
364
|
+
// Reposition feedback icon if label is hidden with "screenreader only" state
|
|
365
|
+
.has-feedback label.sr-only ~ .form-control-feedback {
|
|
366
|
+
top: 0;
|
|
305
367
|
}
|
|
306
368
|
|
|
307
369
|
|
|
@@ -347,6 +409,18 @@ input[type="checkbox"],
|
|
|
347
409
|
width: auto; // Prevent labels from stacking above inputs in `.form-group`
|
|
348
410
|
vertical-align: middle;
|
|
349
411
|
}
|
|
412
|
+
|
|
413
|
+
.input-group {
|
|
414
|
+
display: inline-table;
|
|
415
|
+
vertical-align: middle;
|
|
416
|
+
|
|
417
|
+
.input-group-addon,
|
|
418
|
+
.input-group-btn,
|
|
419
|
+
.form-control {
|
|
420
|
+
width: auto;
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
|
|
350
424
|
// Input groups need that 100% width though
|
|
351
425
|
.input-group > .form-control {
|
|
352
426
|
width: 100%;
|
|
@@ -365,12 +439,15 @@ input[type="checkbox"],
|
|
|
365
439
|
display: inline-block;
|
|
366
440
|
margin-top: 0;
|
|
367
441
|
margin-bottom: 0;
|
|
368
|
-
padding-left: 0;
|
|
369
442
|
vertical-align: middle;
|
|
443
|
+
|
|
444
|
+
label {
|
|
445
|
+
padding-left: 0;
|
|
446
|
+
}
|
|
370
447
|
}
|
|
371
448
|
.radio input[type="radio"],
|
|
372
449
|
.checkbox input[type="checkbox"] {
|
|
373
|
-
|
|
450
|
+
position: relative;
|
|
374
451
|
margin-left: 0;
|
|
375
452
|
}
|
|
376
453
|
|
|
@@ -392,8 +469,9 @@ input[type="checkbox"],
|
|
|
392
469
|
|
|
393
470
|
.form-horizontal {
|
|
394
471
|
|
|
395
|
-
// Consistent vertical alignment of
|
|
396
|
-
|
|
472
|
+
// Consistent vertical alignment of radios and checkboxes
|
|
473
|
+
//
|
|
474
|
+
// Labels also get some reset styles, but that is scoped to a media query below.
|
|
397
475
|
.radio,
|
|
398
476
|
.checkbox,
|
|
399
477
|
.radio-inline,
|
|
@@ -414,14 +492,13 @@ input[type="checkbox"],
|
|
|
414
492
|
@include make-row();
|
|
415
493
|
}
|
|
416
494
|
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
}
|
|
420
|
-
|
|
421
|
-
// Only right align form labels here when the columns stop stacking
|
|
495
|
+
// Reset spacing and right align labels, but scope to media queries so that
|
|
496
|
+
// labels on narrow viewports stack the same as a default form example.
|
|
422
497
|
@media (min-width: $screen-sm-min) {
|
|
423
498
|
.control-label {
|
|
424
499
|
text-align: right;
|
|
500
|
+
margin-bottom: 0;
|
|
501
|
+
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
|
|
425
502
|
}
|
|
426
503
|
}
|
|
427
504
|
|
|
@@ -433,4 +510,29 @@ input[type="checkbox"],
|
|
|
433
510
|
top: 0;
|
|
434
511
|
right: ($grid-gutter-width / 2);
|
|
435
512
|
}
|
|
513
|
+
|
|
514
|
+
// Form group sizes
|
|
515
|
+
//
|
|
516
|
+
// Quick utility class for applying `.input-lg` and `.input-sm` styles to the
|
|
517
|
+
// inputs and labels within a `.form-group`.
|
|
518
|
+
.form-group-lg {
|
|
519
|
+
@media (min-width: $screen-sm-min) {
|
|
520
|
+
.control-label {
|
|
521
|
+
padding-top: (($padding-large-vertical * $line-height-large) + 1);
|
|
522
|
+
}
|
|
523
|
+
}
|
|
524
|
+
.form-control {
|
|
525
|
+
@extend .input-lg;
|
|
526
|
+
}
|
|
527
|
+
}
|
|
528
|
+
.form-group-sm {
|
|
529
|
+
@media (min-width: $screen-sm-min) {
|
|
530
|
+
.control-label {
|
|
531
|
+
padding-top: ($padding-small-vertical + 1);
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
.form-control {
|
|
535
|
+
@extend .input-sm;
|
|
536
|
+
}
|
|
537
|
+
}
|
|
436
538
|
}
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
|
|
2
|
+
//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
|
|
3
|
+
//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
|
|
4
|
+
//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
|
|
1
5
|
//
|
|
2
6
|
// Glyphicons for Bootstrap
|
|
3
7
|
//
|
|
@@ -39,10 +39,14 @@
|
|
|
39
39
|
|
|
40
40
|
.input-group-lg > .form-control,
|
|
41
41
|
.input-group-lg > .input-group-addon,
|
|
42
|
-
.input-group-lg > .input-group-btn > .btn {
|
|
42
|
+
.input-group-lg > .input-group-btn > .btn {
|
|
43
|
+
@extend .input-lg;
|
|
44
|
+
}
|
|
43
45
|
.input-group-sm > .form-control,
|
|
44
46
|
.input-group-sm > .input-group-addon,
|
|
45
|
-
.input-group-sm > .input-group-btn > .btn {
|
|
47
|
+
.input-group-sm > .input-group-btn > .btn {
|
|
48
|
+
@extend .input-sm;
|
|
49
|
+
}
|
|
46
50
|
|
|
47
51
|
|
|
48
52
|
// Display as table-cell
|