twbs_sass_rails 0.9.2 → 1.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/README.md +1 -1
- data/app/assets/fonts/glyphicons-halflings-regular.svg +1 -1
- data/lib/twbs_sass_rails/version.rb +1 -1
- data/twbs_sass_rails.gemspec +6 -6
- data/vendor/assets/javascripts/twbs/bootstrap/affix.js +43 -23
- data/vendor/assets/javascripts/twbs/bootstrap/alert.js +6 -4
- data/vendor/assets/javascripts/twbs/bootstrap/button.js +16 -10
- data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +26 -10
- data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +69 -28
- data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +20 -10
- data/vendor/assets/javascripts/twbs/bootstrap/modal.js +22 -21
- data/vendor/assets/javascripts/twbs/bootstrap/popover.js +13 -7
- data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +12 -7
- data/vendor/assets/javascripts/twbs/bootstrap/tab.js +41 -16
- data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +60 -39
- data/vendor/assets/javascripts/twbs/bootstrap/transition.js +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/_button-groups.scss +18 -11
- data/vendor/assets/stylesheets/twbs/bootstrap/_buttons.scss +8 -5
- data/vendor/assets/stylesheets/twbs/bootstrap/_carousel.scss +25 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +1 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_component-animations.scss +5 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/_dropdowns.scss +4 -6
- data/vendor/assets/stylesheets/twbs/bootstrap/_forms.scss +51 -28
- data/vendor/assets/stylesheets/twbs/bootstrap/_glyphicons.scss +2 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +4 -4
- data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +4 -4
- data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +1 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_media.scss +27 -36
- data/vendor/assets/stylesheets/twbs/bootstrap/_modals.scss +3 -4
- data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +35 -33
- data/vendor/assets/stylesheets/twbs/bootstrap/_navs.scss +5 -3
- data/vendor/assets/stylesheets/twbs/bootstrap/_normalize.scss +5 -3
- data/vendor/assets/stylesheets/twbs/bootstrap/_pager.scss +2 -3
- data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +22 -4
- data/vendor/assets/stylesheets/twbs/bootstrap/_popovers.scss +5 -4
- data/vendor/assets/stylesheets/twbs/bootstrap/_print.scss +102 -96
- data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +2 -20
- data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-embed.scss +2 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/_scaffolding.scss +3 -3
- data/vendor/assets/stylesheets/twbs/bootstrap/_tables.scss +11 -10
- data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +16 -14
- data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +2 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +10 -16
- data/vendor/assets/stylesheets/twbs/bootstrap/_utilities.scss +3 -4
- data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +29 -19
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_buttons.scss +2 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_forms.scss +5 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_grid.scss +2 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_hide-text.scss +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_image.scss +0 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_labels.scss +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_progress-bar.scss +1 -1
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins/_vendor-prefixes.scss +6 -3
- metadata +24 -30
@@ -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,
|
@@ -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
|
}
|
@@ -185,9 +185,26 @@ input[type="month"] {
|
|
185
185
|
|
186
186
|
&.input-sm {
|
187
187
|
line-height: $input-height-small;
|
188
|
+
line-height: $line-height-small #{\0};
|
188
189
|
}
|
189
190
|
&.input-lg {
|
190
191
|
line-height: $input-height-large;
|
192
|
+
line-height: $line-height-large #{\0};
|
193
|
+
}
|
194
|
+
}
|
195
|
+
|
196
|
+
// IE 11 hack to reverse the iOS temporal input hack.
|
197
|
+
_:-ms-fullscreen, :root input[type="date"],
|
198
|
+
_:-ms-fullscreen, :root input[type="time"],
|
199
|
+
_:-ms-fullscreen, :root input[type="datetime-local"],
|
200
|
+
_:-ms-fullscreen, :root input[type="month"] {
|
201
|
+
line-height: $line-height-base;
|
202
|
+
|
203
|
+
&.input-sm {
|
204
|
+
line-height: $line-height-small;
|
205
|
+
}
|
206
|
+
&.input-lg {
|
207
|
+
line-height: $line-height-large;
|
191
208
|
}
|
192
209
|
}
|
193
210
|
|
@@ -210,11 +227,11 @@ input[type="month"] {
|
|
210
227
|
.checkbox {
|
211
228
|
position: relative;
|
212
229
|
display: block;
|
213
|
-
min-height: $line-height-computed; // clear the floating input if there is no label text
|
214
230
|
margin-top: 10px;
|
215
231
|
margin-bottom: 10px;
|
216
232
|
|
217
233
|
label {
|
234
|
+
min-height: $line-height-computed; // Ensure the input doesn't jump when there is no text
|
218
235
|
padding-left: 20px;
|
219
236
|
margin-bottom: 0;
|
220
237
|
font-weight: normal;
|
@@ -260,7 +277,7 @@ input[type="checkbox"] {
|
|
260
277
|
&[disabled],
|
261
278
|
&.disabled,
|
262
279
|
fieldset[disabled] & {
|
263
|
-
cursor:
|
280
|
+
cursor: $cursor-disabled;
|
264
281
|
}
|
265
282
|
}
|
266
283
|
// These classes are used directly on <label>s
|
@@ -268,7 +285,7 @@ input[type="checkbox"] {
|
|
268
285
|
.checkbox-inline {
|
269
286
|
&.disabled,
|
270
287
|
fieldset[disabled] & {
|
271
|
-
cursor:
|
288
|
+
cursor: $cursor-disabled;
|
272
289
|
}
|
273
290
|
}
|
274
291
|
// These classes are used on elements with <label> descendants
|
@@ -277,7 +294,7 @@ input[type="checkbox"] {
|
|
277
294
|
&.disabled,
|
278
295
|
fieldset[disabled] & {
|
279
296
|
label {
|
280
|
-
cursor:
|
297
|
+
cursor: $cursor-disabled;
|
281
298
|
}
|
282
299
|
}
|
283
300
|
}
|
@@ -308,9 +325,9 @@ input[type="checkbox"] {
|
|
308
325
|
// Build on `.form-control` with modifier classes to decrease or increase the
|
309
326
|
// height and font-size of form controls.
|
310
327
|
|
311
|
-
@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
|
328
|
+
@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
329
|
|
313
|
-
@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
|
330
|
+
@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
331
|
|
315
332
|
|
316
333
|
// Form control feedback states
|
@@ -329,7 +346,7 @@ input[type="checkbox"] {
|
|
329
346
|
// Feedback icon (requires .glyphicon classes)
|
330
347
|
.form-control-feedback {
|
331
348
|
position: absolute;
|
332
|
-
top:
|
349
|
+
top: 0;
|
333
350
|
right: 0;
|
334
351
|
z-index: 2; // Ensure icon is above input groups
|
335
352
|
display: block;
|
@@ -337,6 +354,7 @@ input[type="checkbox"] {
|
|
337
354
|
height: $input-height-base;
|
338
355
|
line-height: $input-height-base;
|
339
356
|
text-align: center;
|
357
|
+
pointer-events: none;
|
340
358
|
}
|
341
359
|
.input-lg + .form-control-feedback {
|
342
360
|
width: $input-height-large;
|
@@ -360,10 +378,15 @@ input[type="checkbox"] {
|
|
360
378
|
@include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
|
361
379
|
}
|
362
380
|
|
381
|
+
// Reposition feedback icon if input has visible label above
|
382
|
+
.has-feedback label {
|
363
383
|
|
364
|
-
|
365
|
-
|
366
|
-
|
384
|
+
& ~ .form-control-feedback {
|
385
|
+
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
386
|
+
}
|
387
|
+
&.sr-only ~ .form-control-feedback {
|
388
|
+
top: 0;
|
389
|
+
}
|
367
390
|
}
|
368
391
|
|
369
392
|
|
@@ -380,7 +403,6 @@ input[type="checkbox"] {
|
|
380
403
|
}
|
381
404
|
|
382
405
|
|
383
|
-
|
384
406
|
// Inline forms
|
385
407
|
//
|
386
408
|
// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
|
@@ -392,7 +414,8 @@ input[type="checkbox"] {
|
|
392
414
|
//
|
393
415
|
// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
|
394
416
|
|
395
|
-
|
417
|
+
// [converter] extracted from `.form-inline` for libsass compatibility
|
418
|
+
@mixin form-inline {
|
396
419
|
|
397
420
|
// Kick in the inline
|
398
421
|
@media (min-width: $screen-sm-min) {
|
@@ -410,6 +433,11 @@ input[type="checkbox"] {
|
|
410
433
|
vertical-align: middle;
|
411
434
|
}
|
412
435
|
|
436
|
+
// Make static controls behave like regular ones
|
437
|
+
.form-control-static {
|
438
|
+
display: inline-block;
|
439
|
+
}
|
440
|
+
|
413
441
|
.input-group {
|
414
442
|
display: inline-table;
|
415
443
|
vertical-align: middle;
|
@@ -451,15 +479,17 @@ input[type="checkbox"] {
|
|
451
479
|
margin-left: 0;
|
452
480
|
}
|
453
481
|
|
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.
|
482
|
+
// Re-override the feedback icon.
|
458
483
|
.has-feedback .form-control-feedback {
|
459
484
|
top: 0;
|
460
485
|
}
|
461
486
|
}
|
462
487
|
}
|
488
|
+
// [converter] extracted as `@mixin form-inline` for libsass compatibility
|
489
|
+
.form-inline {
|
490
|
+
@include form-inline;
|
491
|
+
}
|
492
|
+
|
463
493
|
|
464
494
|
|
465
495
|
// Horizontal forms
|
@@ -489,7 +519,7 @@ input[type="checkbox"] {
|
|
489
519
|
|
490
520
|
// Make form groups behave like rows
|
491
521
|
.form-group {
|
492
|
-
@include make-row
|
522
|
+
@include make-row;
|
493
523
|
}
|
494
524
|
|
495
525
|
// Reset spacing and right align labels, but scope to media queries so that
|
@@ -507,7 +537,6 @@ input[type="checkbox"] {
|
|
507
537
|
// Reposition the icon because it's now within a grid column and columns have
|
508
538
|
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
509
539
|
.has-feedback .form-control-feedback {
|
510
|
-
top: 0;
|
511
540
|
right: ($grid-gutter-width / 2);
|
512
541
|
}
|
513
542
|
|
@@ -521,9 +550,6 @@ input[type="checkbox"] {
|
|
521
550
|
padding-top: (($padding-large-vertical * $line-height-large) + 1);
|
522
551
|
}
|
523
552
|
}
|
524
|
-
.form-control {
|
525
|
-
@extend .input-lg;
|
526
|
-
}
|
527
553
|
}
|
528
554
|
.form-group-sm {
|
529
555
|
@media (min-width: $screen-sm-min) {
|
@@ -531,8 +557,5 @@ input[type="checkbox"] {
|
|
531
557
|
padding-top: ($padding-small-vertical + 1);
|
532
558
|
}
|
533
559
|
}
|
534
|
-
.form-control {
|
535
|
-
@extend .input-sm;
|
536
|
-
}
|
537
560
|
}
|
538
561
|
}
|
@@ -33,7 +33,8 @@
|
|
33
33
|
// Individual icons
|
34
34
|
.glyphicon-asterisk { &:before { content: "\2a"; } }
|
35
35
|
.glyphicon-plus { &:before { content: "\2b"; } }
|
36
|
-
.glyphicon-euro
|
36
|
+
.glyphicon-euro,
|
37
|
+
.glyphicon-eur { &:before { content: "\20ac"; } }
|
37
38
|
.glyphicon-minus { &:before { content: "\2212"; } }
|
38
39
|
.glyphicon-cloud { &:before { content: "\2601"; } }
|
39
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
|
@@ -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,8 +33,7 @@
|
|
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
38
|
.container & {
|
39
39
|
padding-left: ($jumbotron-padding * 2);
|
@@ -1,54 +1,45 @@
|
|
1
|
-
|
2
|
-
//
|
3
|
-
|
1
|
+
.media {
|
2
|
+
// Proper spacing between instances of .media
|
3
|
+
margin-top: 15px;
|
4
|
+
|
5
|
+
&:first-child {
|
6
|
+
margin-top: 0;
|
7
|
+
}
|
8
|
+
}
|
4
9
|
|
10
|
+
.media-right,
|
11
|
+
.media > .pull-right {
|
12
|
+
padding-left: 10px;
|
13
|
+
}
|
5
14
|
|
6
|
-
|
7
|
-
|
15
|
+
.media-left,
|
16
|
+
.media > .pull-left {
|
17
|
+
padding-right: 10px;
|
18
|
+
}
|
8
19
|
|
9
|
-
|
10
|
-
.media,
|
20
|
+
.media-left,
|
21
|
+
.media-right,
|
11
22
|
.media-body {
|
12
|
-
|
13
|
-
|
23
|
+
display: table-cell;
|
24
|
+
vertical-align: top;
|
14
25
|
}
|
15
26
|
|
16
|
-
|
17
|
-
|
18
|
-
.media .media {
|
19
|
-
margin-top: 15px;
|
20
|
-
}
|
21
|
-
.media:first-child {
|
22
|
-
margin-top: 0;
|
27
|
+
.media-middle {
|
28
|
+
vertical-align: middle;
|
23
29
|
}
|
24
30
|
|
25
|
-
|
26
|
-
|
27
|
-
display: block;
|
31
|
+
.media-bottom {
|
32
|
+
vertical-align: bottom;
|
28
33
|
}
|
29
34
|
|
30
35
|
// Reset margins on headings for tighter default spacing
|
31
36
|
.media-heading {
|
32
|
-
margin: 0
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
// Media image alignment
|
37
|
-
// -------------------------
|
38
|
-
|
39
|
-
.media {
|
40
|
-
> .pull-left {
|
41
|
-
margin-right: 10px;
|
42
|
-
}
|
43
|
-
> .pull-right {
|
44
|
-
margin-left: 10px;
|
45
|
-
}
|
37
|
+
margin-top: 0;
|
38
|
+
margin-bottom: 5px;
|
46
39
|
}
|
47
40
|
|
48
|
-
|
49
41
|
// Media list variation
|
50
|
-
//
|
51
|
-
|
42
|
+
//
|
52
43
|
// Undo default ul/ol styles
|
53
44
|
.media-list {
|
54
45
|
padding-left: 0;
|
@@ -30,10 +30,10 @@
|
|
30
30
|
|
31
31
|
// When fading in the modal, animate it to slide down
|
32
32
|
&.fade .modal-dialog {
|
33
|
-
@include
|
33
|
+
@include translate(0, -25%);
|
34
34
|
@include transition-transform(0.3s ease-out);
|
35
35
|
}
|
36
|
-
&.in .modal-dialog { @include
|
36
|
+
&.in .modal-dialog { @include translate(0, 0) }
|
37
37
|
}
|
38
38
|
.modal-open .modal {
|
39
39
|
overflow-x: hidden;
|
@@ -67,7 +67,6 @@
|
|
67
67
|
right: 0;
|
68
68
|
bottom: 0;
|
69
69
|
left: 0;
|
70
|
-
z-index: $zindex-modal-background;
|
71
70
|
background-color: $modal-backdrop-bg;
|
72
71
|
// Fade for backdrop
|
73
72
|
&.fade { @include opacity(0); }
|
@@ -104,7 +103,7 @@
|
|
104
103
|
padding: $modal-inner-padding;
|
105
104
|
text-align: right; // right align buttons
|
106
105
|
border-top: 1px solid $modal-footer-border-color;
|
107
|
-
@include clearfix
|
106
|
+
@include clearfix; // clear it in case folks use .pull-* classes on buttons
|
108
107
|
|
109
108
|
// Properly space out buttons
|
110
109
|
.btn + .btn {
|
@@ -15,7 +15,7 @@
|
|
15
15
|
border: 1px solid transparent;
|
16
16
|
|
17
17
|
// Prevent floats from breaking the navbar
|
18
|
-
@include clearfix
|
18
|
+
@include clearfix;
|
19
19
|
|
20
20
|
@media (min-width: $grid-float-breakpoint) {
|
21
21
|
border-radius: $navbar-border-radius;
|
@@ -29,7 +29,7 @@
|
|
29
29
|
// styling of responsive aspects.
|
30
30
|
|
31
31
|
.navbar-header {
|
32
|
-
@include clearfix
|
32
|
+
@include clearfix;
|
33
33
|
|
34
34
|
@media (min-width: $grid-float-breakpoint) {
|
35
35
|
float: left;
|
@@ -53,7 +53,7 @@
|
|
53
53
|
padding-left: $navbar-padding-horizontal;
|
54
54
|
border-top: 1px solid transparent;
|
55
55
|
box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
|
56
|
-
@include clearfix
|
56
|
+
@include clearfix;
|
57
57
|
-webkit-overflow-scrolling: touch;
|
58
58
|
|
59
59
|
&.in {
|
@@ -67,6 +67,7 @@
|
|
67
67
|
|
68
68
|
&.collapse {
|
69
69
|
display: block !important;
|
70
|
+
visibility: visible !important;
|
70
71
|
height: auto !important;
|
71
72
|
padding-bottom: 0; // Override default setting
|
72
73
|
overflow: visible !important;
|
@@ -92,7 +93,7 @@
|
|
92
93
|
.navbar-collapse {
|
93
94
|
max-height: $navbar-collapse-max-height;
|
94
95
|
|
95
|
-
@media (max-width: $screen-xs-min) and (orientation: landscape) {
|
96
|
+
@media (max-device-width: $screen-xs-min) and (orientation: landscape) {
|
96
97
|
max-height: 200px;
|
97
98
|
}
|
98
99
|
}
|
@@ -141,7 +142,6 @@
|
|
141
142
|
right: 0;
|
142
143
|
left: 0;
|
143
144
|
z-index: $zindex-navbar-fixed;
|
144
|
-
@include translate3d(0, 0, 0);
|
145
145
|
|
146
146
|
// Undo the rounded corners
|
147
147
|
@media (min-width: $grid-float-breakpoint) {
|
@@ -173,6 +173,10 @@
|
|
173
173
|
text-decoration: none;
|
174
174
|
}
|
175
175
|
|
176
|
+
> img {
|
177
|
+
display: block;
|
178
|
+
}
|
179
|
+
|
176
180
|
@media (min-width: $grid-float-breakpoint) {
|
177
181
|
.navbar > .container &,
|
178
182
|
.navbar > .container-fluid & {
|
@@ -271,26 +275,6 @@
|
|
271
275
|
padding-bottom: $navbar-padding-vertical;
|
272
276
|
}
|
273
277
|
}
|
274
|
-
|
275
|
-
&.navbar-right:last-child {
|
276
|
-
margin-right: -$navbar-padding-horizontal;
|
277
|
-
}
|
278
|
-
}
|
279
|
-
}
|
280
|
-
|
281
|
-
|
282
|
-
// Component alignment
|
283
|
-
//
|
284
|
-
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
|
285
|
-
// issues with parents and chaining. Only do this when the navbar is uncollapsed
|
286
|
-
// though so that navbar contents properly stack and align in mobile.
|
287
|
-
|
288
|
-
@media (min-width: $grid-float-breakpoint) {
|
289
|
-
.navbar-left {
|
290
|
-
float: left !important;
|
291
|
-
}
|
292
|
-
.navbar-right {
|
293
|
-
float: right !important;
|
294
278
|
}
|
295
279
|
}
|
296
280
|
|
@@ -310,11 +294,15 @@
|
|
310
294
|
@include box-shadow($shadow);
|
311
295
|
|
312
296
|
// Mixin behavior for optimum display
|
313
|
-
@
|
297
|
+
@include form-inline;
|
314
298
|
|
315
299
|
.form-group {
|
316
300
|
@media (max-width: $grid-float-breakpoint-max) {
|
317
301
|
margin-bottom: 5px;
|
302
|
+
|
303
|
+
&:last-child {
|
304
|
+
margin-bottom: 0;
|
305
|
+
}
|
318
306
|
}
|
319
307
|
}
|
320
308
|
|
@@ -330,11 +318,6 @@
|
|
330
318
|
padding-top: 0;
|
331
319
|
padding-bottom: 0;
|
332
320
|
@include box-shadow(none);
|
333
|
-
|
334
|
-
// Outdent the form if last child to line up with content down the page
|
335
|
-
&.navbar-right:last-child {
|
336
|
-
margin-right: -$navbar-padding-horizontal;
|
337
|
-
}
|
338
321
|
}
|
339
322
|
}
|
340
323
|
|
@@ -379,14 +362,33 @@
|
|
379
362
|
float: left;
|
380
363
|
margin-left: $navbar-padding-horizontal;
|
381
364
|
margin-right: $navbar-padding-horizontal;
|
365
|
+
}
|
366
|
+
}
|
367
|
+
|
368
|
+
|
369
|
+
// Component alignment
|
370
|
+
//
|
371
|
+
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
|
372
|
+
// issues with parents and chaining. Only do this when the navbar is uncollapsed
|
373
|
+
// though so that navbar contents properly stack and align in mobile.
|
374
|
+
//
|
375
|
+
// Declared after the navbar components to ensure more specificity on the margins.
|
382
376
|
|
383
|
-
|
384
|
-
|
377
|
+
@media (min-width: $grid-float-breakpoint) {
|
378
|
+
.navbar-left {
|
379
|
+
float: left !important;
|
380
|
+
}
|
381
|
+
.navbar-right {
|
382
|
+
float: right !important;
|
383
|
+
margin-right: -$navbar-padding-horizontal;
|
384
|
+
|
385
|
+
~ .navbar-right {
|
385
386
|
margin-right: 0;
|
386
387
|
}
|
387
388
|
}
|
388
389
|
}
|
389
390
|
|
391
|
+
|
390
392
|
// Alternate navbars
|
391
393
|
// --------------------------------------------------
|
392
394
|
|