Commit 1894b869 authored by Pat Kira's avatar Pat Kira Committed by Robert Lyon
Browse files

Bug 1582934 - Fixed navigation layout on tablet 

Fixed header overlapping navigation on ipad (portrait mode)

behatnotneeded

Change-Id: I90c80fe00193d45274ee11bba4cb6bdab7307c79
(cherry picked from commit 27eae739)
parent fce3ece8

htdocs/theme/default/sass/form/_site-messages.scss

+37 −19
Original line number Diff line number Diff line 
.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,15 +23,19 @@ 
@for $i from 1 through 5 {

    .header.message-count-#{$i} {

        top: 33px * $i;



        @media (max-width: $screen-sm-min) {

            top: 0;

            + .main-nav {

                margin-top: $i * 32px;

            }



            ~ .container {

                .toolbar-affix.affix {

                    margin-top: $i * 33px;

                }

            }

            @media (max-width: $screen-sm-min - 1) {

                top: 0;

                + .main-nav {

            margin-top: $i * 32px;

            @media (max-width: $screen-sm-min) {

                margin-top: 0;

                    margin-top: $i * 0px;

                }

            }
@@ -28,20 +43,23 @@ 
            .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);



            @media (max-width: $screen-sm-min) {

                margin-top: 0;

    }

}



.no-site-messages {

    top: 0;

    padding-top: 0;

}



.sidebar,

.login-panel {

    .errmsg {

        margin-left: 0;

    }

}

htdocs/theme/default/sass/layout/_layout.scss

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
body {

    padding-top: 65px;



    @media (max-width: $screen-sm-min) {

    @media (max-width: $screen-sm-min - 1) {

        padding-top: 0;

    }

htdocs/theme/default/sass/layout/nav/_navbar.scss

+14 −4
Original line number Diff line number Diff line
@@ -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;

        }

    }

htdocs/theme/primaryschool/sass/layout/_layout.scss

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
body {

    padding-top: 65px;



    @media (max-width: $screen-sm-min) {

    @media (max-width: $screen-sm-min - 1) {

        padding-top: 0;

    }

htdocs/theme/raw/sass/form/_site-messages.scss

+2 −2
Original line number Diff line number Diff line
@@ -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;