From 94609db3a6c40a7f25f61af003603a72efd98656 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 24 Dec 2015 09:21:02 +0000
Subject: [PATCH] Wrangle CSS to get avatar on UserSettings in the right place

---
 .../vector/css/organisms/UserSettings.css     | 29 +++++++++++++++++--
 vector/img                                    |  1 -
 2 files changed, 26 insertions(+), 4 deletions(-)
 delete mode 120000 vector/img

diff --git a/src/skins/vector/css/organisms/UserSettings.css b/src/skins/vector/css/organisms/UserSettings.css
index 322f1eea..7d1557e9 100644
--- a/src/skins/vector/css/organisms/UserSettings.css
+++ b/src/skins/vector/css/organisms/UserSettings.css
@@ -62,12 +62,18 @@ limitations under the License.
     margin-bottom: 28px;
 }
 
-.mx_UserSettings_profileTable,
+.mx_UserSettings_accountTable
 .mx_UserSettings_notifTable
 {
     display: table;
 }
 
+.mx_UserSettings_profileTable
+{
+    display: table;
+    float: left;
+}
+
 .mx_UserSettings_profileTableRow,
 .mx_UserSettings_notifTableRow
 {
@@ -130,13 +136,30 @@ limitations under the License.
 
 .mx_UserSettings_avatarPicker {
     width: 320px;
+    float: right;
 }
 
 .mx_UserSettings_avatarPicker_edit {
-    margin: auto;
-    width: 60%;
+    position: relative;
+    left: 50%;
+    display: inline-block;
+    margin-top: 10px;
 }
 
 .mx_UserSettings_avatarPicker_edit > input{
     display: none;
+}
+
+.mx_UserSettings_avatarPicker_edit > label {
+    cursor: pointer;
+}
+
+.mx_UserSettings_avatarPicker_img {
+    margin: 0 auto;
+    width: 75%;
+}
+
+.mx_UserSettings_avatarPicker_img > img {
+    display: block;
+    margin: 0 auto;
 }
\ No newline at end of file
diff --git a/vector/img b/vector/img
deleted file mode 120000
index 8f1382c0..00000000
--- a/vector/img
+++ /dev/null
@@ -1 +0,0 @@
-../src/skins/vector/img
\ No newline at end of file