From 9e2793dfed310d1ae154690d50c5266661c5b780 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Feb 2017 16:10:43 +0000
Subject: [PATCH 1/2] Style for split-out interactive auth

For https://github.com/matrix-org/matrix-react-sdk/pull/691
---
 src/skins/vector/css/_common.scss | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index bf31bea6..65fdd621 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -152,6 +152,7 @@ textarea {
     font-size: 15px;
     position: relative;
     padding-left: 58px;
+    padding-bottom: 36px;
     width: 60%;
     max-width: 704px;
     box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
@@ -184,6 +185,13 @@ textarea {
     pointer-events: none;
 }
 
+.mx_Dialog_cancelButton {
+    float: right;
+    margin-top: 5px;
+    margin-right: 5px;
+    cursor: pointer;
+}
+
 .mx_Dialog_content {
     margin: 24px 58px 68px 0;
     font-size: 14px;
@@ -191,10 +199,6 @@ textarea {
     word-wrap: break-word;
 }
 
-.mx_Dialog_buttons {
-    padding-bottom: 36px;
-}
-
 .mx_Dialog button, .mx_Dialog input[type="submit"] {
     border: 0px;
     height: 36px;
@@ -286,6 +290,10 @@ textarea {
     display: inline;
 }
 
+.mx_button_row {
+    margin-top: 69px;
+}
+
 .changelog_text {
     font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
 }

From c6ccfa061601b63bbc41ded09ef0f89921a1e094 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Feb 2017 16:15:27 +0000
Subject: [PATCH 2/2] Copyright

---
 src/skins/vector/css/_common.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index 65fdd621..1f825f63 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 Vector Creations Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.