Merge branch 'develop' into bwindels/redesign

res/css/_components.scss

@@ -39,6 +39,7 @@
 @import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
 @import "./views/dialogs/_QuestionDialog.scss";
+@import "./views/dialogs/_RoomUpgradeDialog.scss";
 @import "./views/dialogs/_SetEmailDialog.scss";
 @import "./views/dialogs/_SetMxIdDialog.scss";
 @import "./views/dialogs/_SetPasswordDialog.scss";
@@ -67,6 +68,7 @@
 @import "./views/groups/_GroupUserSettings.scss";
 @import "./views/login/_InteractiveAuthEntryComponents.scss";
 @import "./views/login/_ServerConfig.scss";
+@import "./views/messages/_CreateEvent.scss";
 @import "./views/messages/_DateSeparator.scss";
 @import "./views/messages/_MEmoteBody.scss";
 @import "./views/messages/_MFileBody.scss";
@@ -99,6 +101,7 @@
 @import "./views/rooms/_RoomSettings.scss";
 @import "./views/rooms/_RoomTile.scss";
 @import "./views/rooms/_RoomTooltip.scss";
+@import "./views/rooms/_RoomUpgradeWarningBar.scss";
 @import "./views/rooms/_SearchBar.scss";
 @import "./views/rooms/_SearchableEntityList.scss";
 @import "./views/rooms/_Stickers.scss";

res/css/structures/_MatrixChat.scss

@@ -56,6 +56,18 @@ limitations under the License.
     flex: 1;
 }
 
+.mx_MatrixChat_syncError {
+    color: $accent-fg-color;
+    background-color: $warning-bg-color;
+    border-radius: 5px;
+    display: table;
+    padding: 30px;
+    position: absolute;
+    top: 100px;
+    left: 50%;
+    transform: translateX(-50%);
+}
+
 .mx_MatrixChat .mx_LeftPanel {
     order: 1;
     background-color: $secondary-accent-color;

res/css/views/dialogs/_RoomUpgradeDialog.scss

@@ -0,0 +1,19 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_RoomUpgradeDialog {
+    padding-right: 70px;
+}

res/css/views/globals/_MatrixToolbar.scss

@@ -28,6 +28,12 @@ limitations under the License.
     margin-top: -2px;
 }
 
+.mx_MatrixToolbar_info {
+    padding-left: 16px;
+    padding-right: 8px;
+    background-color: $info-bg-color;
+}
+
 .mx_MatrixToolbar_error {
     padding-left: 16px;
     padding-right: 8px;

res/css/views/messages/_CreateEvent.scss

@@ -0,0 +1,37 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_CreateEvent {
+    background-color: $info-plinth-bg-color;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 10px;
+    padding-bottom: 10px;
+}
+
+.mx_CreateEvent_image {
+    float: left;
+    padding-right: 20px;
+    width: 72px;
+    height: 34px;
+}
+
+.mx_CreateEvent_header {
+    font-weight: bold;
+}
+
+.mx_CreateEvent_link {
+}

res/css/views/rooms/_MessageComposer.scss

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +22,29 @@ limitations under the License.
     position: relative;
 }
 
+.mx_MessageComposer_replaced_wrapper {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.mx_MessageComposer_replaced_valign {
+    height: 60px;
+    display: table-cell;
+    vertical-align: middle;
+}
+
+.mx_MessageComposer_roomReplaced_icon {
+    float: left;
+    margin-right: 20px;
+    margin-top: 5px;
+    width: 31px;
+    height: 31px;
+}
+
+.mx_MessageComposer_roomReplaced_header {
+    font-weight: bold;
+}
+
 .mx_MessageComposer_autocomplete_wrapper {
     position: relative;
     height: 0;

res/css/views/rooms/_RoomSettings.scss

@@ -20,6 +20,7 @@ limitations under the License.
     margin-bottom: 20px;
 }
 
+.mx_RoomSettings_upgradeButton,
 .mx_RoomSettings_leaveButton,
 .mx_RoomSettings_unbanButton {
     @mixin mx_DialogButton;
@@ -27,11 +28,16 @@ limitations under the License.
     margin-right: 8px;
 }
 
+.mx_RoomSettings_upgradeButton,
 .mx_RoomSettings_leaveButton:hover,
 .mx_RoomSettings_unbanButton:hover {
     @mixin mx_DialogButton_hover;
 }
 
+.mx_RoomSettings_upgradeButton.danger {
+    @mixin mx_DialogButton_danger;
+}
+
 .mx_RoomSettings_integrationsButton_error {
     position: relative;
     cursor: not-allowed;

res/css/views/rooms/_RoomUpgradeWarningBar.scss

@@ -0,0 +1,48 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+.mx_RoomUpgradeWarningBar {
+    text-align: center;
+    height: 176px;
+    background-color: $event-selected-color;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    display: flex;
+    background-color: $preview-bar-bg-color;
+    -webkit-align-items: center;
+    padding-left: 20px;
+    padding-right: 20px;
+}
+
+.mx_RoomUpgradeWarningBar_header {
+    color: $warning-color;
+    font-weight: bold;
+}
+
+.mx_RoomUpgradeWarningBar_body {
+    color: $warning-color;
+}
+
+.mx_RoomUpgradeWarningBar_upgradelink {
+    color: $warning-color;
+    text-decoration: underline;
+}
+
+.mx_RoomUpgradeWarningBar_small {
+    color: $greyed-fg-color;
+    font-size: 70%;
+}