Merge "Bug 1595359 - Fixed footer background colour with skin"

htdocs/theme/default/templates/footer.tpl

@@ -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

@@ -17,4 +17,15 @@ 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

 .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/sass/layout/_layout.scss

@@ -2,7 +2,7 @@
  * Base structure
  */
 body {
-    max-width:100%;
+    max-width: 100%;
     @media (min-width: 768px) {
         padding-top: 65px; // Move down content because we have a fixed navbar on desktop/tablet that is 50px tall
     }

htdocs/theme/raw/templates/footer.tpl

@@ -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">