From b55d1b47d2255a8f05462c32b90a5f69a32f23fd Mon Sep 17 00:00:00 2001
From: Paul Adam Davis <pauladamdavis@gmail.com>
Date: Wed, 17 Sep 2014 13:48:36 +0100
Subject: [PATCH] Fix user settings page for Firefox

References #4050

- Restructures the CSS to work in Firefox - No visual changes, only fixes
---
 core/client/assets/sass/layouts/user.scss     | 50 ++++++++-----------
 core/client/templates/settings/users/user.hbs |  2 +-
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/core/client/assets/sass/layouts/user.scss b/core/client/assets/sass/layouts/user.scss
index b2baa123ac..6fbdaee76c 100644
--- a/core/client/assets/sass/layouts/user.scss
+++ b/core/client/assets/sass/layouts/user.scss
@@ -56,15 +56,12 @@
 }
 
 .user-image + .form-group {
-    margin-top: 155px;
     max-width: 500px;
     @media (min-width: 651px) and (max-width: 1000px) {
         width: calc(100% - 201px);
     }
     @media (min-width: 651px) {
         min-width: 285px;
-        margin-top: 0;
-        top: -110px;
         left: 40px;
     }
     @media (min-width: 1001px) {
@@ -74,7 +71,6 @@
 
 .user-profile {
     position: relative;
-    top: -110px;
     z-index: 1;
     @media (min-width: 651px) {
         padding-left: 143px;
@@ -97,13 +93,14 @@
 
 .user-details-top {
 
+    position: relative;
+
     @media (max-width: 650px) {
-        margin-bottom: 10px;
-        label[for='user-name'] { // Reverse the affects of .sr-only
-            position: static;
-            width: auto;
-            height: auto;
-        }
+        margin-top: 40px;
+        margin-bottom: 0;
+    }
+    @media (min-width: 651px) {
+        margin-top: -91px;
     }
 
     @media (min-width: 651px) {
@@ -112,6 +109,9 @@
         p {
             color: #fff;
         }
+        label[for="user-name"] {
+            color: transparent;
+        }
         .user-name {
             border-color: #fff;
         }
@@ -135,7 +135,18 @@
 
 .user-image {
     display: block;
-    position: relative;
+    position: absolute;
+    
+    @media (min-width: 651px) {
+        top: -19px;
+        left: -98px;
+    }
+
+    @media (max-width: 650px) {
+        top: -159px;
+        left: -19px;
+    }
+    
     width: 126px;
     height: 126px;
     float: left;
@@ -148,16 +159,6 @@
     background: #fff;
     z-index: 2;
 
-    margin-left: -104px;
-
-    @media (max-width: 550px) {
-        margin-left: 0px;
-    }
-
-    @media (min-width: 551px) and (max-width: 650px) {
-        margin-left: 20px;
-    }
-
     .img {
         display: block;
         width: 120px;
@@ -189,11 +190,4 @@
     text-transform: uppercase;
     text-decoration: none;
     transition: opacity 0.3s ease;
-}
-
-.user-details-bottom {
-    padding: 0 40px;
-    @media (min-width: 651px) {
-        margin: -104px 0 0 0;
-    }
 }
\ No newline at end of file
diff --git a/core/client/templates/settings/users/user.hbs b/core/client/templates/settings/users/user.hbs
index 61f1ef3e6c..8852c258b1 100644
--- a/core/client/templates/settings/users/user.hbs
+++ b/core/client/templates/settings/users/user.hbs
@@ -38,7 +38,7 @@
         </figure>
 
         <div class="form-group">
-            <label for="user-name" class="sr-only">Full Name</label>
+            <label for="user-name">Full Name</label>
             {{input value=user.name id="user-name" class="user-name" placeholder="Full Name" autocorrect="off"}}
             <p>Use your real name so people can recognise you</p>
         </div>