Merge "Bug 1591782 - Fixed default theme header with skin"

6a4660df · Robert Lyon · Gerrit Code Review · 71538760 · 31618f7a · 6a4660df
Commit 6a4660df authored Jun 24, 2016 by Robert Lyon Committed by Gerrit Code Review Jun 24, 2016
--- a/htdocs/theme/default/sass/form/_site-messages.scss
+++ b/htdocs/theme/default/sass/form/_site-messages.scss
@@ -14,6 +14,7 @@
    ~ .header {
        top: 33px;    //for one message
        + .main-nav {
+            background-color: #ffffff;
            margin-top: 32px;    //for one message
        }
    }

--- a/htdocs/theme/default/sass/layout/_layout.scss
+++ b/htdocs/theme/default/sass/layout/_layout.scss
@@ -11,8 +11,11 @@ body {
    .middle-container-wrap {
        .main-content {
            background-color: #ffffff;
-            margin-top: 0;
            padding-top: 25px;
+            @media screen and (min-width: $screen-sm-min) {
+                margin-top: 30px;
+                margin-bottom: 30px;
+            }
            .main {
                padding-top: 0;
            }