Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
f38e50cd
Commit
f38e50cd
authored
12 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
Don't affix the fixed navbars in mobile views
parent
d1aae5f8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/assets/css/bootstrap.css
+13
-12
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
+3
-3
docs/assets/css/docs.css
less/navbar.less
+12
-7
less/navbar.less
with
28 additions
and
22 deletions
+28
-22
docs/assets/css/bootstrap.css
+
13
-
12
View file @
f38e50cd
...
...
@@ -3116,21 +3116,9 @@ button.close {
.navbar-fixed-top
,
.navbar-fixed-bottom
{
position
:
fixed
;
right
:
0
;
left
:
0
;
z-index
:
1030
;
border-radius
:
0
;
}
.navbar-fixed-top
{
top
:
0
;
}
.navbar-fixed-bottom
{
bottom
:
0
;
}
.navbar
.brand
{
display
:
inline-block
;
padding
:
7px
15px
;
...
...
@@ -3329,6 +3317,19 @@ button.close {
.navbar-inverse
.nav
>
.divider
{
border-right-color
:
#2f2f2f
;
}
.navbar-fixed-top
,
.navbar-fixed-bottom
{
position
:
fixed
;
right
:
0
;
left
:
0
;
z-index
:
1030
;
}
.navbar-fixed-top
{
top
:
0
;
}
.navbar-fixed-bottom
{
bottom
:
0
;
}
.navbar
.btn-navbar
{
display
:
none
;
}
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/docs.css
+
3
-
3
View file @
f38e50cd
...
...
@@ -10,7 +10,7 @@
body
{
position
:
relative
;
/* For scrollyspy */
padding
-
to
p
:
62px
;
/* Default height of navbar
*/
/* We add the
padding
to
the body for >768px only
*/
}
/* */
...
...
@@ -534,9 +534,9 @@ input.focused {
/* Tablets and up */
@media
screen
and
(
min-width
:
768px
)
{
/* Account for fixed navbar */
/* Account for fixed navbar
(which is static to start)
*/
body
{
padding-top
:
50
px
;
padding-top
:
62
px
;
/* Default height of navbar */
}
/* Tweak display of docs jumbotrons */
...
...
This diff is collapsed.
Click to expand it.
less/navbar.less
+
12
-
7
View file @
f38e50cd
...
...
@@ -49,17 +49,11 @@
border-radius: 0;
}
// Fixed navbar
// Fixed navbar
s aren't fixed to start; that comes at >768px
.navbar-fixed-top,
.navbar-fixed-bottom {
position: fixed;
right: 0;
left: 0;
z-index: @zindex-navbar-fixed;
border-radius: 0;
}
.navbar-fixed-top { top: 0; }
.navbar-fixed-bottom { bottom: 0; }
...
...
@@ -276,6 +270,17 @@
border-right-color: lighten(@navbar-inverse-bg, 5%);
}
// Fix the top/bottom navbars when screen real estate supports it
.navbar-fixed-top,
.navbar-fixed-bottom {
position: fixed;
right: 0;
left: 0;
z-index: @zindex-navbar-fixed;
}
.navbar-fixed-top { top: 0; }
.navbar-fixed-bottom { bottom: 0; }
// Required to make the collapsing navbar work on regular desktops
.navbar .btn-navbar {
display: none;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets