bootstrap-generators 2.1.1 → 2.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README.md +48 -3
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +25 -2
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +23 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/fluid.css.scss +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/hero.css.scss +1 -1
- data/vendor/assets/javascripts/bootstrap-affix.js +4 -2
- data/vendor/assets/javascripts/bootstrap-alert.js +2 -4
- data/vendor/assets/javascripts/bootstrap-button.js +5 -7
- data/vendor/assets/javascripts/bootstrap-carousel.js +12 -12
- data/vendor/assets/javascripts/bootstrap-collapse.js +9 -11
- data/vendor/assets/javascripts/bootstrap-dropdown.js +9 -11
- data/vendor/assets/javascripts/bootstrap-modal.js +20 -25
- data/vendor/assets/javascripts/bootstrap-popover.js +1 -1
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +1 -1
- data/vendor/assets/javascripts/bootstrap-tab.js +5 -7
- data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -11
- data/vendor/assets/javascripts/bootstrap-transition.js +5 -5
- data/vendor/assets/javascripts/bootstrap-typeahead.js +19 -9
- data/vendor/twitter/bootstrap/less/accordion.less +1 -1
- data/vendor/twitter/bootstrap/less/alerts.less +1 -1
- data/vendor/twitter/bootstrap/less/bootstrap.less +2 -1
- data/vendor/twitter/bootstrap/less/breadcrumbs.less +1 -1
- data/vendor/twitter/bootstrap/less/button-groups.less +5 -8
- data/vendor/twitter/bootstrap/less/buttons.less +17 -16
- data/vendor/twitter/bootstrap/less/code.less +1 -1
- data/vendor/twitter/bootstrap/less/dropdowns.less +32 -5
- data/vendor/twitter/bootstrap/less/forms.less +47 -14
- data/vendor/twitter/bootstrap/less/hero-unit.less +6 -5
- data/vendor/twitter/bootstrap/less/labels-badges.less +4 -2
- data/vendor/twitter/bootstrap/less/media.less +55 -0
- data/vendor/twitter/bootstrap/less/mixins.less +15 -10
- data/vendor/twitter/bootstrap/less/modals.less +7 -11
- data/vendor/twitter/bootstrap/less/navbar.less +6 -6
- data/vendor/twitter/bootstrap/less/navs.less +3 -2
- data/vendor/twitter/bootstrap/less/pager.less +10 -9
- data/vendor/twitter/bootstrap/less/pagination.less +69 -12
- data/vendor/twitter/bootstrap/less/popovers.less +2 -2
- data/vendor/twitter/bootstrap/less/progress-bars.less +2 -2
- data/vendor/twitter/bootstrap/less/reset.less +5 -4
- data/vendor/twitter/bootstrap/less/responsive-767px-max.less +20 -1
- data/vendor/twitter/bootstrap/less/responsive-navbar.less +12 -4
- data/vendor/twitter/bootstrap/less/responsive.less +1 -1
- data/vendor/twitter/bootstrap/less/sprites.less +3 -3
- data/vendor/twitter/bootstrap/less/tables.less +20 -29
- data/vendor/twitter/bootstrap/less/thumbnails.less +1 -1
- data/vendor/twitter/bootstrap/less/tooltip.less +1 -1
- data/vendor/twitter/bootstrap/less/type.less +30 -24
- data/vendor/twitter/bootstrap/less/variables.less +23 -1
- data/vendor/twitter/bootstrap/less/wells.less +3 -3
- data/vendor/twitter/bootstrap/sass/_accordion.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_button-groups.scss +5 -8
- data/vendor/twitter/bootstrap/sass/_buttons.scss +18 -17
- data/vendor/twitter/bootstrap/sass/_code.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_component-animations.scss +2 -2
- data/vendor/twitter/bootstrap/sass/_dropdowns.scss +32 -5
- data/vendor/twitter/bootstrap/sass/_forms.scss +46 -14
- data/vendor/twitter/bootstrap/sass/_hero-unit.scss +6 -5
- data/vendor/twitter/bootstrap/sass/_labels-badges.scss +4 -2
- data/vendor/twitter/bootstrap/sass/_media.scss +55 -0
- data/vendor/twitter/bootstrap/sass/_mixins.scss +12 -7
- data/vendor/twitter/bootstrap/sass/_modals.scss +8 -11
- data/vendor/twitter/bootstrap/sass/_navbar.scss +8 -10
- data/vendor/twitter/bootstrap/sass/_navs.scss +5 -4
- data/vendor/twitter/bootstrap/sass/_pager.scss +10 -9
- data/vendor/twitter/bootstrap/sass/_pagination.scss +69 -12
- data/vendor/twitter/bootstrap/sass/_popovers.scss +2 -2
- data/vendor/twitter/bootstrap/sass/_progress-bars.scss +2 -2
- data/vendor/twitter/bootstrap/sass/_reset.scss +6 -4
- data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +20 -1
- data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +12 -4
- data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -3
- data/vendor/twitter/bootstrap/sass/_sprites.scss +3 -3
- data/vendor/twitter/bootstrap/sass/_tables.scss +12 -8
- data/vendor/twitter/bootstrap/sass/_thumbnails.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_tooltip.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_type.scss +30 -24
- data/vendor/twitter/bootstrap/sass/_variables.scss +25 -2
- data/vendor/twitter/bootstrap/sass/_wells.scss +3 -3
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +2 -1
- data/vendor/twitter/bootstrap/sass/responsive.scss +1 -1
- metadata +12 -10
@@ -25,7 +25,7 @@
|
|
25
25
|
padding-right: 20px;
|
26
26
|
@include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
|
27
27
|
border: 1px solid $navbarBorder;
|
28
|
-
@include border-radius(
|
28
|
+
@include border-radius($baseBorderRadius);
|
29
29
|
@include box-shadow(0 1px 4px rgba(0,0,0,.065));
|
30
30
|
|
31
31
|
// Prevent floats from breaking the navbar
|
@@ -41,6 +41,7 @@
|
|
41
41
|
// Override the default collapsed state
|
42
42
|
.nav-collapse.collapse {
|
43
43
|
height: auto;
|
44
|
+
overflow: visible;
|
44
45
|
}
|
45
46
|
|
46
47
|
|
@@ -152,7 +153,6 @@
|
|
152
153
|
|
153
154
|
.navbar-static-top {
|
154
155
|
position: static;
|
155
|
-
width: 100%;
|
156
156
|
margin-bottom: 0; // remove 18px margin for default navbar
|
157
157
|
.navbar-inner {
|
158
158
|
@include border-radius(0);
|
@@ -202,7 +202,7 @@
|
|
202
202
|
.navbar-fixed-top,
|
203
203
|
.navbar-static-top {
|
204
204
|
.navbar-inner {
|
205
|
-
@include box-shadow(
|
205
|
+
@include box-shadow(0 1px 10px rgba(0,0,0,.1));
|
206
206
|
}
|
207
207
|
}
|
208
208
|
|
@@ -210,7 +210,7 @@
|
|
210
210
|
.navbar-fixed-bottom {
|
211
211
|
bottom: 0;
|
212
212
|
.navbar-inner {
|
213
|
-
@include box-shadow(
|
213
|
+
@include box-shadow(0 -1px 10px rgba(0,0,0,.1));
|
214
214
|
}
|
215
215
|
}
|
216
216
|
|
@@ -262,9 +262,7 @@
|
|
262
262
|
color: $navbarLinkColorActive;
|
263
263
|
text-decoration: none;
|
264
264
|
background-color: $navbarLinkBackgroundActive;
|
265
|
-
|
266
|
-
-moz-box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
|
267
|
-
box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
|
265
|
+
@include box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
|
268
266
|
}
|
269
267
|
|
270
268
|
// Navbar button for toggling navbar items in responsive layouts
|
@@ -276,7 +274,7 @@
|
|
276
274
|
margin-left: 5px;
|
277
275
|
margin-right: 5px;
|
278
276
|
@include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5.25%));
|
279
|
-
@include box-shadow(
|
277
|
+
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075));
|
280
278
|
}
|
281
279
|
.navbar .btn-navbar .icon-bar {
|
282
280
|
display: block;
|
@@ -320,7 +318,7 @@
|
|
320
318
|
}
|
321
319
|
}
|
322
320
|
// Menu position and menu caret support for dropups via extra dropup class
|
323
|
-
.navbar-fixed-bottom .dropdown-menu {
|
321
|
+
.navbar-fixed-bottom .nav > li > .dropdown-menu {
|
324
322
|
&:before {
|
325
323
|
border-top: 7px solid #ccc;
|
326
324
|
border-top-color: $dropdownBorder;
|
@@ -448,7 +446,7 @@
|
|
448
446
|
color: $white;
|
449
447
|
background-color: $navbarInverseSearchBackground;
|
450
448
|
border-color: $navbarInverseSearchBorder;
|
451
|
-
@include box-shadow(
|
449
|
+
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15));
|
452
450
|
@include transition(none);
|
453
451
|
@include placeholder($navbarInverseSearchPlaceholderColor);
|
454
452
|
|
@@ -67,7 +67,8 @@
|
|
67
67
|
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
|
68
68
|
background-color: $linkColor;
|
69
69
|
}
|
70
|
-
.nav-list [class^="icon-"]
|
70
|
+
.nav-list [class^="icon-"],
|
71
|
+
.nav-list [class*=" icon-"] {
|
71
72
|
margin-right: 2px;
|
72
73
|
}
|
73
74
|
// Dividers (basically an hr) within the dropdown
|
@@ -123,7 +124,7 @@
|
|
123
124
|
.nav-tabs > .active > a,
|
124
125
|
.nav-tabs > .active > a:hover {
|
125
126
|
color: $gray;
|
126
|
-
background-color: $
|
127
|
+
background-color: $bodyBackground;
|
127
128
|
border: 1px solid #ddd;
|
128
129
|
border-bottom-color: transparent;
|
129
130
|
cursor: default;
|
@@ -221,8 +222,8 @@
|
|
221
222
|
// Active dropdown links
|
222
223
|
// -------------------------
|
223
224
|
.nav .active .dropdown-toggle .caret {
|
224
|
-
border-top-color:
|
225
|
-
border-bottom-color:
|
225
|
+
border-top-color: #fff;
|
226
|
+
border-bottom-color: #fff;
|
226
227
|
}
|
227
228
|
.nav-tabs .active .dropdown-toggle .caret {
|
228
229
|
border-top-color: $gray;
|
@@ -12,28 +12,29 @@
|
|
12
12
|
.pager li {
|
13
13
|
display: inline;
|
14
14
|
}
|
15
|
-
.pager a,
|
16
|
-
.pager span {
|
15
|
+
.pager li > a,
|
16
|
+
.pager li > span {
|
17
17
|
display: inline-block;
|
18
18
|
padding: 5px 14px;
|
19
19
|
background-color: #fff;
|
20
20
|
border: 1px solid #ddd;
|
21
21
|
@include border-radius(15px);
|
22
22
|
}
|
23
|
-
.pager a:hover {
|
23
|
+
.pager li > a:hover {
|
24
24
|
text-decoration: none;
|
25
25
|
background-color: #f5f5f5;
|
26
26
|
}
|
27
|
-
.pager .next a,
|
28
|
-
.pager .next span {
|
27
|
+
.pager .next > a,
|
28
|
+
.pager .next > span {
|
29
29
|
float: right;
|
30
30
|
}
|
31
|
-
.pager .previous a
|
31
|
+
.pager .previous > a,
|
32
|
+
.pager .previous > span {
|
32
33
|
float: left;
|
33
34
|
}
|
34
|
-
.pager .disabled a,
|
35
|
-
.pager .disabled a:hover,
|
36
|
-
.pager .disabled span {
|
35
|
+
.pager .disabled > a,
|
36
|
+
.pager .disabled > a:hover,
|
37
|
+
.pager .disabled > span {
|
37
38
|
color: $grayLight;
|
38
39
|
background-color: #fff;
|
39
40
|
cursor: default;
|
@@ -2,27 +2,30 @@
|
|
2
2
|
// Pagination (multiple pages)
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
|
-
|
5
|
+
// Space out pagination from surrounding content
|
6
6
|
.pagination {
|
7
|
-
height: $baseLineHeight * 2;
|
8
7
|
margin: $baseLineHeight 0;
|
9
|
-
|
8
|
+
}
|
9
|
+
|
10
10
|
.pagination ul {
|
11
|
+
// Allow for text-based alignment
|
11
12
|
display: inline-block;
|
12
13
|
@include ie7-inline-block();
|
14
|
+
// Reset default ul styles
|
13
15
|
margin-left: 0;
|
14
16
|
margin-bottom: 0;
|
15
|
-
|
17
|
+
// Visuals
|
18
|
+
@include border-radius($baseBorderRadius);
|
16
19
|
@include box-shadow(0 1px 2px rgba(0,0,0,.05));
|
17
20
|
}
|
18
21
|
.pagination ul > li {
|
19
|
-
display: inline;
|
22
|
+
display: inline; // Remove list-style and block-level defaults
|
20
23
|
}
|
21
24
|
.pagination ul > li > a,
|
22
25
|
.pagination ul > li > span {
|
23
|
-
float: left;
|
24
|
-
padding:
|
25
|
-
line-height:
|
26
|
+
float: left; // Collapse white-space
|
27
|
+
padding: 4px 12px;
|
28
|
+
line-height: $baseLineHeight;
|
26
29
|
text-decoration: none;
|
27
30
|
background-color: $paginationBackground;
|
28
31
|
border: 1px solid $paginationBorder;
|
@@ -31,7 +34,7 @@
|
|
31
34
|
.pagination ul > li > a:hover,
|
32
35
|
.pagination ul > .active > a,
|
33
36
|
.pagination ul > .active > span {
|
34
|
-
background-color:
|
37
|
+
background-color: $paginationActiveBackground;
|
35
38
|
}
|
36
39
|
.pagination ul > .active > a,
|
37
40
|
.pagination ul > .active > span {
|
@@ -48,17 +51,71 @@
|
|
48
51
|
.pagination ul > li:first-child > a,
|
49
52
|
.pagination ul > li:first-child > span {
|
50
53
|
border-left-width: 1px;
|
51
|
-
@include border-radius(
|
54
|
+
@include border-left-radius($baseBorderRadius);
|
52
55
|
}
|
53
56
|
.pagination ul > li:last-child > a,
|
54
57
|
.pagination ul > li:last-child > span {
|
55
|
-
@include border-radius(
|
58
|
+
@include border-right-radius($baseBorderRadius);
|
56
59
|
}
|
57
60
|
|
58
|
-
|
61
|
+
|
62
|
+
// Alignment
|
63
|
+
// --------------------------------------------------
|
64
|
+
|
59
65
|
.pagination-centered {
|
60
66
|
text-align: center;
|
61
67
|
}
|
62
68
|
.pagination-right {
|
63
69
|
text-align: right;
|
64
70
|
}
|
71
|
+
|
72
|
+
|
73
|
+
// Sizing
|
74
|
+
// --------------------------------------------------
|
75
|
+
|
76
|
+
// Large
|
77
|
+
.pagination-large {
|
78
|
+
ul > li > a,
|
79
|
+
ul > li > span {
|
80
|
+
padding: $paddingLarge;
|
81
|
+
font-size: $fontSizeLarge;
|
82
|
+
}
|
83
|
+
ul > li:first-child > a,
|
84
|
+
ul > li:first-child > span {
|
85
|
+
@include border-left-radius($borderRadiusLarge);
|
86
|
+
}
|
87
|
+
ul > li:last-child > a,
|
88
|
+
ul > li:last-child > span {
|
89
|
+
@include border-right-radius($borderRadiusLarge);
|
90
|
+
}
|
91
|
+
}
|
92
|
+
|
93
|
+
// Small and mini
|
94
|
+
.pagination-mini,
|
95
|
+
.pagination-small {
|
96
|
+
ul > li:first-child > a,
|
97
|
+
ul > li:first-child > span {
|
98
|
+
@include border-left-radius($borderRadiusSmall);
|
99
|
+
}
|
100
|
+
ul > li:last-child > a,
|
101
|
+
ul > li:last-child > span {
|
102
|
+
@include border-right-radius($borderRadiusSmall);
|
103
|
+
}
|
104
|
+
}
|
105
|
+
|
106
|
+
// Small
|
107
|
+
.pagination-small {
|
108
|
+
ul > li > a,
|
109
|
+
ul > li > span {
|
110
|
+
padding: $paddingSmall;
|
111
|
+
font-size: $fontSizeSmall;
|
112
|
+
}
|
113
|
+
}
|
114
|
+
// Mini
|
115
|
+
.pagination-mini {
|
116
|
+
ul > li > a,
|
117
|
+
ul > li > span {
|
118
|
+
padding: $paddingMini;
|
119
|
+
font-size: $fontSizeMini;
|
120
|
+
}
|
121
|
+
}
|
@@ -21,10 +21,10 @@
|
|
21
21
|
@include box-shadow(0 5px 10px rgba(0,0,0,.2));
|
22
22
|
|
23
23
|
// Offset the popover to account for the popover arrow
|
24
|
-
&.top { margin-
|
24
|
+
&.top { margin-top: -10px; }
|
25
25
|
&.right { margin-left: 10px; }
|
26
26
|
&.bottom { margin-top: 10px; }
|
27
|
-
&.left { margin-
|
27
|
+
&.left { margin-left: -10px; }
|
28
28
|
|
29
29
|
}
|
30
30
|
|
@@ -48,7 +48,7 @@
|
|
48
48
|
margin-bottom: $baseLineHeight;
|
49
49
|
@include gradient-vertical(#f5f5f5, #f9f9f9);
|
50
50
|
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
|
51
|
-
@include border-radius(
|
51
|
+
@include border-radius($baseBorderRadius);
|
52
52
|
}
|
53
53
|
|
54
54
|
// Bar of progress
|
@@ -66,7 +66,7 @@
|
|
66
66
|
@include transition(width .6s ease);
|
67
67
|
}
|
68
68
|
.progress .bar + .bar {
|
69
|
-
@include box-shadow(
|
69
|
+
@include box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
|
70
70
|
}
|
71
71
|
|
72
72
|
// Striped bars
|
@@ -3,6 +3,7 @@
|
|
3
3
|
// Adapted from http://github.com/necolas/normalize.css
|
4
4
|
// --------------------------------------------------
|
5
5
|
|
6
|
+
|
6
7
|
// Display in IE6-9 and FF3
|
7
8
|
// -------------------------
|
8
9
|
|
@@ -87,7 +88,8 @@ img {
|
|
87
88
|
}
|
88
89
|
|
89
90
|
// Prevent max-width from affecting Google Maps
|
90
|
-
#map_canvas img
|
91
|
+
#map_canvas img,
|
92
|
+
.google-maps img {
|
91
93
|
max-width: none;
|
92
94
|
}
|
93
95
|
|
@@ -114,11 +116,11 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
|
|
114
116
|
border: 0;
|
115
117
|
}
|
116
118
|
button,
|
117
|
-
input[type="button"],
|
119
|
+
html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
|
118
120
|
input[type="reset"],
|
119
121
|
input[type="submit"] {
|
120
|
-
|
121
|
-
|
122
|
+
-webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
|
123
|
+
cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
|
122
124
|
}
|
123
125
|
input[type="search"] { // Appearance in Safari/Chrome
|
124
126
|
-webkit-box-sizing: content-box;
|
@@ -58,6 +58,7 @@
|
|
58
58
|
}
|
59
59
|
// Make all grid-sized elements block level again
|
60
60
|
[class*="span"],
|
61
|
+
.uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
|
61
62
|
.row-fluid [class*="span"] {
|
62
63
|
float: none;
|
63
64
|
display: block;
|
@@ -70,6 +71,9 @@
|
|
70
71
|
width: 100%;
|
71
72
|
@include box-sizing(border-box);
|
72
73
|
}
|
74
|
+
.row-fluid [class*="offset"]:first-child {
|
75
|
+
margin-left: 0;
|
76
|
+
}
|
73
77
|
|
74
78
|
// FORM FIELDS
|
75
79
|
// -----------
|
@@ -103,7 +107,8 @@
|
|
103
107
|
right: 20px;
|
104
108
|
width: auto;
|
105
109
|
margin: 0;
|
106
|
-
&.fade
|
110
|
+
&.fade { top: -100px; }
|
111
|
+
&.fade.in { top: 20px; }
|
107
112
|
}
|
108
113
|
|
109
114
|
}
|
@@ -155,6 +160,20 @@
|
|
155
160
|
}
|
156
161
|
}
|
157
162
|
|
163
|
+
// Medias
|
164
|
+
// Reset float and spacing to stack
|
165
|
+
.media .pull-left,
|
166
|
+
.media .pull-right {
|
167
|
+
float: none;
|
168
|
+
display: block;
|
169
|
+
margin-bottom: 10px;
|
170
|
+
}
|
171
|
+
// Remove side margins since we stack instead of indent
|
172
|
+
.media-object {
|
173
|
+
margin-right: 0;
|
174
|
+
margin-left: 0;
|
175
|
+
}
|
176
|
+
|
158
177
|
// Modals
|
159
178
|
.modal {
|
160
179
|
top: 10px;
|
@@ -75,7 +75,7 @@
|
|
75
75
|
.nav-collapse .btn {
|
76
76
|
padding: 4px 10px 4px;
|
77
77
|
font-weight: normal;
|
78
|
-
@include border-radius(
|
78
|
+
@include border-radius($baseBorderRadius);
|
79
79
|
}
|
80
80
|
.nav-collapse .dropdown-menu li + li a {
|
81
81
|
margin-bottom: 2px;
|
@@ -84,6 +84,10 @@
|
|
84
84
|
.nav-collapse .dropdown-menu a:hover {
|
85
85
|
background-color: $navbarBackground;
|
86
86
|
}
|
87
|
+
.navbar-inverse .nav-collapse .nav > li > a,
|
88
|
+
.navbar-inverse .nav-collapse .dropdown-menu a {
|
89
|
+
color: $navbarInverseLinkColor;
|
90
|
+
}
|
87
91
|
.navbar-inverse .nav-collapse .nav > li > a:hover,
|
88
92
|
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
|
89
93
|
background-color: $navbarInverseBackground;
|
@@ -99,7 +103,7 @@
|
|
99
103
|
top: auto;
|
100
104
|
left: auto;
|
101
105
|
float: none;
|
102
|
-
display:
|
106
|
+
display: none;
|
103
107
|
max-width: none;
|
104
108
|
margin: 0 15px;
|
105
109
|
padding: 0;
|
@@ -108,6 +112,10 @@
|
|
108
112
|
@include border-radius(0);
|
109
113
|
@include box-shadow(none);
|
110
114
|
}
|
115
|
+
.nav-collapse .open > .dropdown-menu {
|
116
|
+
display: block;
|
117
|
+
}
|
118
|
+
|
111
119
|
.nav-collapse .dropdown-menu:before,
|
112
120
|
.nav-collapse .dropdown-menu:after {
|
113
121
|
display: none;
|
@@ -129,7 +137,7 @@
|
|
129
137
|
margin: ($baseLineHeight / 2) 0;
|
130
138
|
border-top: 1px solid $navbarBackground;
|
131
139
|
border-bottom: 1px solid $navbarBackground;
|
132
|
-
@include box-shadow(
|
140
|
+
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1));
|
133
141
|
}
|
134
142
|
.navbar-inverse .nav-collapse .navbar-form,
|
135
143
|
.navbar-inverse .nav-collapse .navbar-search {
|
@@ -166,7 +174,7 @@
|
|
166
174
|
// DEFAULT DESKTOP
|
167
175
|
// ---------------
|
168
176
|
|
169
|
-
@media (min-width:
|
177
|
+
@media (min-width: $navbarCollapseDesktopWidth) {
|
170
178
|
|
171
179
|
// Required to make the collapsing navbar work on regular desktops
|
172
180
|
.nav-collapse.collapse {
|
@@ -43,9 +43,7 @@ a:hover {
|
|
43
43
|
background-color: #fff;
|
44
44
|
border: 1px solid #ccc;
|
45
45
|
border: 1px solid rgba(0,0,0,.2);
|
46
|
-
|
47
|
-
-moz-box-shadow: 0 1px 3px rgba(0,0,0,.1);
|
48
|
-
box-shadow: 0 1px 3px rgba(0,0,0,.1);
|
46
|
+
@include box-shadow(0 1px 3px rgba(0,0,0,.1));
|
49
47
|
}
|
50
48
|
|
51
49
|
// Perfect circle
|