From b2a1c89e83d2fcd19d778f730011e08080e1bfea Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 18 Jan 2016 00:16:04 +0000
Subject: [PATCH 1/3] bring back power badges

---
 .../matrix-react-sdk/views/rooms/MemberTile.css |  8 ++++----
 src/skins/vector/img/admin.svg                  | 17 +++++++++++++++++
 src/skins/vector/img/mod.svg                    | 16 ++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 src/skins/vector/img/admin.svg
 create mode 100644 src/skins/vector/img/mod.svg

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css
index adfb55540a..f17438abcc 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css
@@ -35,10 +35,10 @@ limitations under the License.
 
 .mx_MemberTile_power {
     position: absolute;
-    width: 44px;
-    height: 44px;
-    left: 10px;
-    top: -1px;
+    width: 16px;
+    height: 17px;
+    top: 0px;
+    right: 6px;
 }
 
 .mx_MemberTile_name {
diff --git a/src/skins/vector/img/admin.svg b/src/skins/vector/img/admin.svg
new file mode 100644
index 0000000000..7ea7459304
--- /dev/null
+++ b/src/skins/vector/img/admin.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="17px" viewBox="-1 -1 15 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: sketchtool 3.4.4 (395) - http://www.bohemiancoding.com/sketch -->
+    <title>icons_owner</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="02_19-Room-contextual-menu-hover" sketch:type="MSArtboardGroup" transform="translate(-1000.000000, -128.000000)">
+            <g id="people_open" sketch:type="MSLayerGroup" transform="translate(966.000000, 59.000000)">
+                <g id="icons_owner" transform="translate(35.000000, 70.000000)" sketch:type="MSShapeGroup">
+                    <path d="M0.441894529,1.80537109 C2.59277353,3.03442388 4.25305977,2.17675781 5.9832796,0.805371094 C8.01666135,2.17675787 9.50756797,3.12670903 11.6293941,1.80537109 C11.6293941,7.01538067 11.9379879,12.2253912 5.9832796,12.2253906 C0.0285712975,12.2253901 0.441894531,7.01538067 0.441894529,1.80537109 Z" id="Path-2-Copy" stroke="#FFFFFF" fill="#F6A623"></path>
+                    <polygon id="Star-1" fill="#FFFFFF" points="6 8.8 3.88397309 9.91246118 4.28809827 7.55623059 2.57619654 5.88753882 4.94198655 5.54376941 6 3.4 7.05801345 5.54376941 9.42380346 5.88753882 7.71190173 7.55623059 8.11602691 9.91246118 "></polygon>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/src/skins/vector/img/mod.svg b/src/skins/vector/img/mod.svg
new file mode 100644
index 0000000000..847baf98f9
--- /dev/null
+++ b/src/skins/vector/img/mod.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="16px" height="17px" viewBox="-1 -1 15 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: sketchtool 3.4.4 (395) - http://www.bohemiancoding.com/sketch -->
+    <title>icons_admin</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="02_19-Room-contextual-menu-hover" sketch:type="MSArtboardGroup" transform="translate(-1000.000000, -172.000000)" stroke="#FFFFFF" fill="#C2C5AF">
+            <g id="people_open" sketch:type="MSLayerGroup" transform="translate(966.000000, 59.000000)">
+                <g id="icons_admin" transform="translate(35.000000, 114.000000)" sketch:type="MSShapeGroup">
+                    <path d="M0.441894529,1.80537109 C2.59277353,3.03442388 4.25305977,2.17675781 5.9832796,0.805371094 C8.01666135,2.17675787 9.50756797,3.12670903 11.6293941,1.80537109 C11.6293941,7.01538067 11.9379879,12.2253912 5.9832796,12.2253906 C0.0285712975,12.2253901 0.441894531,7.01538067 0.441894529,1.80537109 Z" id="Path-2-Copy-2"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

From 1fef91b82c55d02cd8f58eaf2f2c1f06df7b3aba Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 18 Jan 2016 01:18:11 +0000
Subject: [PATCH 2/3] MemberInfo lipstick

---
 .../views/rooms/MemberInfo.css                | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
index 8b15a7197f..0f9a55e9a7 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
@@ -36,6 +36,19 @@ limitations under the License.
     border-radius: 48px;
 }
 
+.mx_MemberInfo_profile {
+    margin-bottom: 16px;
+}
+
+.mx_MemberInfo h3 {
+    text-transform: uppercase;
+    color: #3d3b39;
+    font-weight: 600;
+    font-size: 13px;
+    margin-top: 16px;
+    margin-bottom: 14px;
+}
+
 .mx_MemberInfo_profileField {
     font-color: #999999;    
     font-size: 13px;
@@ -44,21 +57,12 @@ limitations under the License.
 }
 
 .mx_MemberInfo_buttons {
-    margin-top: 18px;
 }
 
 .mx_MemberInfo_field {
     cursor: pointer;
-    width: 100px;
-    text-align: center;
-    font-size: 11px;    
-    background-color: #888;
-    color: #fff;
-    font-weight: bold;
-    border-radius: 20px;
-    padding-left: 6px;
-    padding-right: 6px;
-    padding-top: 4px;
-    padding-bottom: 2px;
-    margin-bottom: 4px;
+    font-size: 13px;
+    color: #76cfa6;
+    margin-left: 8px;
+    line-height: 23px;
 }

From 8792be4db2933f2f7bbed297080c3b4417f7d134 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 18 Jan 2016 01:25:57 +0000
Subject: [PATCH 3/3] moar space

---
 src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
index 0f9a55e9a7..d750a9fdc5 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
@@ -57,6 +57,7 @@ limitations under the License.
 }
 
 .mx_MemberInfo_buttons {
+    margin-bottom: 16px;
 }
 
 .mx_MemberInfo_field {