Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 44 insertions, 15 deletions

diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index 6cf0dd47e..a0d5622fb 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -122,26 +122,23 @@ body.mappage {
 
 .content footer .tablewrapper { background: #fff; }
 
-#front-main {
-    a#geolocate_link {
+a#geolocate_link {
+    background: url(images/locate-me.png) $left 0 no-repeat;
+    height: 34px;
+    padding-#{$left}: 24px;
+    margin-top: 0.25em;
+    @media ($high-dpi-screen) {
+        background-image: url(images/locate-me@2.png);
+        background-size: 22px 34px;
+    }
+    &:hover {
+        text-decoration:underline;
         background: url(images/locate-me.png) $left 0 no-repeat;
-        height: 34px;
-        padding-#{$left}: 24px;
-        margin-top: 0.25em;
-        font-size: 1em;
+
         @media ($high-dpi-screen) {
             background-image: url(images/locate-me@2.png);
             background-size: 22px 34px;
         }
-        &:hover {
-            text-decoration:underline;
-            background: url(images/locate-me.png) $left 0 no-repeat;
-
-            @media ($high-dpi-screen) {
-                background-image: url(images/locate-me@2.png);
-                background-size: 22px 34px;
-            }
-        }
     }
 }
 
@@ -149,4 +146,36 @@ body.mappage {
     a {
 	border-radius: 5px;
     }
+    span {
+    	 color: $primary_text;
+    	 font-weight: bold;
+    }
+    span.report-a-problem-btn {
+	display: none;
+    }
+    a.report-a-problem-btn {
+	display: none;
+    }
+}
+
+.mappage {
+    .nav-menu--main {
+	span.report-a-problem-btn {
+	    display: block;
+	}
+	a.report-a-problem-btn {
+	    display: block;
+	    border-width: 1px;
+	    border-color: $primary_text;
+	    border-style: solid;
+	}
+    }
+}
+
+body.twothirdswidthpage {
+    .content {
+       aside {
+           background:#fff;
+       }
+    }
 }