Merge remote-tracking branch 'origin/develop' into develop

2017-08-01 16:30:35 +00:00
parent b12741464e af85f18eae
commit 73e5cc9721
1 changed files with 2 additions and 1 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -188,7 +188,7 @@ form.mx_Custom_Widget_Form div {
 }

 .mx_AppPermissionWarningImage img {
-    width: 150px;
+    width: 100px;
 }

 .mx_AppPermissionWarningText {
@@ -199,6 +199,7 @@ form.mx_Custom_Widget_Form div {

 .mx_AppPermissionWarningTextLabel {
    font-weight: bold;
+    display: block;
 }

 .mx_AppPermissionWarningTextURL {