From ccd518cc4c44bb71646f6b70c58c35541cf62a48 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 8 Jan 2016 03:26:07 +0000
Subject: [PATCH] CSS and imagery for fixed up RoomSettings

---
 .../views/rooms/RoomSettings.css              | 39 +++++++++++++++++++
 src/skins/vector/img/tick.svg                 | 12 ++++++
 2 files changed, 51 insertions(+)
 create mode 100644 src/skins/vector/img/tick.svg

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
index 1c062a578f..2b2411287f 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomSettings.css
@@ -34,6 +34,15 @@ limitations under the License.
     margin: 0 10px;
 }
 
+.mx_RoomSettings h3 {
+    text-transform: uppercase;
+    color: #3d3b39;
+    font-weight: 600;
+    font-size: 13px;
+    margin-top: 36px;
+    margin-bottom: 10px;
+}
+
 .mx_RoomSettings input,
 .mx_RoomSettings textarea  {
     border-radius: 3px;
@@ -44,6 +53,36 @@ limitations under the License.
     margin-top: 6px;
 }
 
+.mx_RoomSettings .mx_RoomSettings_roomColor {
+    display: inline-block;
+    position: relative;
+    width: 37px;
+    height: 37px;
+    border: 1px solid #979797;
+    margin-right: 13px;
+}
+
+.mx_RoomSettings .mx_RoomSettings_roomColor_selected {
+    position: absolute;
+    left: 10px;
+    top: 4px;
+}
+
+.mx_RoomSettings .mx_RoomSettings_roomColorPrimary {
+    height: 10px;
+    position: absolute;
+    bottom: 0px;
+    width: 100%;
+}
+
+.mx_RoomSettings .mx_RoomAvatar {
+    border-radius: 120px;
+}
+
+.mx_RoomSettings input[type="file"] {
+    border: none;
+}
+
 .mx_RoomSettings_description {
     width: 330px;
 }
diff --git a/src/skins/vector/img/tick.svg b/src/skins/vector/img/tick.svg
new file mode 100644
index 0000000000..6177f15f5e
--- /dev/null
+++ b/src/skins/vector/img/tick.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="14px" viewBox="-1 -1 17 14" 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 (381) - http://www.bohemiancoding.com/sketch -->
+    <title>icon_tick</title>
+    <desc>Created with sketchtool.</desc>
+    <defs></defs>
+    <g id="06a-Room-settings" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="06_4-Room-settings-admin" sketch:type="MSArtboardGroup" transform="translate(-310.000000, -206.000000)" fill="#4A4A4A">
+            <path d="M315,218 L310,213 L312,211 L315,214 L323,206 L325,208 L315,218 Z" id="icon_tick" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>