From 998739a7dcc0c98b29fa19e016c5f825761a36ac Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 22 May 2017 18:00:40 +0100
Subject: [PATCH] Edit icon and styling

---
 .../views/rooms/_AppsDrawer.scss              | 33 ++++++++++++++-----
 src/skins/vector/img/edit.svg                 | 13 ++++++++
 2 files changed, 38 insertions(+), 8 deletions(-)
 create mode 100644 src/skins/vector/img/edit.svg

diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
index 23c4ca4868..bf838b85ee 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -26,25 +26,26 @@ limitations under the License.
 .mx_AddWidget_button {
     order: 2;
     cursor: pointer;
-    padding-left: 12px;
     padding-right: 12px;
-    margin: 0 20px 20px 20px;
+    padding: 0;
+    margin: 0 0 5px 0;
     color: $accent-color;
+    font-size: 12px;
 }
 
 .mx_SetAppURLDialog_input {
     border-radius: 3px;
     border: 1px solid $input-border-color;
     padding: 9px;
-    color: $primary-fg-color;
+    color: $primary-hairline-color;
     background-color: $primary-bg-color;
     font-size: 15px;
 }
 
 .mx_AppTile {
-    width: 48%;
-    margin: 2px 5px;
-    border: 1px solid $greyed-fg-color;
+    width: 50%;
+    margin: 0 5px 2px 0;
+    border: 1px solid $primary-hairline-color;
     border-radius: 2px;
     height: 200px;
     // display: inline-block;
@@ -55,12 +56,28 @@ limitations under the License.
     margin: 0;
     padding: 2px 10px;
     // background-color: $e2e-verified-color;
-    border-bottom: 1px solid $greyed-fg-color;
+    border-bottom: 1px solid $primary-hairline-color;
+    font-size: 10px;
+}
+
+.mx_AppTileMenuBarWidgets {
+    float: right;
+}
+.mx_AppTileMenuBarWidget {
+    // pointer-events: none;
+    cursor: pointer;
 }
 
 .mx_AppTileBody iframe {
     width: 100%;
-    height: 175px;
+    height: 181px;
     overflow: hidden;
     border: none;
 }
+
+.mx_CloseAppWidget {
+}
+
+.mx_AppTileMenuBarWidgetPadding {
+    margin-right: 5px;
+}
diff --git a/src/skins/vector/img/edit.svg b/src/skins/vector/img/edit.svg
new file mode 100644
index 0000000000..a0be3454e1
--- /dev/null
+++ b/src/skins/vector/img/edit.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<g>
+	
+		<rect x="178.846" y="92.087" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 224.3476 631.1498)" width="128.085" height="354.049"/>
+	<path d="M471.723,88.393l-48.115-48.114c-11.723-11.724-31.558-10.896-44.304,1.85l-45.202,45.203l90.569,90.568l45.202-45.202
+		C482.616,119.952,483.445,100.116,471.723,88.393z"/>
+	<polygon points="64.021,363.252 32,480 148.737,447.979 	"/>
+</g>
+</svg>