bootstrap-sass 3.0.1.0 → 3.0.3.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bootstrap-sass might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.travis.yml +1 -1
- data/CHANGELOG.md +4 -0
- data/Gemfile +9 -1
- data/README.md +58 -15
- data/Rakefile +1 -3
- data/lib/bootstrap-sass/sass_functions.rb +45 -10
- data/lib/bootstrap-sass/version.rb +2 -2
- data/lib/bootstrap-sass.rb +56 -36
- data/tasks/converter/less_conversion.rb +27 -26
- data/templates/project/manifest.rb +14 -5
- data/test/dummy/app/views/pages/root.html.slim +19 -3
- data/test/dummy_sass_only/Gemfile +4 -0
- data/test/dummy_sass_only/compile.rb +13 -0
- data/test/dummy_sass_only/import_all.sass +2 -0
- data/test/gemfiles/sass_3_2.gemfile +9 -1
- data/test/gemfiles/sass_head.gemfile +11 -2
- data/test/sass_test.rb +23 -0
- data/test/test_helper.rb +0 -1
- data/vendor/assets/javascripts/bootstrap/affix.js +2 -2
- data/vendor/assets/javascripts/bootstrap/alert.js +2 -2
- data/vendor/assets/javascripts/bootstrap/button.js +12 -6
- data/vendor/assets/javascripts/bootstrap/carousel.js +6 -6
- data/vendor/assets/javascripts/bootstrap/collapse.js +2 -2
- data/vendor/assets/javascripts/bootstrap/dropdown.js +6 -6
- data/vendor/assets/javascripts/bootstrap/modal.js +2 -2
- data/vendor/assets/javascripts/bootstrap/popover.js +2 -2
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +3 -3
- data/vendor/assets/javascripts/bootstrap/tab.js +2 -2
- data/vendor/assets/javascripts/bootstrap/tooltip.js +2 -2
- data/vendor/assets/javascripts/bootstrap/transition.js +2 -2
- data/vendor/assets/stylesheets/bootstrap/_badges.scss +6 -6
- data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +7 -33
- data/vendor/assets/stylesheets/bootstrap/_buttons.scss +2 -5
- data/vendor/assets/stylesheets/bootstrap/_carousel.scss +1 -0
- data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +3 -8
- data/vendor/assets/stylesheets/bootstrap/_forms.scss +17 -8
- data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +5 -5
- data/vendor/assets/stylesheets/bootstrap/_grid.scss +12 -26
- data/vendor/assets/stylesheets/bootstrap/_input-groups.scss +1 -1
- data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +8 -2
- data/vendor/assets/stylesheets/bootstrap/_labels.scss +6 -0
- data/vendor/assets/stylesheets/bootstrap/_mixins.scss +49 -62
- data/vendor/assets/stylesheets/bootstrap/_modals.scss +2 -5
- data/vendor/assets/stylesheets/bootstrap/_navbar.scss +41 -53
- data/vendor/assets/stylesheets/bootstrap/_navs.scss +0 -20
- data/vendor/assets/stylesheets/bootstrap/_panels.scss +11 -1
- data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +0 -12
- data/vendor/assets/stylesheets/bootstrap/_tables.scss +17 -22
- data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +17 -10
- data/vendor/assets/stylesheets/bootstrap/_type.scss +54 -52
- data/vendor/assets/stylesheets/bootstrap/_variables.scss +17 -10
- metadata +10 -3
- data/lib/bootstrap-sass/compass_functions.rb +0 -24
@@ -19,8 +19,8 @@
|
|
19
19
|
@mixin clearfix() {
|
20
20
|
&:before,
|
21
21
|
&:after {
|
22
|
-
content: " ";
|
23
|
-
display: table;
|
22
|
+
content: " "; // 1
|
23
|
+
display: table; // 2
|
24
24
|
}
|
25
25
|
&:after {
|
26
26
|
clear: both;
|
@@ -30,7 +30,7 @@
|
|
30
30
|
// WebKit-style focus
|
31
31
|
@mixin tab-focus() {
|
32
32
|
// Default
|
33
|
-
outline: thin dotted
|
33
|
+
outline: thin dotted;
|
34
34
|
// WebKit
|
35
35
|
outline: 5px auto -webkit-focus-ring-color;
|
36
36
|
outline-offset: -2px;
|
@@ -55,7 +55,8 @@
|
|
55
55
|
// Placeholder text
|
56
56
|
@mixin placeholder($color: $input-color-placeholder) {
|
57
57
|
&:-moz-placeholder { color: $color; } // Firefox 4-18
|
58
|
-
&::-moz-placeholder { color: $color;
|
58
|
+
&::-moz-placeholder { color: $color; // Firefox 19+
|
59
|
+
opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
|
59
60
|
&:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
|
60
61
|
&::-webkit-input-placeholder { color: $color; } // Safari and Chrome
|
61
62
|
}
|
@@ -87,11 +88,7 @@
|
|
87
88
|
}
|
88
89
|
// New mixin to use as of v3.0.1
|
89
90
|
@mixin text-hide() {
|
90
|
-
|
91
|
-
color: transparent;
|
92
|
-
text-shadow: none;
|
93
|
-
background-color: transparent;
|
94
|
-
border: 0;
|
91
|
+
@include hide-text();
|
95
92
|
}
|
96
93
|
|
97
94
|
|
@@ -128,7 +125,7 @@
|
|
128
125
|
-webkit-transition: $transition;
|
129
126
|
transition: $transition;
|
130
127
|
}
|
131
|
-
@mixin transition-property($transition-property) {
|
128
|
+
@mixin transition-property($transition-property...) {
|
132
129
|
-webkit-transition-property: $transition-property;
|
133
130
|
transition-property: $transition-property;
|
134
131
|
}
|
@@ -136,7 +133,7 @@
|
|
136
133
|
-webkit-transition-delay: $transition-delay;
|
137
134
|
transition-delay: $transition-delay;
|
138
135
|
}
|
139
|
-
@mixin transition-duration($transition-duration) {
|
136
|
+
@mixin transition-duration($transition-duration...) {
|
140
137
|
-webkit-transition-duration: $transition-duration;
|
141
138
|
transition-duration: $transition-duration;
|
142
139
|
}
|
@@ -277,10 +274,8 @@
|
|
277
274
|
// Creates two color stops, start and end, by specifying a color and position for each color stop.
|
278
275
|
// Color stops are not available in IE9 and below.
|
279
276
|
@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
|
280
|
-
background-image: -webkit-gradient(
|
281
|
-
background-image:
|
282
|
-
background-image: -moz-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
|
283
|
-
background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
|
277
|
+
background-image: -webkit-linear-gradient(left, color-stop($start-color $start-percent), color-stop($end-color $end-percent)); // Safari 5.1-6, Chrome 10+
|
278
|
+
background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
284
279
|
background-repeat: repeat-x;
|
285
280
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
|
286
281
|
}
|
@@ -290,47 +285,36 @@
|
|
290
285
|
// Creates two color stops, start and end, by specifying a color and position for each color stop.
|
291
286
|
// Color stops are not available in IE9 and below.
|
292
287
|
@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
|
293
|
-
background-image: -webkit-gradient(
|
294
|
-
background-image:
|
295
|
-
background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
|
296
|
-
background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
|
288
|
+
background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
|
289
|
+
background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
297
290
|
background-repeat: repeat-x;
|
298
291
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
|
299
292
|
}
|
300
293
|
|
301
294
|
@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
|
302
295
|
background-repeat: repeat-x;
|
303
|
-
background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1
|
304
|
-
background-image:
|
305
|
-
background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10
|
296
|
+
background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
|
297
|
+
background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
|
306
298
|
}
|
307
299
|
@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
|
308
|
-
background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
|
309
300
|
background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
|
310
|
-
background-image: -moz-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
|
311
301
|
background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
|
312
302
|
background-repeat: no-repeat;
|
313
303
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
|
314
304
|
}
|
315
305
|
@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
|
316
|
-
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
|
317
306
|
background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
|
318
|
-
background-image: -moz-linear-gradient(top, $start-color, $mid-color $color-stop, $end-color);
|
319
307
|
background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
|
320
308
|
background-repeat: no-repeat;
|
321
309
|
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
|
322
310
|
}
|
323
311
|
@mixin gradient-radial($inner-color: #555, $outer-color: #333) {
|
324
|
-
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($inner-color), to($outer-color));
|
325
312
|
background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
|
326
|
-
background-image: -moz-radial-gradient(circle, $inner-color, $outer-color);
|
327
313
|
background-image: radial-gradient(circle, $inner-color, $outer-color);
|
328
314
|
background-repeat: no-repeat;
|
329
315
|
}
|
330
316
|
@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
|
331
|
-
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, $color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, $color), color-stop(.75, $color), color-stop(.75, transparent), to(transparent));
|
332
317
|
background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
|
333
|
-
background-image: -moz-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
|
334
318
|
background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
|
335
319
|
}
|
336
320
|
|
@@ -349,7 +333,7 @@
|
|
349
333
|
// Short retina mixin for setting background-image and -size
|
350
334
|
|
351
335
|
@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
|
352
|
-
background-image: image-
|
336
|
+
background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-1x}"), "#{$file-1x}"));
|
353
337
|
|
354
338
|
@media
|
355
339
|
only screen and (-webkit-min-device-pixel-ratio: 2),
|
@@ -358,7 +342,7 @@
|
|
358
342
|
only screen and ( min-device-pixel-ratio: 2),
|
359
343
|
only screen and ( min-resolution: 192dpi),
|
360
344
|
only screen and ( min-resolution: 2dppx) {
|
361
|
-
background-image: image-
|
345
|
+
background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-2x}"), "#{$file-2x}"));
|
362
346
|
background-size: $width-1x $height-1x;
|
363
347
|
}
|
364
348
|
}
|
@@ -401,9 +385,6 @@
|
|
401
385
|
+ .panel-collapse .panel-body {
|
402
386
|
border-top-color: $border;
|
403
387
|
}
|
404
|
-
& > .dropdown .caret {
|
405
|
-
border-color: $heading-text-color transparent;
|
406
|
-
}
|
407
388
|
}
|
408
389
|
& > .panel-footer {
|
409
390
|
+ .panel-collapse .panel-body {
|
@@ -429,27 +410,27 @@
|
|
429
410
|
|
430
411
|
// Tables
|
431
412
|
// -------------------------
|
432
|
-
@mixin table-row-variant($state, $background
|
413
|
+
@mixin table-row-variant($state, $background) {
|
433
414
|
// Exact selectors below required to override `.table-striped` and prevent
|
434
415
|
// inheritance to nested tables.
|
435
|
-
.table
|
436
|
-
|
437
|
-
|
438
|
-
>
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
|
416
|
+
.table {
|
417
|
+
> thead,
|
418
|
+
> tbody,
|
419
|
+
> tfoot {
|
420
|
+
> tr > .#{$state},
|
421
|
+
> .#{$state} > td,
|
422
|
+
> .#{$state} > th {
|
423
|
+
background-color: $background;
|
424
|
+
}
|
443
425
|
}
|
444
426
|
}
|
445
427
|
|
446
428
|
// Hover states for `.table-hover`
|
447
429
|
// Note: this is not available for cells or rows within `thead` or `tfoot`.
|
448
|
-
.table-hover > tbody
|
449
|
-
>
|
450
|
-
>
|
451
|
-
|
452
|
-
&.#{$state}:hover > th {
|
430
|
+
.table-hover > tbody {
|
431
|
+
> tr > .#{$state}:hover,
|
432
|
+
> .#{$state}:hover > td,
|
433
|
+
> .#{$state}:hover > th {
|
453
434
|
background-color: darken($background, 5%);
|
454
435
|
}
|
455
436
|
}
|
@@ -496,6 +477,11 @@
|
|
496
477
|
border-color: $border;
|
497
478
|
}
|
498
479
|
}
|
480
|
+
|
481
|
+
.badge {
|
482
|
+
color: $background;
|
483
|
+
background-color: #fff;
|
484
|
+
}
|
499
485
|
}
|
500
486
|
|
501
487
|
// Button sizes
|
@@ -567,9 +553,10 @@
|
|
567
553
|
// [converter] $parent hack
|
568
554
|
@mixin responsive-visibility($parent) {
|
569
555
|
#{$parent} { display: block !important; }
|
570
|
-
|
556
|
+
table#{$parent} { display: table; }
|
557
|
+
tr#{$parent} { display: table-row !important; }
|
571
558
|
th#{$parent},
|
572
|
-
td#{$parent}
|
559
|
+
td#{$parent} { display: table-cell !important; }
|
573
560
|
}
|
574
561
|
|
575
562
|
// [converter] $parent hack
|
@@ -720,11 +707,11 @@
|
|
720
707
|
// [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
|
721
708
|
@mixin make-grid-columns() {
|
722
709
|
$list: '';
|
723
|
-
|
710
|
+
$i: 1;
|
711
|
+
$list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
|
712
|
+
@for $i from 2 through $grid-columns {
|
724
713
|
$list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}, #{$list}";
|
725
714
|
}
|
726
|
-
$i: $grid-columns;
|
727
|
-
$list: "#{$list}, .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
|
728
715
|
#{$list} {
|
729
716
|
position: relative;
|
730
717
|
// Prevent columns from collapsing when empty
|
@@ -739,11 +726,11 @@
|
|
739
726
|
// [converter] Grid converted to use SASS cycles (LESS uses recursive nested mixin defs not supported by SASS)
|
740
727
|
@mixin make-grid-columns-float($class) {
|
741
728
|
$list: '';
|
742
|
-
|
729
|
+
$i: 1;
|
730
|
+
$list: ".col-#{$class}-#{$i}";
|
731
|
+
@for $i from 2 through $grid-columns {
|
743
732
|
$list: ".col-#{$class}-#{$i}, #{$list}";
|
744
733
|
}
|
745
|
-
$i: $grid-columns;
|
746
|
-
$list: "#{$list}, .col-#{$class}-#{$i}";
|
747
734
|
#{$list} {
|
748
735
|
float: left;
|
749
736
|
}
|
@@ -751,22 +738,22 @@
|
|
751
738
|
|
752
739
|
|
753
740
|
@mixin calc-grid($index, $class, $type) {
|
754
|
-
@if $type == width {
|
741
|
+
@if ($type == width) and ($index > 0) {
|
755
742
|
.col-#{$class}-#{$index} {
|
756
743
|
width: percentage(($index / $grid-columns));
|
757
744
|
}
|
758
745
|
}
|
759
|
-
@if $type == push {
|
746
|
+
@if ($type == push) {
|
760
747
|
.col-#{$class}-push-#{$index} {
|
761
748
|
left: percentage(($index / $grid-columns));
|
762
749
|
}
|
763
750
|
}
|
764
|
-
@if $type == pull {
|
751
|
+
@if ($type == pull) {
|
765
752
|
.col-#{$class}-pull-#{$index} {
|
766
753
|
right: percentage(($index / $grid-columns));
|
767
754
|
}
|
768
755
|
}
|
769
|
-
@if $type == offset {
|
756
|
+
@if ($type == offset) {
|
770
757
|
.col-#{$class}-offset-#{$index} {
|
771
758
|
margin-left: percentage(($index / $grid-columns));
|
772
759
|
}
|
@@ -775,7 +762,7 @@
|
|
775
762
|
|
776
763
|
// [converter] This is defined recursively in LESS, but SASS supports real loops
|
777
764
|
@mixin make-grid($columns, $class, $type) {
|
778
|
-
@for $i from
|
765
|
+
@for $i from 0 through $columns {
|
779
766
|
@include calc-grid($i, $class, $type);
|
780
767
|
}
|
781
768
|
}
|
@@ -35,10 +35,8 @@
|
|
35
35
|
// Shell div to position the modal with bottom padding
|
36
36
|
.modal-dialog {
|
37
37
|
position: relative;
|
38
|
-
margin-left: auto;
|
39
|
-
margin-right: auto;
|
40
38
|
width: auto;
|
41
|
-
|
39
|
+
margin: 10px;
|
42
40
|
z-index: ($zindex-modal-background + 10);
|
43
41
|
}
|
44
42
|
|
@@ -122,8 +120,7 @@
|
|
122
120
|
|
123
121
|
.modal-dialog {
|
124
122
|
width: 600px;
|
125
|
-
|
126
|
-
padding-bottom: 30px;
|
123
|
+
margin: 30px auto;
|
127
124
|
}
|
128
125
|
.modal-content {
|
129
126
|
@include box-shadow(0 5px 15px rgba(0,0,0,.5));
|
@@ -74,18 +74,16 @@
|
|
74
74
|
}
|
75
75
|
|
76
76
|
&.in {
|
77
|
-
overflow-y:
|
77
|
+
overflow-y: visible;
|
78
78
|
}
|
79
79
|
|
80
|
-
//
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
.navbar-
|
85
|
-
|
86
|
-
|
87
|
-
.navbar-text:last-child {
|
88
|
-
margin-right: 0;
|
80
|
+
// Undo the collapse side padding for navbars with containers to ensure
|
81
|
+
// alignment of right-aligned contents.
|
82
|
+
.navbar-fixed-top &,
|
83
|
+
.navbar-static-top &,
|
84
|
+
.navbar-fixed-bottom & {
|
85
|
+
padding-left: 0;
|
86
|
+
padding-right: 0;
|
89
87
|
}
|
90
88
|
}
|
91
89
|
}
|
@@ -180,6 +178,7 @@
|
|
180
178
|
padding: 9px 10px;
|
181
179
|
@include navbar-vertical-align(34px);
|
182
180
|
background-color: transparent;
|
181
|
+
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
183
182
|
border: 1px solid transparent;
|
184
183
|
border-radius: $border-radius-base;
|
185
184
|
|
@@ -214,7 +213,7 @@
|
|
214
213
|
line-height: $line-height-computed;
|
215
214
|
}
|
216
215
|
|
217
|
-
@media (max-width: $
|
216
|
+
@media (max-width: $grid-float-breakpoint-max) {
|
218
217
|
// Dropdowns get custom display when collapsed
|
219
218
|
.open .dropdown-menu {
|
220
219
|
position: static;
|
@@ -246,12 +245,15 @@
|
|
246
245
|
> li {
|
247
246
|
float: left;
|
248
247
|
> a {
|
249
|
-
padding-top:
|
250
|
-
padding-bottom:
|
248
|
+
padding-top: $navbar-padding-vertical;
|
249
|
+
padding-bottom: $navbar-padding-vertical;
|
251
250
|
}
|
252
251
|
}
|
253
|
-
}
|
254
252
|
|
253
|
+
&.navbar-right:last-child {
|
254
|
+
margin-right: -$navbar-padding-horizontal;
|
255
|
+
}
|
256
|
+
}
|
255
257
|
}
|
256
258
|
|
257
259
|
|
@@ -289,7 +291,7 @@
|
|
289
291
|
@extend .form-inline;
|
290
292
|
|
291
293
|
.form-group {
|
292
|
-
@media (max-width: $
|
294
|
+
@media (max-width: $grid-float-breakpoint-max) {
|
293
295
|
margin-bottom: 5px;
|
294
296
|
}
|
295
297
|
}
|
@@ -306,6 +308,11 @@
|
|
306
308
|
padding-top: 0;
|
307
309
|
padding-bottom: 0;
|
308
310
|
@include box-shadow(none);
|
311
|
+
|
312
|
+
// Outdent the form if last child to line up with content down the page
|
313
|
+
&.navbar-right:last-child {
|
314
|
+
margin-right: -$navbar-padding-horizontal;
|
315
|
+
}
|
309
316
|
}
|
310
317
|
}
|
311
318
|
|
@@ -336,6 +343,13 @@
|
|
336
343
|
|
337
344
|
.navbar-btn {
|
338
345
|
@include navbar-vertical-align($input-height-base);
|
346
|
+
|
347
|
+
&.btn-sm {
|
348
|
+
@include navbar-vertical-align($input-height-small);
|
349
|
+
}
|
350
|
+
&.btn-xs {
|
351
|
+
@include navbar-vertical-align(22);
|
352
|
+
}
|
339
353
|
}
|
340
354
|
|
341
355
|
|
@@ -344,12 +358,17 @@
|
|
344
358
|
// Add a class to make any element properly align itself vertically within the navbars.
|
345
359
|
|
346
360
|
.navbar-text {
|
347
|
-
float: left;
|
348
361
|
@include navbar-vertical-align($line-height-computed);
|
349
362
|
|
350
363
|
@media (min-width: $grid-float-breakpoint) {
|
364
|
+
float: left;
|
351
365
|
margin-left: $navbar-padding-horizontal;
|
352
366
|
margin-right: $navbar-padding-horizontal;
|
367
|
+
|
368
|
+
// Outdent the form if last child to line up with content down the page
|
369
|
+
&.navbar-right:last-child {
|
370
|
+
margin-right: 0;
|
371
|
+
}
|
353
372
|
}
|
354
373
|
}
|
355
374
|
|
@@ -418,15 +437,8 @@
|
|
418
437
|
border-color: $navbar-default-border;
|
419
438
|
}
|
420
439
|
|
421
|
-
// Dropdown menu items
|
440
|
+
// Dropdown menu items
|
422
441
|
.navbar-nav {
|
423
|
-
// Caret should match text color on hover
|
424
|
-
> .dropdown > a:hover .caret,
|
425
|
-
> .dropdown > a:focus .caret {
|
426
|
-
border-top-color: $navbar-default-link-hover-color;
|
427
|
-
border-bottom-color: $navbar-default-link-hover-color;
|
428
|
-
}
|
429
|
-
|
430
442
|
// Remove background color from open dropdown
|
431
443
|
> .open > a {
|
432
444
|
&,
|
@@ -434,19 +446,10 @@
|
|
434
446
|
&:focus {
|
435
447
|
background-color: $navbar-default-link-active-bg;
|
436
448
|
color: $navbar-default-link-active-color;
|
437
|
-
.caret {
|
438
|
-
border-top-color: $navbar-default-link-active-color;
|
439
|
-
border-bottom-color: $navbar-default-link-active-color;
|
440
|
-
}
|
441
449
|
}
|
442
450
|
}
|
443
|
-
> .dropdown > a .caret {
|
444
|
-
border-top-color: $navbar-default-link-color;
|
445
|
-
border-bottom-color: $navbar-default-link-color;
|
446
|
-
}
|
447
|
-
|
448
451
|
|
449
|
-
@media (max-width: $
|
452
|
+
@media (max-width: $grid-float-breakpoint-max) {
|
450
453
|
// Dropdowns get custom display when collapsed
|
451
454
|
.open .dropdown-menu {
|
452
455
|
> li > a {
|
@@ -565,31 +568,16 @@
|
|
565
568
|
color: $navbar-inverse-link-active-color;
|
566
569
|
}
|
567
570
|
}
|
568
|
-
> .dropdown > a:hover .caret {
|
569
|
-
border-top-color: $navbar-inverse-link-hover-color;
|
570
|
-
border-bottom-color: $navbar-inverse-link-hover-color;
|
571
|
-
}
|
572
|
-
> .dropdown > a .caret {
|
573
|
-
border-top-color: $navbar-inverse-link-color;
|
574
|
-
border-bottom-color: $navbar-inverse-link-color;
|
575
|
-
}
|
576
|
-
> .open > a {
|
577
|
-
&,
|
578
|
-
&:hover,
|
579
|
-
&:focus {
|
580
|
-
.caret {
|
581
|
-
border-top-color: $navbar-inverse-link-active-color;
|
582
|
-
border-bottom-color: $navbar-inverse-link-active-color;
|
583
|
-
}
|
584
|
-
}
|
585
|
-
}
|
586
571
|
|
587
|
-
@media (max-width: $
|
572
|
+
@media (max-width: $grid-float-breakpoint-max) {
|
588
573
|
// Dropdowns get custom display
|
589
574
|
.open .dropdown-menu {
|
590
575
|
> .dropdown-header {
|
591
576
|
border-color: $navbar-inverse-border;
|
592
577
|
}
|
578
|
+
.divider {
|
579
|
+
background-color: $navbar-inverse-border;
|
580
|
+
}
|
593
581
|
> li > a {
|
594
582
|
color: $navbar-inverse-link-color;
|
595
583
|
&:hover,
|
@@ -48,11 +48,6 @@
|
|
48
48
|
&:focus {
|
49
49
|
background-color: $nav-link-hover-bg;
|
50
50
|
border-color: $link-color;
|
51
|
-
|
52
|
-
.caret {
|
53
|
-
border-top-color: $link-hover-color;
|
54
|
-
border-bottom-color: $link-hover-color;
|
55
|
-
}
|
56
51
|
}
|
57
52
|
}
|
58
53
|
|
@@ -138,11 +133,6 @@
|
|
138
133
|
&:focus {
|
139
134
|
color: $nav-pills-active-link-hover-color;
|
140
135
|
background-color: $nav-pills-active-link-hover-bg;
|
141
|
-
|
142
|
-
.caret {
|
143
|
-
border-top-color: $nav-pills-active-link-hover-color;
|
144
|
-
border-bottom-color: $nav-pills-active-link-hover-color;
|
145
|
-
}
|
146
136
|
}
|
147
137
|
}
|
148
138
|
}
|
@@ -243,16 +233,6 @@
|
|
243
233
|
// Dropdowns
|
244
234
|
// -------------------------
|
245
235
|
|
246
|
-
// Make dropdown carets use link color in navs
|
247
|
-
.nav .caret {
|
248
|
-
border-top-color: $link-color;
|
249
|
-
border-bottom-color: $link-color;
|
250
|
-
}
|
251
|
-
.nav a:hover .caret {
|
252
|
-
border-top-color: $link-hover-color;
|
253
|
-
border-bottom-color: $link-hover-color;
|
254
|
-
}
|
255
|
-
|
256
236
|
// Specific dropdowns
|
257
237
|
.nav-tabs .dropdown-menu {
|
258
238
|
// make dropdown border overlap tab border
|
@@ -57,13 +57,17 @@
|
|
57
57
|
|
58
58
|
.panel {
|
59
59
|
> .table,
|
60
|
-
> .table-responsive {
|
60
|
+
> .table-responsive > .table {
|
61
61
|
margin-bottom: 0;
|
62
62
|
}
|
63
63
|
> .panel-body + .table,
|
64
64
|
> .panel-body + .table-responsive {
|
65
65
|
border-top: 1px solid $table-border-color;
|
66
66
|
}
|
67
|
+
> .table > tbody:first-child th,
|
68
|
+
> .table > tbody:first-child td {
|
69
|
+
border-top: 0;
|
70
|
+
}
|
67
71
|
> .table-bordered,
|
68
72
|
> .table-responsive > .table-bordered {
|
69
73
|
border: 0;
|
@@ -87,6 +91,10 @@
|
|
87
91
|
}
|
88
92
|
}
|
89
93
|
}
|
94
|
+
> .table-responsive {
|
95
|
+
border: 0;
|
96
|
+
margin-bottom: 0;
|
97
|
+
}
|
90
98
|
}
|
91
99
|
|
92
100
|
|
@@ -106,6 +114,8 @@
|
|
106
114
|
margin-top: 0;
|
107
115
|
margin-bottom: 0;
|
108
116
|
font-size: ceil(($font-size-base * 1.125));
|
117
|
+
color: inherit;
|
118
|
+
|
109
119
|
> a {
|
110
120
|
color: inherit;
|
111
121
|
}
|
@@ -12,18 +12,6 @@
|
|
12
12
|
to { background-position: 0 0; }
|
13
13
|
}
|
14
14
|
|
15
|
-
// Firefox
|
16
|
-
@-moz-keyframes progress-bar-stripes {
|
17
|
-
from { background-position: 40px 0; }
|
18
|
-
to { background-position: 0 0; }
|
19
|
-
}
|
20
|
-
|
21
|
-
// Opera
|
22
|
-
@-o-keyframes progress-bar-stripes {
|
23
|
-
from { background-position: 0 0; }
|
24
|
-
to { background-position: 40px 0; }
|
25
|
-
}
|
26
|
-
|
27
15
|
// Spec and IE10+
|
28
16
|
@keyframes progress-bar-stripes {
|
29
17
|
from { background-position: 40px 0; }
|
@@ -104,10 +104,12 @@ th {
|
|
104
104
|
//
|
105
105
|
// Default zebra-stripe styles (alternating gray and transparent backgrounds)
|
106
106
|
|
107
|
-
.table-striped
|
108
|
-
>
|
109
|
-
|
110
|
-
|
107
|
+
.table-striped {
|
108
|
+
> tbody > tr:nth-child(odd) {
|
109
|
+
> td,
|
110
|
+
> th {
|
111
|
+
background-color: $table-bg-accent;
|
112
|
+
}
|
111
113
|
}
|
112
114
|
}
|
113
115
|
|
@@ -116,10 +118,12 @@ th {
|
|
116
118
|
//
|
117
119
|
// Placed here since it has to come after the potential zebra striping
|
118
120
|
|
119
|
-
.table-hover
|
120
|
-
>
|
121
|
-
|
122
|
-
|
121
|
+
.table-hover {
|
122
|
+
> tbody > tr:hover {
|
123
|
+
> td,
|
124
|
+
> th {
|
125
|
+
background-color: $table-bg-hover;
|
126
|
+
}
|
123
127
|
}
|
124
128
|
}
|
125
129
|
|
@@ -129,6 +133,7 @@ th {
|
|
129
133
|
// Reset default table behavior
|
130
134
|
|
131
135
|
table col[class*="col-"] {
|
136
|
+
position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
|
132
137
|
float: none;
|
133
138
|
display: table-column;
|
134
139
|
}
|
@@ -148,21 +153,11 @@ table {
|
|
148
153
|
// Exact selectors below required to override `.table-striped` and prevent
|
149
154
|
// inheritance to nested tables.
|
150
155
|
|
151
|
-
.table > thead > tr,
|
152
|
-
.table > tbody > tr,
|
153
|
-
.table > tfoot > tr {
|
154
|
-
> td.active,
|
155
|
-
> th.active,
|
156
|
-
&.active > td,
|
157
|
-
&.active > th {
|
158
|
-
background-color: $table-bg-active;
|
159
|
-
}
|
160
|
-
}
|
161
|
-
|
162
156
|
// Generate the contextual variants
|
163
|
-
@include table-row-variant('
|
164
|
-
@include table-row-variant('
|
165
|
-
@include table-row-variant('
|
157
|
+
@include table-row-variant('active', $table-bg-active);
|
158
|
+
@include table-row-variant('success', $state-success-bg);
|
159
|
+
@include table-row-variant('danger', $state-danger-bg);
|
160
|
+
@include table-row-variant('warning', $state-warning-bg);
|
166
161
|
|
167
162
|
|
168
163
|
// Responsive tables
|