bootstrap-sass 3.3.4.1 → 3.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.travis.yml +8 -12
- data/CHANGELOG.md +26 -0
- data/Gemfile +1 -4
- data/LICENSE +2 -1
- data/README.md +80 -74
- data/Rakefile +46 -11
- data/assets/javascripts/bootstrap.js +441 -178
- data/assets/javascripts/bootstrap.min.js +4 -5
- data/assets/javascripts/bootstrap/affix.js +8 -6
- data/assets/javascripts/bootstrap/alert.js +6 -5
- data/assets/javascripts/bootstrap/button.js +24 -15
- data/assets/javascripts/bootstrap/carousel.js +16 -7
- data/assets/javascripts/bootstrap/collapse.js +7 -6
- data/assets/javascripts/bootstrap/dropdown.js +49 -45
- data/assets/javascripts/bootstrap/modal.js +47 -28
- data/assets/javascripts/bootstrap/popover.js +25 -10
- data/assets/javascripts/bootstrap/scrollspy.js +4 -4
- data/assets/javascripts/bootstrap/tab.js +13 -11
- data/assets/javascripts/bootstrap/tooltip.js +232 -31
- data/assets/javascripts/bootstrap/transition.js +5 -5
- data/assets/stylesheets/_bootstrap-mincer.scss +2 -2
- data/assets/stylesheets/_bootstrap.scss +6 -0
- data/assets/stylesheets/bootstrap/_alerts.scss +3 -3
- data/assets/stylesheets/bootstrap/_badges.scss +3 -3
- data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
- data/assets/stylesheets/bootstrap/_button-groups.scss +9 -8
- data/assets/stylesheets/bootstrap/_buttons.scss +17 -9
- data/assets/stylesheets/bootstrap/_carousel.scss +34 -32
- data/assets/stylesheets/bootstrap/_close.scss +1 -0
- data/assets/stylesheets/bootstrap/_code.scss +3 -3
- data/assets/stylesheets/bootstrap/_component-animations.scss +1 -0
- data/assets/stylesheets/bootstrap/_dropdowns.scss +22 -23
- data/assets/stylesheets/bootstrap/_forms.scss +101 -72
- data/assets/stylesheets/bootstrap/_glyphicons.scss +15 -13
- data/assets/stylesheets/bootstrap/_grid.scss +10 -0
- data/assets/stylesheets/bootstrap/_input-groups.scss +10 -5
- data/assets/stylesheets/bootstrap/_jumbotron.scss +8 -4
- data/assets/stylesheets/bootstrap/_labels.scss +1 -1
- data/assets/stylesheets/bootstrap/_list-group.scss +30 -26
- data/assets/stylesheets/bootstrap/_media.scss +6 -1
- data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
- data/assets/stylesheets/bootstrap/_modals.scss +8 -8
- data/assets/stylesheets/bootstrap/_navbar.scss +75 -81
- data/assets/stylesheets/bootstrap/_navs.scss +4 -4
- data/assets/stylesheets/bootstrap/_normalize.scss +13 -13
- data/assets/stylesheets/bootstrap/_pager.scss +2 -2
- data/assets/stylesheets/bootstrap/_pagination.scss +15 -17
- data/assets/stylesheets/bootstrap/_panels.scss +11 -5
- data/assets/stylesheets/bootstrap/_popovers.scss +50 -59
- data/assets/stylesheets/bootstrap/_print.scss +90 -98
- data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
- data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -2
- data/assets/stylesheets/bootstrap/_responsive-utilities.scss +7 -5
- data/assets/stylesheets/bootstrap/_scaffolding.scss +8 -9
- data/assets/stylesheets/bootstrap/_tables.scss +23 -23
- data/assets/stylesheets/bootstrap/_theme.scss +42 -20
- data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
- data/assets/stylesheets/bootstrap/_tooltip.scss +42 -32
- data/assets/stylesheets/bootstrap/_type.scss +11 -11
- data/assets/stylesheets/bootstrap/_variables.scss +16 -8
- data/assets/stylesheets/bootstrap/_wells.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_buttons.scss +20 -11
- data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
- data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +8 -8
- data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
- data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
- data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
- data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
- data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -5
- data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +3 -3
- data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +3 -3
- data/bootstrap-sass.gemspec +10 -9
- data/bower.json +5 -9
- data/composer.json +2 -2
- data/eyeglass-exports.js +7 -0
- data/lib/bootstrap-sass.rb +18 -11
- data/lib/bootstrap-sass/engine.rb +6 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/package-lock.json +1611 -0
- data/package.json +20 -6
- data/sache.json +1 -1
- data/tasks/converter/less_conversion.rb +20 -9
- data/tasks/converter/network.rb +2 -2
- data/templates/project/_bootstrap-variables.sass +17 -9
- data/test/compilation_test.rb +24 -12
- data/test/dummy_rails/config/application.rb +2 -1
- data/test/dummy_rails/config/boot.rb +1 -1
- data/test/dummy_sass_only/Gemfile +1 -1
- data/test/dummy_sass_only/compile.rb +14 -7
- data/test/dummy_sass_only/import_all.scss +2 -0
- data/test/gemfiles/default.gemfile +3 -0
- data/test/node_mincer_test.rb +2 -3
- data/test/node_sass_compile_test.sh +4 -3
- data/test/sass_test.rb +10 -7
- data/test/sprockets_rails_test.rb +12 -8
- data/test/support/dummy_rails_integration.rb +1 -1
- data/test/support/reporting.rb +10 -0
- data/test/test_helper.rb +3 -2
- metadata +38 -29
- data/test/compass_test.rb +0 -9
- data/test/dummy_sass_only/import_all.sass +0 -2
- data/test/gemfiles/sass_3_2.gemfile +0 -6
- data/test/gemfiles/sass_3_3.gemfile +0 -6
- data/test/gemfiles/sass_3_4.gemfile +0 -7
- data/test/gemfiles/sass_head.gemfile +0 -6
@@ -7,15 +7,17 @@
|
|
7
7
|
//
|
8
8
|
// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
|
9
9
|
|
10
|
-
|
11
|
-
|
12
|
-
font-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
10
|
+
@at-root {
|
11
|
+
// Import the fonts
|
12
|
+
@font-face {
|
13
|
+
font-family: "Glyphicons Halflings";
|
14
|
+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.eot"), "#{$icon-font-path}#{$icon-font-name}.eot"));
|
15
|
+
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"),
|
16
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.woff2"), "#{$icon-font-path}#{$icon-font-name}.woff2")) format("woff2"),
|
17
|
+
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"),
|
18
|
+
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"),
|
19
|
+
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");
|
20
|
+
}
|
19
21
|
}
|
20
22
|
|
21
23
|
// Catchall baseclass
|
@@ -23,17 +25,17 @@
|
|
23
25
|
position: relative;
|
24
26
|
top: 1px;
|
25
27
|
display: inline-block;
|
26
|
-
font-family:
|
28
|
+
font-family: "Glyphicons Halflings";
|
27
29
|
font-style: normal;
|
28
|
-
font-weight:
|
30
|
+
font-weight: 400;
|
29
31
|
line-height: 1;
|
30
32
|
-webkit-font-smoothing: antialiased;
|
31
33
|
-moz-osx-font-smoothing: grayscale;
|
32
34
|
}
|
33
35
|
|
34
36
|
// Individual icons
|
35
|
-
.glyphicon-asterisk { &:before { content: "\
|
36
|
-
.glyphicon-plus { &:before { content: "\
|
37
|
+
.glyphicon-asterisk { &:before { content: "\002a"; } }
|
38
|
+
.glyphicon-plus { &:before { content: "\002b"; } }
|
37
39
|
.glyphicon-euro,
|
38
40
|
.glyphicon-eur { &:before { content: "\20ac"; } }
|
39
41
|
.glyphicon-minus { &:before { content: "\2212"; } }
|
@@ -12,8 +12,8 @@
|
|
12
12
|
// Undo padding and float of grid classes
|
13
13
|
&[class*="col-"] {
|
14
14
|
float: none;
|
15
|
-
padding-left: 0;
|
16
15
|
padding-right: 0;
|
16
|
+
padding-left: 0;
|
17
17
|
}
|
18
18
|
|
19
19
|
.form-control {
|
@@ -29,6 +29,10 @@
|
|
29
29
|
|
30
30
|
width: 100%;
|
31
31
|
margin-bottom: 0;
|
32
|
+
|
33
|
+
&:focus {
|
34
|
+
z-index: 3;
|
35
|
+
}
|
32
36
|
}
|
33
37
|
}
|
34
38
|
|
@@ -73,24 +77,24 @@
|
|
73
77
|
.input-group-addon {
|
74
78
|
padding: $padding-base-vertical $padding-base-horizontal;
|
75
79
|
font-size: $font-size-base;
|
76
|
-
font-weight:
|
80
|
+
font-weight: 400;
|
77
81
|
line-height: 1;
|
78
82
|
color: $input-color;
|
79
83
|
text-align: center;
|
80
84
|
background-color: $input-group-addon-bg;
|
81
85
|
border: 1px solid $input-group-addon-border-color;
|
82
|
-
border-radius: $border-radius
|
86
|
+
border-radius: $input-border-radius;
|
83
87
|
|
84
88
|
// Sizing
|
85
89
|
&.input-sm {
|
86
90
|
padding: $padding-small-vertical $padding-small-horizontal;
|
87
91
|
font-size: $font-size-small;
|
88
|
-
border-radius: $border-radius-small;
|
92
|
+
border-radius: $input-border-radius-small;
|
89
93
|
}
|
90
94
|
&.input-lg {
|
91
95
|
padding: $padding-large-vertical $padding-large-horizontal;
|
92
96
|
font-size: $font-size-large;
|
93
|
-
border-radius: $border-radius-large;
|
97
|
+
border-radius: $input-border-radius-large;
|
94
98
|
}
|
95
99
|
|
96
100
|
// Nuke default margins from checkboxes and radios to vertically center within.
|
@@ -160,6 +164,7 @@
|
|
160
164
|
&:last-child {
|
161
165
|
> .btn,
|
162
166
|
> .btn-group {
|
167
|
+
z-index: 2;
|
163
168
|
margin-left: -1px;
|
164
169
|
}
|
165
170
|
}
|
@@ -4,7 +4,8 @@
|
|
4
4
|
|
5
5
|
|
6
6
|
.jumbotron {
|
7
|
-
padding: $jumbotron-padding
|
7
|
+
padding-top: $jumbotron-padding;
|
8
|
+
padding-bottom: $jumbotron-padding;
|
8
9
|
margin-bottom: $jumbotron-padding;
|
9
10
|
color: $jumbotron-color;
|
10
11
|
background-color: $jumbotron-bg;
|
@@ -26,6 +27,8 @@
|
|
26
27
|
|
27
28
|
.container &,
|
28
29
|
.container-fluid & {
|
30
|
+
padding-right: ($grid-gutter-width / 2);
|
31
|
+
padding-left: ($grid-gutter-width / 2);
|
29
32
|
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
|
30
33
|
}
|
31
34
|
|
@@ -34,17 +37,18 @@
|
|
34
37
|
}
|
35
38
|
|
36
39
|
@media screen and (min-width: $screen-sm-min) {
|
37
|
-
padding: ($jumbotron-padding * 1.6)
|
40
|
+
padding-top: ($jumbotron-padding * 1.6);
|
41
|
+
padding-bottom: ($jumbotron-padding * 1.6);
|
38
42
|
|
39
43
|
.container &,
|
40
44
|
.container-fluid & {
|
41
|
-
padding-left: ($jumbotron-padding * 2);
|
42
45
|
padding-right: ($jumbotron-padding * 2);
|
46
|
+
padding-left: ($jumbotron-padding * 2);
|
43
47
|
}
|
44
48
|
|
45
49
|
h1,
|
46
50
|
.h1 {
|
47
|
-
font-size:
|
51
|
+
font-size: $jumbotron-heading-font-size;
|
48
52
|
}
|
49
53
|
}
|
50
54
|
}
|
@@ -9,8 +9,8 @@
|
|
9
9
|
|
10
10
|
.list-group {
|
11
11
|
// No need to set list-style: none; since .list-group-item is block level
|
12
|
-
margin-bottom: 20px;
|
13
12
|
padding-left: 0; // reset padding because ul and ol
|
13
|
+
margin-bottom: 20px;
|
14
14
|
}
|
15
15
|
|
16
16
|
|
@@ -35,38 +35,14 @@
|
|
35
35
|
margin-bottom: 0;
|
36
36
|
@include border-bottom-radius($list-group-border-radius);
|
37
37
|
}
|
38
|
-
}
|
39
|
-
|
40
|
-
|
41
|
-
// Linked list items
|
42
|
-
//
|
43
|
-
// Use anchor elements instead of `li`s or `div`s to create linked list items.
|
44
|
-
// Includes an extra `.active` modifier class for showing selected items.
|
45
|
-
|
46
|
-
a.list-group-item {
|
47
|
-
color: $list-group-link-color;
|
48
38
|
|
49
|
-
.list-group-item-heading {
|
50
|
-
color: $list-group-link-heading-color;
|
51
|
-
}
|
52
|
-
|
53
|
-
// Hover state
|
54
|
-
&:hover,
|
55
|
-
&:focus {
|
56
|
-
text-decoration: none;
|
57
|
-
color: $list-group-link-hover-color;
|
58
|
-
background-color: $list-group-hover-bg;
|
59
|
-
}
|
60
|
-
}
|
61
|
-
|
62
|
-
.list-group-item {
|
63
39
|
// Disabled state
|
64
40
|
&.disabled,
|
65
41
|
&.disabled:hover,
|
66
42
|
&.disabled:focus {
|
67
|
-
background-color: $list-group-disabled-bg;
|
68
43
|
color: $list-group-disabled-color;
|
69
44
|
cursor: $cursor-disabled;
|
45
|
+
background-color: $list-group-disabled-bg;
|
70
46
|
|
71
47
|
// Force color to inherit for custom content
|
72
48
|
.list-group-item-heading {
|
@@ -99,6 +75,34 @@ a.list-group-item {
|
|
99
75
|
}
|
100
76
|
|
101
77
|
|
78
|
+
// Interactive list items
|
79
|
+
//
|
80
|
+
// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
|
81
|
+
// Includes an extra `.active` modifier class for showing selected items.
|
82
|
+
|
83
|
+
a.list-group-item,
|
84
|
+
button.list-group-item {
|
85
|
+
color: $list-group-link-color;
|
86
|
+
|
87
|
+
.list-group-item-heading {
|
88
|
+
color: $list-group-link-heading-color;
|
89
|
+
}
|
90
|
+
|
91
|
+
// Hover state
|
92
|
+
&:hover,
|
93
|
+
&:focus {
|
94
|
+
color: $list-group-link-hover-color;
|
95
|
+
text-decoration: none;
|
96
|
+
background-color: $list-group-hover-bg;
|
97
|
+
}
|
98
|
+
}
|
99
|
+
|
100
|
+
button.list-group-item {
|
101
|
+
width: 100%;
|
102
|
+
text-align: left;
|
103
|
+
}
|
104
|
+
|
105
|
+
|
102
106
|
// Contextual variants
|
103
107
|
//
|
104
108
|
// Add modifier classes to change text and background color on individual items.
|
@@ -9,8 +9,8 @@
|
|
9
9
|
|
10
10
|
.media,
|
11
11
|
.media-body {
|
12
|
-
zoom: 1;
|
13
12
|
overflow: hidden;
|
13
|
+
zoom: 1;
|
14
14
|
}
|
15
15
|
|
16
16
|
.media-body {
|
@@ -19,6 +19,11 @@
|
|
19
19
|
|
20
20
|
.media-object {
|
21
21
|
display: block;
|
22
|
+
|
23
|
+
// Fix collapse in webkit from max-width: 100% and display: table-cell.
|
24
|
+
&.img-thumbnail {
|
25
|
+
max-width: none;
|
26
|
+
}
|
22
27
|
}
|
23
28
|
|
24
29
|
.media-right,
|
@@ -14,14 +14,14 @@
|
|
14
14
|
|
15
15
|
// Container that the modal scrolls within
|
16
16
|
.modal {
|
17
|
-
display: none;
|
18
|
-
overflow: hidden;
|
19
17
|
position: fixed;
|
20
18
|
top: 0;
|
21
19
|
right: 0;
|
22
20
|
bottom: 0;
|
23
21
|
left: 0;
|
24
22
|
z-index: $zindex-modal;
|
23
|
+
display: none;
|
24
|
+
overflow: hidden;
|
25
25
|
-webkit-overflow-scrolling: touch;
|
26
26
|
|
27
27
|
// Prevent Chrome on Windows from adding a focus outline. For details, see
|
@@ -33,7 +33,7 @@
|
|
33
33
|
@include translate(0, -25%);
|
34
34
|
@include transition-transform(0.3s ease-out);
|
35
35
|
}
|
36
|
-
&.in .modal-dialog { @include translate(0, 0) }
|
36
|
+
&.in .modal-dialog { @include translate(0, 0); }
|
37
37
|
}
|
38
38
|
.modal-open .modal {
|
39
39
|
overflow-x: hidden;
|
@@ -51,11 +51,11 @@
|
|
51
51
|
.modal-content {
|
52
52
|
position: relative;
|
53
53
|
background-color: $modal-content-bg;
|
54
|
+
background-clip: padding-box;
|
54
55
|
border: 1px solid $modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
|
55
56
|
border: 1px solid $modal-content-border-color;
|
56
57
|
border-radius: $border-radius-large;
|
57
|
-
@include box-shadow(0 3px 9px rgba(0,0,0
|
58
|
-
background-clip: padding-box;
|
58
|
+
@include box-shadow(0 3px 9px rgba(0, 0, 0, .5));
|
59
59
|
// Remove focus outline from opened modal
|
60
60
|
outline: 0;
|
61
61
|
}
|
@@ -79,7 +79,7 @@
|
|
79
79
|
.modal-header {
|
80
80
|
padding: $modal-title-padding;
|
81
81
|
border-bottom: 1px solid $modal-header-border-color;
|
82
|
-
|
82
|
+
@include clearfix;
|
83
83
|
}
|
84
84
|
// Close icon
|
85
85
|
.modal-header .close {
|
@@ -108,8 +108,8 @@
|
|
108
108
|
|
109
109
|
// Properly space out buttons
|
110
110
|
.btn + .btn {
|
111
|
-
margin-left: 5px;
|
112
111
|
margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
|
112
|
+
margin-left: 5px;
|
113
113
|
}
|
114
114
|
// but override that for button groups
|
115
115
|
.btn-group .btn + .btn {
|
@@ -138,7 +138,7 @@
|
|
138
138
|
margin: 30px auto;
|
139
139
|
}
|
140
140
|
.modal-content {
|
141
|
-
@include box-shadow(0 5px 15px rgba(0,0,0
|
141
|
+
@include box-shadow(0 5px 15px rgba(0, 0, 0, .5));
|
142
142
|
}
|
143
143
|
|
144
144
|
// Modal sizes
|
@@ -48,11 +48,11 @@
|
|
48
48
|
// content for the user's viewport.
|
49
49
|
|
50
50
|
.navbar-collapse {
|
51
|
-
overflow-x: visible;
|
52
51
|
padding-right: $navbar-padding-horizontal;
|
53
|
-
padding-left:
|
52
|
+
padding-left: $navbar-padding-horizontal;
|
53
|
+
overflow-x: visible;
|
54
54
|
border-top: 1px solid transparent;
|
55
|
-
box-shadow: inset 0 1px 0 rgba(255,255,255
|
55
|
+
box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
|
56
56
|
@include clearfix;
|
57
57
|
-webkit-overflow-scrolling: touch;
|
58
58
|
|
@@ -81,8 +81,8 @@
|
|
81
81
|
.navbar-fixed-top &,
|
82
82
|
.navbar-static-top &,
|
83
83
|
.navbar-fixed-bottom & {
|
84
|
-
padding-left: 0;
|
85
84
|
padding-right: 0;
|
85
|
+
padding-left: 0;
|
86
86
|
}
|
87
87
|
}
|
88
88
|
}
|
@@ -96,6 +96,27 @@
|
|
96
96
|
max-height: 200px;
|
97
97
|
}
|
98
98
|
}
|
99
|
+
|
100
|
+
// Fix the top/bottom navbars when screen real estate supports it
|
101
|
+
position: fixed;
|
102
|
+
right: 0;
|
103
|
+
left: 0;
|
104
|
+
z-index: $zindex-navbar-fixed;
|
105
|
+
|
106
|
+
// Undo the rounded corners
|
107
|
+
@media (min-width: $grid-float-breakpoint) {
|
108
|
+
border-radius: 0;
|
109
|
+
}
|
110
|
+
}
|
111
|
+
|
112
|
+
.navbar-fixed-top {
|
113
|
+
top: 0;
|
114
|
+
border-width: 0 0 1px;
|
115
|
+
}
|
116
|
+
.navbar-fixed-bottom {
|
117
|
+
bottom: 0;
|
118
|
+
margin-bottom: 0; // override .navbar defaults
|
119
|
+
border-width: 1px 0 0;
|
99
120
|
}
|
100
121
|
|
101
122
|
|
@@ -108,11 +129,11 @@
|
|
108
129
|
> .navbar-header,
|
109
130
|
> .navbar-collapse {
|
110
131
|
margin-right: -$navbar-padding-horizontal;
|
111
|
-
margin-left:
|
132
|
+
margin-left: -$navbar-padding-horizontal;
|
112
133
|
|
113
134
|
@media (min-width: $grid-float-breakpoint) {
|
114
135
|
margin-right: 0;
|
115
|
-
margin-left:
|
136
|
+
margin-left: 0;
|
116
137
|
}
|
117
138
|
}
|
118
139
|
}
|
@@ -134,38 +155,15 @@
|
|
134
155
|
}
|
135
156
|
}
|
136
157
|
|
137
|
-
// Fix the top/bottom navbars when screen real estate supports it
|
138
|
-
.navbar-fixed-top,
|
139
|
-
.navbar-fixed-bottom {
|
140
|
-
position: fixed;
|
141
|
-
right: 0;
|
142
|
-
left: 0;
|
143
|
-
z-index: $zindex-navbar-fixed;
|
144
|
-
|
145
|
-
// Undo the rounded corners
|
146
|
-
@media (min-width: $grid-float-breakpoint) {
|
147
|
-
border-radius: 0;
|
148
|
-
}
|
149
|
-
}
|
150
|
-
.navbar-fixed-top {
|
151
|
-
top: 0;
|
152
|
-
border-width: 0 0 1px;
|
153
|
-
}
|
154
|
-
.navbar-fixed-bottom {
|
155
|
-
bottom: 0;
|
156
|
-
margin-bottom: 0; // override .navbar defaults
|
157
|
-
border-width: 1px 0 0;
|
158
|
-
}
|
159
|
-
|
160
158
|
|
161
159
|
// Brand/project name
|
162
160
|
|
163
161
|
.navbar-brand {
|
164
162
|
float: left;
|
163
|
+
height: $navbar-height;
|
165
164
|
padding: $navbar-padding-vertical $navbar-padding-horizontal;
|
166
165
|
font-size: $font-size-large;
|
167
166
|
line-height: $line-height-computed;
|
168
|
-
height: $navbar-height;
|
169
167
|
|
170
168
|
&:hover,
|
171
169
|
&:focus {
|
@@ -193,8 +191,8 @@
|
|
193
191
|
.navbar-toggle {
|
194
192
|
position: relative;
|
195
193
|
float: right;
|
196
|
-
margin-right: $navbar-padding-horizontal;
|
197
194
|
padding: 9px 10px;
|
195
|
+
margin-right: $navbar-padding-horizontal;
|
198
196
|
@include navbar-vertical-align(34px);
|
199
197
|
background-color: transparent;
|
200
198
|
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
@@ -233,7 +231,7 @@
|
|
233
231
|
margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
|
234
232
|
|
235
233
|
> li > a {
|
236
|
-
padding-top:
|
234
|
+
padding-top: 10px;
|
237
235
|
padding-bottom: 10px;
|
238
236
|
line-height: $line-height-computed;
|
239
237
|
}
|
@@ -270,7 +268,7 @@
|
|
270
268
|
> li {
|
271
269
|
float: left;
|
272
270
|
> a {
|
273
|
-
padding-top:
|
271
|
+
padding-top: $navbar-padding-vertical;
|
274
272
|
padding-bottom: $navbar-padding-vertical;
|
275
273
|
}
|
276
274
|
}
|
@@ -284,12 +282,12 @@
|
|
284
282
|
// our navbars.
|
285
283
|
|
286
284
|
.navbar-form {
|
287
|
-
margin-left: -$navbar-padding-horizontal;
|
288
|
-
margin-right: -$navbar-padding-horizontal;
|
289
285
|
padding: 10px $navbar-padding-horizontal;
|
286
|
+
margin-right: -$navbar-padding-horizontal;
|
287
|
+
margin-left: -$navbar-padding-horizontal;
|
290
288
|
border-top: 1px solid transparent;
|
291
289
|
border-bottom: 1px solid transparent;
|
292
|
-
$shadow: inset 0 1px 0 rgba(255,255,255
|
290
|
+
$shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
|
293
291
|
@include box-shadow($shadow);
|
294
292
|
|
295
293
|
// Mixin behavior for optimum display
|
@@ -311,11 +309,11 @@
|
|
311
309
|
// Undo 100% width for pull classes
|
312
310
|
@media (min-width: $grid-float-breakpoint) {
|
313
311
|
width: auto;
|
314
|
-
border: 0;
|
315
|
-
margin-left: 0;
|
316
|
-
margin-right: 0;
|
317
312
|
padding-top: 0;
|
318
313
|
padding-bottom: 0;
|
314
|
+
margin-right: 0;
|
315
|
+
margin-left: 0;
|
316
|
+
border: 0;
|
319
317
|
@include box-shadow(none);
|
320
318
|
}
|
321
319
|
}
|
@@ -361,8 +359,8 @@
|
|
361
359
|
|
362
360
|
@media (min-width: $grid-float-breakpoint) {
|
363
361
|
float: left;
|
364
|
-
margin-left: $navbar-padding-horizontal;
|
365
362
|
margin-right: $navbar-padding-horizontal;
|
363
|
+
margin-left: $navbar-padding-horizontal;
|
366
364
|
}
|
367
365
|
}
|
368
366
|
|
@@ -437,33 +435,15 @@
|
|
437
435
|
background-color: $navbar-default-link-disabled-bg;
|
438
436
|
}
|
439
437
|
}
|
440
|
-
}
|
441
|
-
|
442
|
-
.navbar-toggle {
|
443
|
-
border-color: $navbar-default-toggle-border-color;
|
444
|
-
&:hover,
|
445
|
-
&:focus {
|
446
|
-
background-color: $navbar-default-toggle-hover-bg;
|
447
|
-
}
|
448
|
-
.icon-bar {
|
449
|
-
background-color: $navbar-default-toggle-icon-bar-bg;
|
450
|
-
}
|
451
|
-
}
|
452
438
|
|
453
|
-
|
454
|
-
.navbar-form {
|
455
|
-
border-color: $navbar-default-border;
|
456
|
-
}
|
457
|
-
|
458
|
-
// Dropdown menu items
|
459
|
-
.navbar-nav {
|
439
|
+
// Dropdown menu items
|
460
440
|
// Remove background color from open dropdown
|
461
441
|
> .open > a {
|
462
442
|
&,
|
463
443
|
&:hover,
|
464
444
|
&:focus {
|
465
|
-
background-color: $navbar-default-link-active-bg;
|
466
445
|
color: $navbar-default-link-active-color;
|
446
|
+
background-color: $navbar-default-link-active-bg;
|
467
447
|
}
|
468
448
|
}
|
469
449
|
|
@@ -498,6 +478,22 @@
|
|
498
478
|
}
|
499
479
|
}
|
500
480
|
|
481
|
+
.navbar-toggle {
|
482
|
+
border-color: $navbar-default-toggle-border-color;
|
483
|
+
&:hover,
|
484
|
+
&:focus {
|
485
|
+
background-color: $navbar-default-toggle-hover-bg;
|
486
|
+
}
|
487
|
+
.icon-bar {
|
488
|
+
background-color: $navbar-default-toggle-icon-bar-bg;
|
489
|
+
}
|
490
|
+
}
|
491
|
+
|
492
|
+
.navbar-collapse,
|
493
|
+
.navbar-form {
|
494
|
+
border-color: $navbar-default-border;
|
495
|
+
}
|
496
|
+
|
501
497
|
|
502
498
|
// Links in navbars
|
503
499
|
//
|
@@ -571,33 +567,14 @@
|
|
571
567
|
background-color: $navbar-inverse-link-disabled-bg;
|
572
568
|
}
|
573
569
|
}
|
574
|
-
}
|
575
|
-
|
576
|
-
// Darken the responsive nav toggle
|
577
|
-
.navbar-toggle {
|
578
|
-
border-color: $navbar-inverse-toggle-border-color;
|
579
|
-
&:hover,
|
580
|
-
&:focus {
|
581
|
-
background-color: $navbar-inverse-toggle-hover-bg;
|
582
|
-
}
|
583
|
-
.icon-bar {
|
584
|
-
background-color: $navbar-inverse-toggle-icon-bar-bg;
|
585
|
-
}
|
586
|
-
}
|
587
570
|
|
588
|
-
|
589
|
-
.navbar-form {
|
590
|
-
border-color: darken($navbar-inverse-bg, 7%);
|
591
|
-
}
|
592
|
-
|
593
|
-
// Dropdowns
|
594
|
-
.navbar-nav {
|
571
|
+
// Dropdowns
|
595
572
|
> .open > a {
|
596
573
|
&,
|
597
574
|
&:hover,
|
598
575
|
&:focus {
|
599
|
-
background-color: $navbar-inverse-link-active-bg;
|
600
576
|
color: $navbar-inverse-link-active-color;
|
577
|
+
background-color: $navbar-inverse-link-active-bg;
|
601
578
|
}
|
602
579
|
}
|
603
580
|
|
@@ -638,6 +615,23 @@
|
|
638
615
|
}
|
639
616
|
}
|
640
617
|
|
618
|
+
// Darken the responsive nav toggle
|
619
|
+
.navbar-toggle {
|
620
|
+
border-color: $navbar-inverse-toggle-border-color;
|
621
|
+
&:hover,
|
622
|
+
&:focus {
|
623
|
+
background-color: $navbar-inverse-toggle-hover-bg;
|
624
|
+
}
|
625
|
+
.icon-bar {
|
626
|
+
background-color: $navbar-inverse-toggle-icon-bar-bg;
|
627
|
+
}
|
628
|
+
}
|
629
|
+
|
630
|
+
.navbar-collapse,
|
631
|
+
.navbar-form {
|
632
|
+
border-color: darken($navbar-inverse-bg, 7%);
|
633
|
+
}
|
634
|
+
|
641
635
|
.navbar-link {
|
642
636
|
color: $navbar-inverse-link-color;
|
643
637
|
&:hover {
|