Commit 7bc845ab authored by Mark Otto's avatar Mark Otto

Add default navbar z-index to fix #9844

iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
parent b5698361
...@@ -4013,6 +4013,7 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4013,6 +4013,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar { .navbar {
position: relative; position: relative;
z-index: 1000;
min-height: 50px; min-height: 50px;
margin-bottom: 20px; margin-bottom: 20px;
border: 1px solid transparent; border: 1px solid transparent;
...@@ -4159,7 +4160,6 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4159,7 +4160,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: 1030;
border-width: 0 0 1px; border-width: 0 0 1px;
} }
...@@ -4172,6 +4172,7 @@ textarea.input-group-sm > .input-group-btn > .btn { ...@@ -4172,6 +4172,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-fixed-top { .navbar-fixed-top {
top: 0; top: 0;
z-index: 1030;
} }
.navbar-fixed-bottom { .navbar-fixed-bottom {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
.navbar { .navbar {
position: relative; position: relative;
z-index: @zindex-navbar;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode) min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom; margin-bottom: @navbar-margin-bottom;
border: 1px solid transparent; border: 1px solid transparent;
...@@ -127,7 +128,6 @@ ...@@ -127,7 +128,6 @@
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: @zindex-navbar-fixed;
border-width: 0 0 1px; border-width: 0 0 1px;
// Undo the rounded corners // Undo the rounded corners
...@@ -136,6 +136,7 @@ ...@@ -136,6 +136,7 @@
} }
} }
.navbar-fixed-top { .navbar-fixed-top {
z-index: @zindex-navbar-fixed;
top: 0; top: 0;
} }
.navbar-fixed-bottom { .navbar-fixed-bottom {
......
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
// Used for a bird's eye view of components dependent on the z-axis // Used for a bird's eye view of components dependent on the z-axis
// Try to avoid customizing these :) // Try to avoid customizing these :)
@zindex-navbar: 1000;
@zindex-dropdown: 1000; @zindex-dropdown: 1000;
@zindex-popover: 1010; @zindex-popover: 1010;
@zindex-tooltip: 1030; @zindex-tooltip: 1030;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment