Commit 08d66f27 authored by Pat Kira's avatar Pat Kira
Browse files

Bug 1595359 - Fixed footer background colour with skin 

behatnotneeded

Change-Id: I91fd721b5b7d87e294196c7b8a45b6659ef69813
parent 33cb4217

htdocs/theme/default/templates/footer.tpl

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 


     </div><!-- middle-container-wrap -->



        <footer class="{if $editing == true}editcontent{/if} footer container">

            <div class="footer-inner">

        <footer class="{if $editing == true}editcontent{/if} footer">

            <div class="footer-inner container">

                <div id="powered-by" class="pull-left mahara-logo">

                    <a href="https://mahara.org/">

                        <img src="{theme_url filename='images/powered_by_mahara.png'}" alt="Powered by Mahara">

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

+11 −0
Original line number Diff line number Diff line
@@ -18,3 +18,14 @@ body { 
        }

    }

}



.footer {

    background-color: transparent;

    .footer-inner {

        background-color: #ffffff;

        .admin & {

            border-radius: 0;

            border-color: #ffffff;

        }

    }

}
 
 No newline at end of file

htdocs/theme/raw/sass/layout/_footer.scss

+3 −4
Original line number Diff line number Diff line 
.footer {

    max-width: 100%;

    background-color: rgba(255, 255, 255, 0.7);

    .footer-nav {

        font-size: $font-size-small;

    }
@@ -9,7 +9,8 @@ 
    }

    .footer-inner {

        @extend .clearfix;

        margin-bottom: 15px;

        padding-top: 15px;

        padding-bottom: 15px;

        .mahara-logo {

            margin-right: 20px;

        }
@@ -21,10 +22,8 @@ 
            padding-top: 10px;

        }

        .admin & {

            border-radius: $border-radius-base;

            padding: 10px;

            background: #FCFCFC;

            border: 1px solid #ddd;

        }

    }

}

htdocs/theme/raw/templates/footer.tpl

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 


</div><!-- middle-container-wrap -->



<footer class="{if $editing == true}editcontent{/if} footer container">

    <div class="footer-inner">

<footer class="{if $editing == true}editcontent{/if} footer">

    <div class="footer-inner container">

        <div id="powered-by" class="pull-left mahara-logo">

            <a href="https://mahara.org/">

                <img src="{theme_url filename='images/powered_by_mahara.png'}" alt="Powered by Mahara">

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

+1 −1

File changed.

Contains only whitespace changes.