Commit 9861ba11 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1582934 - Fixed navigation layout on tablet"

parents ac9a33a6 27eae739
.site-messages {
position: fixed;
top: 0;
width: 100%;
z-index: 11;
.site-message.alert {
margin-bottom: 0;
border-radius: 0;
padding: 5px 15px;
}
@media (max-width: $screen-sm-min - 1) {
display: none;
}
~ .header {
top: 33px; //for one message
+ .main-nav {
background-color: #f1f1f1;
margin-top: 32px; //for one message
}
}
......@@ -12,36 +23,43 @@
@for $i from 1 through 5 {
.header.message-count-#{$i} {
top: 33px * $i;
+ .main-nav {
margin-top: $i * 32px;
}
@media (max-width: $screen-sm-min) {
top: 0;
}
+ .main-nav {
margin-top: $i * 32px;
@media (max-width: $screen-sm-min) {
margin-top: 0;
~ .container {
.toolbar-affix.affix {
margin-top: $i * 33px;
}
}
@media (max-width: $screen-sm-min - 1) {
top: 0;
+ .main-nav {
margin-top: $i * 0px;
}
}
}
~ .container {
.toolbar-affix.affix {
margin-top: $i * 33px;
@media (max-width: $screen-sm-min) {
margin-top: 0;
@media (max-width: 768px) {
margin-top: $i * 65px;
}
}
}
}
}
+ .middle-container-wrap {
// if container is directly after header, then it will need a margin
margin-top: ($i * 33px);
.no-site-messages {
top: 0;
padding-top: 0;
}
@media (max-width: $screen-sm-min) {
margin-top: 0;
}
}
.sidebar,
.login-panel {
.errmsg {
margin-left: 0;
}
}
......@@ -4,7 +4,7 @@
body {
padding-top: 65px;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
padding-top: 0;
}
......
......@@ -8,12 +8,21 @@
border-bottom: 0;
}
.navbar-fixed-top {
position:relative;
border: 0;
@media (min-width: $screen-sm-min) {
position:fixed;
}
}
.navbar-form {
clear: right;
margin-top: 0;
border: 0;
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min) {
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min - 1) {
clear: none;
margin-top: 7px;
}
......@@ -71,7 +80,7 @@
margin-bottom: 0;
margin-top: 11px;
font-size: 13px;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
padding: 10px 15px;
display: block;
margin-top: 0;
......@@ -95,7 +104,7 @@
clear: none;
margin-top: 13px;
}
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
margin: 0;
display: none !important;
&.in {
......@@ -104,13 +113,14 @@
}
}
.main-nav {
border-bottom-width: 0;
.mainnav-search {
margin-top: 3px;
margin-bottom: 0;
}
.navbar-form.navbar-collapse {
display: inline-block;
@media (max-width: $screen-lg-min) {
@media (max-width: $screen-lg-min - 1) {
display: none !important;
}
}
......
......@@ -4,7 +4,7 @@
body {
padding-top: 65px;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
padding-top: 0;
}
......
......@@ -8,7 +8,7 @@
border-radius: 0;
padding: 5px 15px;
}
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
display: none;
}
......@@ -34,7 +34,7 @@
margin-top: $i * 33px;
}
}
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
top: 0;
+ .main-nav {
margin-top: $i * 0px;
......
.header {
top: 30px;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min -1) {
top: 0;
}
......@@ -19,7 +19,7 @@
}
.admin-title {
margin: 15px 10px 5px 0;
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
clear: both;
margin-top: 10px;
}
......@@ -29,7 +29,7 @@
+ .container {
// if container is directly after header, then it will need a margin
margin-top: 50px;
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min){
@media (min-width: $screen-xs-min) and (max-width: $screen-md-min - 1){
margin-top: 20px;
}
}
......
......@@ -95,7 +95,7 @@
display: none;
}
a {
@media (max-width: $screen-sm-min) {
@media (max-width: $screen-sm-min - 1) {
background-color: $state-warning-bg;
}
}
......
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