From 3cfcc13387b7987130aec01b753edf8fa5beae16 Mon Sep 17 00:00:00 2001
From: wmwragg <wm.wragg@gmail.com>
Date: Sun, 17 Jul 2016 21:20:11 +0100
Subject: [PATCH 1/2] Initial fix for Dialog Spinners

---
 src/skins/vector/css/common.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index 726484462c..ce659605d8 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -148,6 +148,12 @@ input[type=text]:focus, textarea:focus {
     justify-content: center;
 }
 
+.mx_Dialog_wrapper.mx_Dialog_spinner .mx_Dialog {
+    width: auto;
+    border-radius: 8px;
+    padding-left: 0px;
+}
+
 .mx_Dialog {
     background-color: #fff;
     color: #747474;

From 28108476bd7198a9afb55bffdddab3a734fe764f Mon Sep 17 00:00:00 2001
From: wmwragg <wm.wragg@gmail.com>
Date: Mon, 18 Jul 2016 10:31:17 +0100
Subject: [PATCH 2/2] Added an overide for the view source so that it behaves
 correctly with the new Modal. Also tweaked the spinner overide

---
 src/components/views/rooms/MessageContextMenu.js | 2 +-
 src/skins/vector/css/common.css                  | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/MessageContextMenu.js b/src/components/views/rooms/MessageContextMenu.js
index 4eea46037c..91c59bd07b 100644
--- a/src/components/views/rooms/MessageContextMenu.js
+++ b/src/components/views/rooms/MessageContextMenu.js
@@ -47,7 +47,7 @@ module.exports = React.createClass({
         var ViewSource = sdk.getComponent('structures.ViewSource');
         Modal.createDialog(ViewSource, {
             mxEvent: this.props.mxEvent
-        });
+        }, 'mx_Dialog_viewsource');
         if (this.props.onFinished) this.props.onFinished();
     },
 
diff --git a/src/skins/vector/css/common.css b/src/skins/vector/css/common.css
index ce659605d8..92e4abcacc 100644
--- a/src/skins/vector/css/common.css
+++ b/src/skins/vector/css/common.css
@@ -148,10 +148,18 @@ input[type=text]:focus, textarea:focus {
     justify-content: center;
 }
 
+/* Spinner Dialog overide */
 .mx_Dialog_wrapper.mx_Dialog_spinner .mx_Dialog {
     width: auto;
     border-radius: 8px;
     padding-left: 0px;
+    box-shadow: none;
+}
+
+/* View Source Dialog overide */
+.mx_Dialog_wrapper.mx_Dialog_viewsource .mx_Dialog {
+    padding-left: 10px;
+    padding-right: 10px;
 }
 
 .mx_Dialog {