Merge branch 'develop' into luke/rts-welcome-pages

2017-02-07 12:41:52 +01:00
parent 35bc384c51 1f0b4853be
commit fa552ad5af
20 changed files with 402 additions and 144 deletions
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -107,6 +107,16 @@ limitations under the License.
    justify-content: flex-start;
 }

+.mx_RoomView_empty {
+    flex: 1 1 auto;
+    font-size: 13px;
+    padding-left: 3em;
+    padding-right: 3em;
+    margin-right: 20px;
+    margin-top: 33%;
+    text-align: center;
+}
+
 .mx_RoomView_MessageList {
    width: 100%;
    list-style-type: none;
--- a/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
@@ -46,7 +46,7 @@ limitations under the License.
 }

 .mx_Login_logo img {
-    height: 100%
+    max-height: 100%
 }

 .mx_Login_support {
--- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
@@ -54,7 +54,7 @@ limitations under the License.
    margin-right: 8px;
    padding-left: 0.5em;
    padding-right: 0.5em;
-    width: 70px;
+    width: 85px;
    outline: none;
    cursor: pointer;
    color: $accent-color;