bootstrap-sass 2.0.3 → 2.0.3.1
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.
@@ -6,7 +6,7 @@
|
|
6
6
|
// -------------
|
7
7
|
|
8
8
|
.navbar {
|
9
|
-
// Fix for IE7's bad indexing so dropdowns don't appear below content that follows the navbar
|
9
|
+
// Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
|
10
10
|
*position: relative;
|
11
11
|
*z-index: 2;
|
12
12
|
|
@@ -95,7 +95,7 @@
|
|
95
95
|
margin-top: 6px;
|
96
96
|
white-space: nowrap; // prevents two items from separating within a .navbar-form that has .pull-left
|
97
97
|
input {
|
98
|
-
margin-top: 0; //remove the margin on top since it's on parent
|
98
|
+
margin-top: 0; // remove the margin on top since it's on the parent
|
99
99
|
}
|
100
100
|
}
|
101
101
|
}
|
@@ -112,7 +112,7 @@
|
|
112
112
|
color: $white;
|
113
113
|
background-color: $navbarSearchBackground;
|
114
114
|
border: 1px solid $navbarSearchBorder;
|
115
|
-
@include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px
|
115
|
+
@include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)});
|
116
116
|
@include transition(none);
|
117
117
|
|
118
118
|
// Placeholder text gets special styles; can't be a grouped selector
|
@@ -137,6 +137,7 @@
|
|
137
137
|
}
|
138
138
|
|
139
139
|
|
140
|
+
|
140
141
|
// FIXED NAVBAR
|
141
142
|
// ------------
|
142
143
|
|
@@ -146,7 +147,7 @@
|
|
146
147
|
right: 0;
|
147
148
|
left: 0;
|
148
149
|
z-index: $zindexFixedNavbar;
|
149
|
-
margin-bottom: 0; // remove 18px margin for static
|
150
|
+
margin-bottom: 0; // remove 18px margin for static navbar
|
150
151
|
}
|
151
152
|
.navbar-fixed-top .navbar-inner, .navbar-fixed-bottom .navbar-inner {
|
152
153
|
padding-left: 0;
|
@@ -160,9 +161,12 @@
|
|
160
161
|
|
161
162
|
// Fixed to top
|
162
163
|
.navbar-fixed-top { top: 0; }
|
164
|
+
|
165
|
+
// Fixed to bottom
|
163
166
|
.navbar-fixed-bottom { bottom: 0; }
|
164
167
|
|
165
168
|
|
169
|
+
|
166
170
|
// NAVIGATION
|
167
171
|
// ----------
|
168
172
|
|
@@ -197,19 +201,19 @@
|
|
197
201
|
display: inline-block;
|
198
202
|
padding: 4px 10px 4px;
|
199
203
|
// Vertically center the button given $navbarHeight
|
200
|
-
$elementHeight:
|
204
|
+
$elementHeight: 28px;
|
201
205
|
margin: (($navbarHeight - $elementHeight) / 2 - 1) 5px (($navbarHeight - $elementHeight) / 2);
|
202
206
|
line-height: $baseLineHeight;
|
203
207
|
}
|
204
208
|
.navbar .btn-group {
|
205
209
|
margin: 0;
|
206
|
-
// Vertically center the button given
|
210
|
+
// Vertically center the button given $navbarHeight
|
207
211
|
$elementHeight: 28px;
|
208
212
|
padding: (($navbarHeight - $elementHeight) / 2 - 1) 5px (($navbarHeight - $elementHeight) / 2);
|
209
213
|
}
|
210
214
|
// Hover
|
211
215
|
.navbar .nav > li > a:hover {
|
212
|
-
background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from
|
216
|
+
background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
|
213
217
|
color: $navbarLinkColorHover;
|
214
218
|
text-decoration: none;
|
215
219
|
}
|
@@ -260,6 +264,7 @@
|
|
260
264
|
margin-top: 3px;
|
261
265
|
}
|
262
266
|
|
267
|
+
|
263
268
|
// Dropdown menus
|
264
269
|
// --------------
|
265
270
|
|
@@ -270,7 +275,8 @@
|
|
270
275
|
display: inline-block;
|
271
276
|
border-left: 7px solid transparent;
|
272
277
|
border-right: 7px solid transparent;
|
273
|
-
border-bottom: 7px solid
|
278
|
+
border-bottom: 7px solid #ccc;
|
279
|
+
border-bottom-color: $dropdownBorder;
|
274
280
|
position: absolute;
|
275
281
|
top: -7px;
|
276
282
|
left: 9px;
|
@@ -280,13 +286,12 @@
|
|
280
286
|
display: inline-block;
|
281
287
|
border-left: 6px solid transparent;
|
282
288
|
border-right: 6px solid transparent;
|
283
|
-
border-bottom: 6px solid $
|
289
|
+
border-bottom: 6px solid $dropdownBackground;
|
284
290
|
position: absolute;
|
285
291
|
top: -6px;
|
286
292
|
left: 10px;
|
287
293
|
}
|
288
294
|
}
|
289
|
-
|
290
295
|
// Menu position and menu caret support for dropups via extra dropup class
|
291
296
|
.navbar-fixed-bottom .dropdown-menu {
|
292
297
|
&:before {
|
@@ -303,7 +308,6 @@
|
|
303
308
|
top: auto;
|
304
309
|
}
|
305
310
|
}
|
306
|
-
|
307
311
|
// Dropdown toggle caret
|
308
312
|
.navbar .nav li.dropdown .dropdown-toggle .caret, .navbar .nav li.dropdown.open .caret {
|
309
313
|
border-top-color: $white;
|
@@ -336,4 +340,4 @@
|
|
336
340
|
left: auto;
|
337
341
|
right: 13px;
|
338
342
|
}
|
339
|
-
}
|
343
|
+
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bootstrap-sass
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.3
|
4
|
+
version: 2.0.3.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-05-
|
12
|
+
date: 2012-05-22 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: compass
|
16
|
-
requirement: &
|
16
|
+
requirement: &70113493301080 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :development
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70113493301080
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: sass-rails
|
27
|
-
requirement: &
|
27
|
+
requirement: &70113493300560 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,7 +32,7 @@ dependencies:
|
|
32
32
|
version: '3.1'
|
33
33
|
type: :development
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70113493300560
|
36
36
|
description:
|
37
37
|
email: tom@conceptcoding.co.uk
|
38
38
|
executables: []
|