From c63dd376d878c7a929fcc98923022a3f1e233572 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 17 Nov 2015 17:31:03 +0000
Subject: [PATCH] Fix member avatar initials (I failed at git conflict merging)

---
 src/skins/vector/css/atoms/MemberAvatar.css | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/skins/vector/css/atoms/MemberAvatar.css b/src/skins/vector/css/atoms/MemberAvatar.css
index b7ea015b6..95ce82013 100644
--- a/src/skins/vector/css/atoms/MemberAvatar.css
+++ b/src/skins/vector/css/atoms/MemberAvatar.css
@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_MemberAvatar_image {
-    z-index: 20;
-    border-radius: 20px;
+.mx_MemberAvatar {
     position: relative;
 }
 
@@ -27,6 +25,6 @@ limitations under the License.
     speak: none;
 }
 
-.mx_MemberAvatar {
-    position: relative;
+.mx_MemberAvatar_image {
+    border-radius: 20px;
 }