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
@@ -21,9 +21,33 @@
|
|
21
21
|
// Account for jankitude on images
|
22
22
|
> img,
|
23
23
|
> a > img {
|
24
|
-
@include img-responsive
|
24
|
+
@include img-responsive;
|
25
25
|
line-height: 1;
|
26
26
|
}
|
27
|
+
|
28
|
+
// WebKit CSS3 transforms for supported devices
|
29
|
+
@media all and (transform-3d), (-webkit-transform-3d) {
|
30
|
+
transition: transform .6s ease-in-out;
|
31
|
+
backface-visibility: hidden;
|
32
|
+
perspective: 1000;
|
33
|
+
|
34
|
+
&.next,
|
35
|
+
&.active.right {
|
36
|
+
transform: translate3d(100%, 0, 0);
|
37
|
+
left: 0;
|
38
|
+
}
|
39
|
+
&.prev,
|
40
|
+
&.active.left {
|
41
|
+
transform: translate3d(-100%, 0, 0);
|
42
|
+
left: 0;
|
43
|
+
}
|
44
|
+
&.next.left,
|
45
|
+
&.prev.right,
|
46
|
+
&.active {
|
47
|
+
transform: translate3d(0, 0, 0);
|
48
|
+
left: 0;
|
49
|
+
}
|
50
|
+
}
|
27
51
|
}
|
28
52
|
|
29
53
|
> .active,
|
File without changes
|
@@ -17,8 +17,9 @@
|
|
17
17
|
|
18
18
|
.collapse {
|
19
19
|
display: none;
|
20
|
+
visibility: hidden;
|
20
21
|
|
21
|
-
&.in { display: block; }
|
22
|
+
&.in { display: block; visibility: visible; }
|
22
23
|
// [converter] extracted tr&.in to tr.collapse.in
|
23
24
|
// [converter] extracted tbody&.in to tbody.collapse.in
|
24
25
|
}
|
@@ -31,5 +32,7 @@ tbody.collapse.in { display: table-row-group; }
|
|
31
32
|
position: relative;
|
32
33
|
height: 0;
|
33
34
|
overflow: hidden;
|
34
|
-
@include transition(height
|
35
|
+
@include transition-property(height, visibility);
|
36
|
+
@include transition-duration(.35s);
|
37
|
+
@include transition-timing-function(ease);
|
35
38
|
}
|
@@ -103,16 +103,15 @@
|
|
103
103
|
&:focus {
|
104
104
|
color: $dropdown-link-disabled-color;
|
105
105
|
}
|
106
|
-
|
107
|
-
// Nuke hover/focus effects
|
108
|
-
.dropdown-menu > .disabled > a {
|
106
|
+
|
107
|
+
// Nuke hover/focus effects
|
109
108
|
&:hover,
|
110
109
|
&:focus {
|
111
110
|
text-decoration: none;
|
112
111
|
background-color: transparent;
|
113
112
|
background-image: none; // Remove CSS gradient
|
114
|
-
@include reset-filter
|
115
|
-
cursor:
|
113
|
+
@include reset-filter;
|
114
|
+
cursor: $cursor-disabled;
|
116
115
|
}
|
117
116
|
}
|
118
117
|
|
@@ -212,4 +211,3 @@
|
|
212
211
|
}
|
213
212
|
}
|
214
213
|
}
|
215
|
-
|
@@ -77,7 +77,7 @@ select[size] {
|
|
77
77
|
input[type="file"]:focus,
|
78
78
|
input[type="radio"]:focus,
|
79
79
|
input[type="checkbox"]:focus {
|
80
|
-
@include tab-focus
|
80
|
+
@include tab-focus;
|
81
81
|
}
|
82
82
|
|
83
83
|
// Adjust output element
|
@@ -128,10 +128,10 @@ output {
|
|
128
128
|
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
|
129
129
|
|
130
130
|
// Customize the `:focus` state to imitate native WebKit styles.
|
131
|
-
@include form-control-focus
|
131
|
+
@include form-control-focus;
|
132
132
|
|
133
133
|
// Placeholder
|
134
|
-
@include placeholder
|
134
|
+
@include placeholder;
|
135
135
|
|
136
136
|
// Disabled and read-only inputs
|
137
137
|
//
|
@@ -141,7 +141,7 @@ output {
|
|
141
141
|
&[disabled],
|
142
142
|
&[readonly],
|
143
143
|
fieldset[disabled] & {
|
144
|
-
cursor:
|
144
|
+
cursor: $cursor-disabled;
|
145
145
|
background-color: $input-bg-disabled;
|
146
146
|
opacity: 1; // iOS fix for unreadable disabled content
|
147
147
|
}
|
@@ -170,23 +170,27 @@ input[type="search"] {
|
|
170
170
|
// Special styles for iOS temporal inputs
|
171
171
|
//
|
172
172
|
// In Mobile Safari, setting `display: block` on temporal inputs causes the
|
173
|
-
// text within the input to become vertically misaligned.
|
174
|
-
//
|
175
|
-
//
|
176
|
-
|
177
|
-
|
178
|
-
input[type="date"],
|
179
|
-
input[type="time"],
|
180
|
-
input[type="datetime-local"],
|
181
|
-
input[type="month"] {
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
173
|
+
// text within the input to become vertically misaligned. As a workaround, we
|
174
|
+
// set a pixel line-height that matches the given height of the input, but only
|
175
|
+
// for Safari.
|
176
|
+
|
177
|
+
@media screen and (-webkit-min-device-pixel-ratio: 0) {
|
178
|
+
input[type="date"],
|
179
|
+
input[type="time"],
|
180
|
+
input[type="datetime-local"],
|
181
|
+
input[type="month"] {
|
182
|
+
line-height: $input-height-base;
|
183
|
+
}
|
184
|
+
input[type="date"].input-sm,
|
185
|
+
input[type="time"].input-sm,
|
186
|
+
input[type="datetime-local"].input-sm,
|
187
|
+
input[type="month"].input-sm {
|
187
188
|
line-height: $input-height-small;
|
188
189
|
}
|
189
|
-
|
190
|
+
input[type="date"].input-lg,
|
191
|
+
input[type="time"].input-lg,
|
192
|
+
input[type="datetime-local"].input-lg,
|
193
|
+
input[type="month"].input-lg {
|
190
194
|
line-height: $input-height-large;
|
191
195
|
}
|
192
196
|
}
|
@@ -210,11 +214,11 @@ input[type="month"] {
|
|
210
214
|
.checkbox {
|
211
215
|
position: relative;
|
212
216
|
display: block;
|
213
|
-
min-height: $line-height-computed; // clear the floating input if there is no label text
|
214
217
|
margin-top: 10px;
|
215
218
|
margin-bottom: 10px;
|
216
219
|
|
217
220
|
label {
|
221
|
+
min-height: $line-height-computed; // Ensure the input doesn't jump when there is no text
|
218
222
|
padding-left: 20px;
|
219
223
|
margin-bottom: 0;
|
220
224
|
font-weight: normal;
|
@@ -260,7 +264,7 @@ input[type="checkbox"] {
|
|
260
264
|
&[disabled],
|
261
265
|
&.disabled,
|
262
266
|
fieldset[disabled] & {
|
263
|
-
cursor:
|
267
|
+
cursor: $cursor-disabled;
|
264
268
|
}
|
265
269
|
}
|
266
270
|
// These classes are used directly on <label>s
|
@@ -268,7 +272,7 @@ input[type="checkbox"] {
|
|
268
272
|
.checkbox-inline {
|
269
273
|
&.disabled,
|
270
274
|
fieldset[disabled] & {
|
271
|
-
cursor:
|
275
|
+
cursor: $cursor-disabled;
|
272
276
|
}
|
273
277
|
}
|
274
278
|
// These classes are used on elements with <label> descendants
|
@@ -277,7 +281,7 @@ input[type="checkbox"] {
|
|
277
281
|
&.disabled,
|
278
282
|
fieldset[disabled] & {
|
279
283
|
label {
|
280
|
-
cursor:
|
284
|
+
cursor: $cursor-disabled;
|
281
285
|
}
|
282
286
|
}
|
283
287
|
}
|
@@ -308,9 +312,9 @@ input[type="checkbox"] {
|
|
308
312
|
// Build on `.form-control` with modifier classes to decrease or increase the
|
309
313
|
// height and font-size of form controls.
|
310
314
|
|
311
|
-
@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
315
|
+
@include input-size('.input-sm, .form-group-sm .form-control', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $input-border-radius-small);
|
312
316
|
|
313
|
-
@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
|
317
|
+
@include input-size('.input-lg, .form-group-lg .form-control', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $input-border-radius-large);
|
314
318
|
|
315
319
|
|
316
320
|
// Form control feedback states
|
@@ -329,7 +333,7 @@ input[type="checkbox"] {
|
|
329
333
|
// Feedback icon (requires .glyphicon classes)
|
330
334
|
.form-control-feedback {
|
331
335
|
position: absolute;
|
332
|
-
top:
|
336
|
+
top: 0;
|
333
337
|
right: 0;
|
334
338
|
z-index: 2; // Ensure icon is above input groups
|
335
339
|
display: block;
|
@@ -337,6 +341,7 @@ input[type="checkbox"] {
|
|
337
341
|
height: $input-height-base;
|
338
342
|
line-height: $input-height-base;
|
339
343
|
text-align: center;
|
344
|
+
pointer-events: none;
|
340
345
|
}
|
341
346
|
.input-lg + .form-control-feedback {
|
342
347
|
width: $input-height-large;
|
@@ -360,10 +365,15 @@ input[type="checkbox"] {
|
|
360
365
|
@include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
|
361
366
|
}
|
362
367
|
|
368
|
+
// Reposition feedback icon if input has visible label above
|
369
|
+
.has-feedback label {
|
363
370
|
|
364
|
-
|
365
|
-
|
366
|
-
|
371
|
+
& ~ .form-control-feedback {
|
372
|
+
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
373
|
+
}
|
374
|
+
&.sr-only ~ .form-control-feedback {
|
375
|
+
top: 0;
|
376
|
+
}
|
367
377
|
}
|
368
378
|
|
369
379
|
|
@@ -380,7 +390,6 @@ input[type="checkbox"] {
|
|
380
390
|
}
|
381
391
|
|
382
392
|
|
383
|
-
|
384
393
|
// Inline forms
|
385
394
|
//
|
386
395
|
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
|
@@ -392,7 +401,8 @@ input[type="checkbox"] {
|
|
392
401
|
//
|
393
402
|
// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
|
394
403
|
|
395
|
-
|
404
|
+
// [converter] extracted from `.form-inline` for libsass compatibility
|
405
|
+
@mixin form-inline {
|
396
406
|
|
397
407
|
// Kick in the inline
|
398
408
|
@media (min-width: $screen-sm-min) {
|
@@ -410,6 +420,11 @@ input[type="checkbox"] {
|
|
410
420
|
vertical-align: middle;
|
411
421
|
}
|
412
422
|
|
423
|
+
// Make static controls behave like regular ones
|
424
|
+
.form-control-static {
|
425
|
+
display: inline-block;
|
426
|
+
}
|
427
|
+
|
413
428
|
.input-group {
|
414
429
|
display: inline-table;
|
415
430
|
vertical-align: middle;
|
@@ -451,15 +466,17 @@ input[type="checkbox"] {
|
|
451
466
|
margin-left: 0;
|
452
467
|
}
|
453
468
|
|
454
|
-
//
|
455
|
-
//
|
456
|
-
// Reposition the icon because it's now within a grid column and columns have
|
457
|
-
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
469
|
+
// Re-override the feedback icon.
|
458
470
|
.has-feedback .form-control-feedback {
|
459
471
|
top: 0;
|
460
472
|
}
|
461
473
|
}
|
462
474
|
}
|
475
|
+
// [converter] extracted as `@mixin form-inline` for libsass compatibility
|
476
|
+
.form-inline {
|
477
|
+
@include form-inline;
|
478
|
+
}
|
479
|
+
|
463
480
|
|
464
481
|
|
465
482
|
// Horizontal forms
|
@@ -489,7 +506,7 @@ input[type="checkbox"] {
|
|
489
506
|
|
490
507
|
// Make form groups behave like rows
|
491
508
|
.form-group {
|
492
|
-
@include make-row
|
509
|
+
@include make-row;
|
493
510
|
}
|
494
511
|
|
495
512
|
// Reset spacing and right align labels, but scope to media queries so that
|
@@ -507,7 +524,6 @@ input[type="checkbox"] {
|
|
507
524
|
// Reposition the icon because it's now within a grid column and columns have
|
508
525
|
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
509
526
|
.has-feedback .form-control-feedback {
|
510
|
-
top: 0;
|
511
527
|
right: ($grid-gutter-width / 2);
|
512
528
|
}
|
513
529
|
|
@@ -521,9 +537,6 @@ input[type="checkbox"] {
|
|
521
537
|
padding-top: (($padding-large-vertical * $line-height-large) + 1);
|
522
538
|
}
|
523
539
|
}
|
524
|
-
.form-control {
|
525
|
-
@extend .input-lg;
|
526
|
-
}
|
527
540
|
}
|
528
541
|
.form-group-sm {
|
529
542
|
@media (min-width: $screen-sm-min) {
|
@@ -531,8 +544,5 @@ input[type="checkbox"] {
|
|
531
544
|
padding-top: ($padding-small-vertical + 1);
|
532
545
|
}
|
533
546
|
}
|
534
|
-
.form-control {
|
535
|
-
@extend .input-sm;
|
536
|
-
}
|
537
547
|
}
|
538
548
|
}
|
@@ -1,7 +1,3 @@
|
|
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"
|
5
1
|
//
|
6
2
|
// Glyphicons for Bootstrap
|
7
3
|
//
|
@@ -14,11 +10,11 @@
|
|
14
10
|
// Import the fonts
|
15
11
|
@font-face {
|
16
12
|
font-family: 'Glyphicons Halflings';
|
17
|
-
src: url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
18
|
-
src: url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
19
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
20
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
21
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
13
|
+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
|
14
|
+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
|
15
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
|
16
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
|
17
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
|
22
18
|
}
|
23
19
|
|
24
20
|
// Catchall baseclass
|
@@ -37,7 +33,8 @@
|
|
37
33
|
// Individual icons
|
38
34
|
.glyphicon-asterisk { &:before { content: "\2a"; } }
|
39
35
|
.glyphicon-plus { &:before { content: "\2b"; } }
|
40
|
-
.glyphicon-euro
|
36
|
+
.glyphicon-euro,
|
37
|
+
.glyphicon-eur { &:before { content: "\20ac"; } }
|
41
38
|
.glyphicon-minus { &:before { content: "\2212"; } }
|
42
39
|
.glyphicon-cloud { &:before { content: "\2601"; } }
|
43
40
|
.glyphicon-envelope { &:before { content: "\2709"; } }
|
@@ -8,7 +8,7 @@
|
|
8
8
|
// Set the container width, and override it for fixed navbars in media queries.
|
9
9
|
|
10
10
|
.container {
|
11
|
-
@include container-fixed
|
11
|
+
@include container-fixed;
|
12
12
|
|
13
13
|
@media (min-width: $screen-sm-min) {
|
14
14
|
width: $container-sm;
|
@@ -28,7 +28,7 @@
|
|
28
28
|
// width for fluid, full width layouts.
|
29
29
|
|
30
30
|
.container-fluid {
|
31
|
-
@include container-fixed
|
31
|
+
@include container-fixed;
|
32
32
|
}
|
33
33
|
|
34
34
|
|
@@ -37,7 +37,7 @@
|
|
37
37
|
// Rows contain and clear the floats of your columns.
|
38
38
|
|
39
39
|
.row {
|
40
|
-
@include make-row
|
40
|
+
@include make-row;
|
41
41
|
}
|
42
42
|
|
43
43
|
|
@@ -45,7 +45,7 @@
|
|
45
45
|
//
|
46
46
|
// Common styles for small and large grid columns
|
47
47
|
|
48
|
-
@include make-grid-columns
|
48
|
+
@include make-grid-columns;
|
49
49
|
|
50
50
|
|
51
51
|
// Extra small grid
|
File without changes
|
@@ -4,7 +4,7 @@
|
|
4
4
|
|
5
5
|
|
6
6
|
.jumbotron {
|
7
|
-
padding: $jumbotron-padding;
|
7
|
+
padding: $jumbotron-padding ($jumbotron-padding / 2);
|
8
8
|
margin-bottom: $jumbotron-padding;
|
9
9
|
color: $jumbotron-color;
|
10
10
|
background-color: $jumbotron-bg;
|
@@ -23,7 +23,8 @@
|
|
23
23
|
border-top-color: darken($jumbotron-bg, 10%);
|
24
24
|
}
|
25
25
|
|
26
|
-
.container
|
26
|
+
.container &,
|
27
|
+
.container-fluid & {
|
27
28
|
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
|
28
29
|
}
|
29
30
|
|
@@ -32,10 +33,10 @@
|
|
32
33
|
}
|
33
34
|
|
34
35
|
@media screen and (min-width: $screen-sm-min) {
|
35
|
-
padding
|
36
|
-
padding-bottom: ($jumbotron-padding * 1.6);
|
36
|
+
padding: ($jumbotron-padding * 1.6) 0;
|
37
37
|
|
38
|
-
.container
|
38
|
+
.container &,
|
39
|
+
.container-fluid & {
|
39
40
|
padding-left: ($jumbotron-padding * 2);
|
40
41
|
padding-right: ($jumbotron-padding * 2);
|
41
42
|
}
|
File without changes
|
@@ -35,14 +35,6 @@
|
|
35
35
|
margin-bottom: 0;
|
36
36
|
@include border-bottom-radius($list-group-border-radius);
|
37
37
|
}
|
38
|
-
|
39
|
-
// Align badges within list items
|
40
|
-
> .badge {
|
41
|
-
float: right;
|
42
|
-
}
|
43
|
-
> .badge + .badge {
|
44
|
-
margin-right: 5px;
|
45
|
-
}
|
46
38
|
}
|
47
39
|
|
48
40
|
|
@@ -74,6 +66,7 @@ a.list-group-item {
|
|
74
66
|
&.disabled:focus {
|
75
67
|
background-color: $list-group-disabled-bg;
|
76
68
|
color: $list-group-disabled-color;
|
69
|
+
cursor: $cursor-disabled;
|
77
70
|
|
78
71
|
// Force color to inherit for custom content
|
79
72
|
.list-group-item-heading {
|