X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/111dec6853f9938ac0efd05e9a1cb44fe0fdad66..e9c6e57bcccc2a47bde53670d4effa4a5827a295:/app/assets/stylesheets/common.css.scss?ds=sidebyside diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index f88e0d1d2..d456e0685 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -244,13 +244,13 @@ table { opacity: 0.6; } -header { +#header { height: $headerHeight; position: relative; z-index: 1001; font-size: 13px; - h1, nav, nav > ul, nav > ul > li, .dropdown { + h1, .nav, .nav > ul, .nav > ul > li, .user-menu { display: inline-block; } @@ -259,7 +259,7 @@ header { padding: $lineheight/2; } - h1, nav.primary { + h1, .nav.primary { float: left; } @@ -284,7 +284,7 @@ header { } } -nav.primary { +.nav.primary { > ul { $border: 1px solid $green; @@ -347,11 +347,12 @@ nav.primary { } } -nav.secondary { +.nav.secondary { position: absolute; right: 0; - > ul { + > ul, + > #compact-secondary-nav { vertical-align: middle; a, .dropdown-toggle { display: inline-block; @@ -455,7 +456,7 @@ nav.secondary { display: inline-block; } .compact-hide { - display: none; + display: none !important; } } @@ -900,7 +901,7 @@ nav.secondary { /* Rules for the search box */ -header .search_form { +#header .search_form { display: none; }