Merge branch 'develop' into travis/pinned_messages

src/skins/vector/css/_components.scss

@@ -20,7 +20,9 @@
 @import "./matrix-react-sdk/views/dialogs/_ChatInviteDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_EncryptedEventDialog.scss";
+@import "./matrix-react-sdk/views/dialogs/_QuestionDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_SetMxIdDialog.scss";
 @import "./matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss";
 @import "./matrix-react-sdk/views/elements/_AccessibleButton.scss";
@@ -28,11 +30,13 @@
 @import "./matrix-react-sdk/views/elements/_AddressTile.scss";
 @import "./matrix-react-sdk/views/elements/_DirectorySearchBox.scss";
 @import "./matrix-react-sdk/views/elements/_Dropdown.scss";
+@import "./matrix-react-sdk/views/elements/_EditableItemList.scss";
 @import "./matrix-react-sdk/views/elements/_MemberEventListSummary.scss";
 @import "./matrix-react-sdk/views/elements/_ProgressBar.scss";
 @import "./matrix-react-sdk/views/elements/_RichText.scss";
 @import "./matrix-react-sdk/views/elements/_RoleButton.scss";
 @import "./matrix-react-sdk/views/groups/_GroupInviteTile.scss";
+@import "./matrix-react-sdk/views/groups/_GroupRoomList.scss";
 @import "./matrix-react-sdk/views/login/_InteractiveAuthEntryComponents.scss";
 @import "./matrix-react-sdk/views/login/_ServerConfig.scss";
 @import "./matrix-react-sdk/views/messages/_MEmoteBody.scss";

src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss

@@ -34,6 +34,11 @@ limitations under the License.
     width: 40%;
 }
 
+/* Until the button is wired up */
+.mx_MyGroups_joinBox {
+    visibility: hidden;
+}
+
 .mx_MyGroups_joinCreateHeader {
     font-weight: bold;
     margin-bottom: 10px;

src/skins/vector/css/matrix-react-sdk/structures/_RoomStatusBar.scss

@@ -150,6 +150,16 @@ limitations under the License.
     display: block;
 }
 
+.mx_RoomStatusBar_isAlone {
+    height: 50px;
+    line-height: 50px;
+
+    color: $primary-fg-color;
+    opacity: 0.5;
+    overflow-y: hidden;
+    display: block;
+}
+
 .mx_MatrixChat_useCompactLayout {
     .mx_RoomStatusBar {
         min-height: 40px;

src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss

@@ -252,6 +252,16 @@ input.mx_UserSettings_phoneNumberField {
     display: none;
 }
 
+.mx_UserSettings_avatarPicker_imgContainer {
+    display: inline-block;
+}
+
+.mx_UserSettings_avatarPicker_remove {
+    display: inline-block;
+    float: right;
+    margin-right: -15px;
+}
+
 .mx_UserSettings_advanced_spoiler,
 .mx_UserSettings_link {
     cursor: pointer;

src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss

@@ -67,6 +67,10 @@ limitations under the License.
     margin-bottom: 14px;
 }
 
+.mx_Login_field_disabled {
+    opacity: 0.3;
+}
+
 .mx_Login_fieldLabel {
     margin-top: -10px;
     margin-left: 8px;
@@ -87,6 +91,10 @@ limitations under the License.
     color: $accent-fg-color;
 }
 
+.mx_Login_submit:disabled {
+    opacity: 0.3;
+}
+
 .mx_Login_label {
     font-size: 13px;
     opacity: 0.8;

src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateRoomDialog.scss

@@ -0,0 +1,33 @@
+/*
+Copyright 2017 Michael Telatynski <7t3chguy@gmail.com>
+
+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_CreateRoomDialog_details_summary {
+    outline: none;
+}
+
+.mx_CreateRoomDialog_label {
+    text-align: left;
+    padding-bottom: 12px;
+}
+
+.mx_CreateRoomDialog_input {
+    font-size: 15px;
+    border-radius: 3px;
+    border: 1px solid $input-border-color;
+    padding: 9px;
+    color: $primary-fg-color;
+    background-color: $primary-bg-color;
+}

src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss

@@ -0,0 +1,18 @@
+/*
+Copyright 2017 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_QuestionDialog {
+    padding-right: 58px;
+}

src/skins/vector/css/matrix-react-sdk/views/elements/_Dropdown.scss

@@ -18,6 +18,10 @@ limitations under the License.
     position: relative;
 }
 
+.mx_Dropdown_disabled {
+    opacity: 0.3;
+}
+
 .mx_Dropdown_input {
     position: relative;
     border-radius: 3px;

src/skins/vector/css/matrix-react-sdk/views/elements/_EditableItemList.scss

@@ -0,0 +1,62 @@
+/*
+Copyright 2017 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_EditableItemList {
+    margin-top: 12px;
+    margin-bottom: 0px;
+}
+
+.mx_EditableItem {
+    display: flex;
+    margin-left: 56px;
+}
+
+.mx_EditableItem .mx_EditableItem_editable {
+    border: 0px;
+    border-bottom: 1px solid $strong-input-border-color;
+    padding: 0px;
+    min-width: 240px;
+    max-width: 400px;
+    margin-bottom: 16px;
+}
+
+.mx_EditableItem .mx_EditableItem_editable:focus {
+    border-bottom: 1px solid $accent-color;
+    outline: none;
+    box-shadow: none;
+}
+
+.mx_EditableItem .mx_EditableItem_editablePlaceholder {
+    color: $settings-grey-fg-color;
+}
+
+.mx_EditableItem .mx_EditableItem_addButton,
+.mx_EditableItem .mx_EditableItem_removeButton {
+    padding-left: 0.5em;
+    position: relative;
+    cursor: pointer;
+
+    visibility: hidden;
+}
+
+.mx_EditableItem:hover .mx_EditableItem_addButton,
+.mx_EditableItem:hover .mx_EditableItem_removeButton {
+    visibility: visible;
+}
+
+.mx_EditableItemList_label {
+    margin-bottom: 8px;
+}

src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss

@@ -0,0 +1,36 @@
+/*
+Copyright 2017 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_GroupRoomTile {
+    position: relative;
+    color: $primary-fg-color;
+    cursor: pointer;
+}
+
+.mx_GroupRoomTile_delete {
+    opacity: 0.4;
+    position: absolute;
+    top: 6px;
+    right: 10px;
+    cursor: pointer;
+
+    display: none;
+}
+
+.mx_GroupRoomTile:hover > .mx_GroupRoomTile_delete {
+    display: initial;
+}
+

src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_EntityTile,
-.mx_GroupRoomTile {
+.mx_EntityTile {
     display: table-row;
     position: relative;
     color: $primary-fg-color;

src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss

@@ -63,9 +63,11 @@ limitations under the License.
 
 .mx_EventTile .mx_SenderProfile .mx_Flair {
     opacity: 0.7;
+    margin-left: 5px;
 }
 
 .mx_EventTile .mx_SenderProfile .mx_Flair img {
+    vertical-align: -3px;
     margin-right: 2px;
 }
 

src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss

@@ -138,10 +138,17 @@ limitations under the License.
 .mx_RoomHeader_name,
 .mx_RoomHeader_avatar,
 .mx_RoomHeader_avatarPicker,
-.mx_RoomHeader_avatarPicker_edit {
+.mx_RoomHeader_avatarPicker_edit,
+.mx_RoomHeader_avatarPicker_remove {
     cursor: pointer;
 }
 
+.mx_RoomHeader_avatarPicker_remove {
+    position: absolute;
+    top: 10px;
+    left: 45px;
+}
+
 .mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
     color: $accent-color;
 }

src/skins/vector/css/themes/_dark.scss

@@ -131,6 +131,9 @@ $progressbar-color: #000;
 }
 
 // markdown overrides:
+.mx_EventTile_content .markdown-body pre:hover {
+    border-color: #808080 !important; // inverted due to rules below
+}
 .mx_EventTile_content .markdown-body {
     pre, code {
         filter: invert(1);