Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings

2017-10-04 22:35:58 +01:00
parent befc9b7a66 3d7b1cb382
commit bf6a3470b4
87 changed files with 2610 additions and 790 deletions
--- a/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_GroupView.scss
@@ -17,6 +17,8 @@ limitations under the License.
 .mx_GroupView {
    max-width: 960px;
    width: 100%;
+    margin-left: auto;
+    margin-right: auto;
 }

 .mx_GroupView_error {
@@ -70,8 +72,13 @@ limitations under the License.
    flex: 1;
 }

-.mx_GroupView_saveButton, .mx_GroupView_cancelButton {
-    display: table-cell;
+.mx_GroupView_header_rightCol {
+    display: flex;
+    align-items: center;
+}
+
+.mx_GroupView_textButton {
+    display: inline-block;
 }

 .mx_GroupView_header_groupid {
@@ -126,6 +133,31 @@ limitations under the License.
    top: 5px;
 }

+.mx_GroupView_membershipSection {
+    margin-left: auto;
+    margin-right: auto;
+    margin-bottom: 11px;
+    color: $greyed-fg-color;
+}
+
+.mx_GroupView_membershipSubSection {
+    justify-content: space-between;
+    display: flex;
+    margin-top: 2px;
+    margin-bottom: 2px;
+}
+
+.mx_GroupView_membershipSection_description {
+    /* To match textButton */
+    line-height: 34px;
+}
+
+.mx_GroupView_membershipSection .mx_GroupView_textButton {
+    margin-right: 0px;
+    margin-top: 0px;
+    margin-left: 8px;
+}
+
 .mx_GroupView_featuredThings {
    margin-top: 20px;
 }
@@ -142,9 +174,41 @@ limitations under the License.
    margin-top: 10px;
 }

+.mx_GroupView_featuredThings_container {
+    display: flex;
+}
+
+.mx_GroupView_featuredThings_addButton,
 .mx_GroupView_featuredThing {
-    cursor: pointer;
    display: table-cell;
+    text-align: center;
+
+    width: 100px;
+    margin: 0px 20px;
+}
+
+.mx_GroupView_featuredThing {
+    position: relative;
+}
+
+.mx_GroupView_featuredThing .mx_GroupView_featuredThing_deleteButton {
+    position: absolute;
+    top: -7px;
+    right: 11px;
+    opacity: 0.4;
+}
+
+.mx_GroupView_featuredThing .mx_BaseAvatar {
+    /* To prevent misalignment with mx_TintableSvg (in addButton) */
+    vertical-align: initial;
+}
+
+.mx_GroupView_featuredThings_addButton object {
+    pointer-events: none;
+}
+
+.mx_GroupView_featuredThing_name {
+    word-wrap: break-word;
 }

 .mx_GroupView_uploadInput {
--- a/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_LoginBox.scss
@@ -14,6 +14,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+.mx_LoginBox {
+    min-height: 24px;
+    height: unset !important;
+    padding-top: 13px !important;
+    padding-bottom: 14px !important;
+}
+
 .mx_LoginBox_loginButton_wrapper {
    text-align: center;
    width: 100%;
@@ -21,13 +28,13 @@ limitations under the License.

 .mx_LoginBox_loginButton,
 .mx_LoginBox_registerButton {
-    margin-top: -8px;
+    margin-top: 3px;
    height: 40px;
    border: 0px;
    border-radius: 40px;
    margin-left: 4px;
    margin-right: 4px;
-    width: 80px;
+    min-width: 80px;

    background-color: $accent-color;
    color: $primary-bg-color;
@@ -35,4 +42,6 @@ limitations under the License.
    cursor: pointer;

    font-size: 15px;
+    padding: 0 11px;
+    word-break: break-word;
 }
--- a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
@@ -14,6 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+.mx_MyGroups {
+    max-width: 960px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.mx_MyGroups .mx_RoomHeader_simpleHeader {
+    margin-left: 0px;
+}
+
 .mx_MyGroups_joinCreateBox {
    display: table;
    margin-bottom: 30px;
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -76,6 +76,10 @@ limitations under the License.
    flex: 0 0 auto;
 }

+.mx_RoomView_auxPanel_apps {
+    max-width: 1920px ! important;
+}
+
 .mx_RoomView_topUnreadMessagesBar {
    order: 3;
 }
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@@ -80,6 +80,16 @@ limitations under the License.
    cursor: pointer;
 }

+.mx_UserSettings_button.mx_UserSettings_buttonSmall {
+    height: 36px;
+    padding: 4px;
+    padding-left: 7px;
+    padding-right: 7px;
+    font-size: 12px;
+    margin-right: 5px;
+    line-height: 12px;
+}
+
 .mx_UserSettings_button.danger {
    background-color: $warning-color;
 }
--- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_QuestionDialog.scss
+++ b/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;
+}
--- a/src/skins/vector/css/matrix-react-sdk/views/elements/_EditableItemList.scss
+++ b/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;
+}
--- a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupInviteTile.scss
@@ -0,0 +1,74 @@
+/*
+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_GroupInviteTile {
+    position: relative;
+    cursor: pointer;
+    font-size: 13px;
+    display: block;
+    height: 34px;
+}
+
+.mx_GroupInviteTile_nameContainer {
+    display: inline-block;
+    width: 180px;
+    height: 24px;
+}
+
+.mx_GroupInviteTile_avatarContainer {
+    display: inline-block;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 16px;
+    padding-right: 6px;
+    width: 24px;
+    height: 24px;
+    vertical-align: middle;
+}
+
+.mx_GroupInviteTile_name {
+    display: inline-block;
+    position: relative;
+    width: 165px;
+    vertical-align: middle;
+    padding-left: 6px;
+    padding-right: 6px;
+    padding-top: 2px;
+    padding-bottom: 3px;
+    color: $roomtile-name-color;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.mx_GroupInviteTile_badge {
+    display: inline-block;
+    min-width: 15px;
+    height: 15px;
+    position: absolute;
+    right: 8px; /*gutter */
+    top: 9px;
+    border-radius: 8px;
+    color: $accent-fg-color;
+    background-color: $group-alert-color;
+    font-weight: 600;
+    font-size: 10px;
+    text-align: center;
+    padding-top: 1px;
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
--- a/src/skins/vector/css/matrix-react-sdk/views/groups/_GroupRoomList.scss
+++ b/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;
+}
+
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
@@ -15,12 +15,14 @@ limitations under the License.
 */

 .mx_AppsDrawer {
+    margin-bottom: 3px;
 }

 .mx_AppsContainer {
    display: flex;
    flex-direction: row;
    align-items: center;
+    justify-content: center;
 }

 .mx_AddWidget_button {
@@ -28,11 +30,15 @@ limitations under the License.
    cursor: pointer;
    padding-right: 12px;
    padding: 0;
-    margin: 0 0 5px 0;
+    margin: 5px auto 5px auto;
    color: $accent-color;
    font-size: 12px;
 }

+.mx_AddWidget_button_full_width {
+    max-width: 960px;
+}
+
 .mx_SetAppURLDialog_input {
    border-radius: 3px;
    border: 1px solid $input-border-color;
@@ -43,6 +49,7 @@ limitations under the License.
 }

 .mx_AppTile {
+    max-width: 960px;
    width: 50%;
    margin: 0 5px 2px 0;
    border: 1px solid $primary-hairline-color;
@@ -52,6 +59,7 @@ limitations under the License.
 }

 .mx_AppTileFullWidth {
+    max-width: 960px;
    width: 100%;
    margin: 0;
    padding: 0;
@@ -66,7 +74,7 @@ limitations under the License.
    margin: 0;
    padding: 2px 10px;
    // background-color: $e2e-verified-color;
-    border-bottom: 1px solid $primary-hairline-color;
+    // border-bottom: 1px solid $primary-hairline-color;
    font-size: 10px;
 }

@@ -94,6 +102,7 @@ limitations under the License.

 .mx_AppTileBody{
    height: 350px;
+    width: 100%;
    overflow: hidden;
 }

--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EntityTile.scss
@@ -28,7 +28,8 @@ limitations under the License.
    width: 26px;
 }

-.mx_EntityTile_avatar {
+.mx_EntityTile_avatar,
+.mx_GroupRoomTile_avatar {
    display: table-cell;
    padding-left: 3px;
    padding-right: 12px;
@@ -48,7 +49,8 @@ limitations under the License.
    right: 6px;
 }

-.mx_EntityTile_name {
+.mx_EntityTile_name,
+.mx_GroupRoomTile_name {
    display: table-cell;
    vertical-align: middle;
    overflow: hidden;
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
@@ -45,7 +45,6 @@ limitations under the License.

 .mx_EventTile .mx_SenderProfile {
    color: $primary-fg-color;
-    opacity: 0.5;
    font-size: 14px;
    display: block; /* anti-zalgo, with overflow hidden */
    overflow-y: hidden;
@@ -57,6 +56,19 @@ limitations under the License.
    line-height: 22px;
 }

+.mx_EventTile .mx_SenderProfile .mx_SenderProfile_name,
+.mx_EventTile .mx_SenderProfile .mx_SenderProfile_aux {
+    opacity: 0.5;
+}
+
+.mx_EventTile .mx_SenderProfile .mx_Flair {
+    opacity: 0.7;
+}
+
+.mx_EventTile .mx_SenderProfile .mx_Flair img {
+    margin-right: 2px;
+}
+
 .mx_EventTile .mx_MessageTimestamp {
    display: block;
    visibility: hidden;
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberList.scss
@@ -14,7 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-.mx_MemberList {
+.mx_MemberList,
+.mx_GroupMemberList,
+.mx_GroupRoomList {
    height: 100%;

    margin-top: 12px;
@@ -44,7 +46,9 @@ limitations under the License.
    flex: 1 1 0px;
 }

-.mx_MemberList_query {
+.mx_MemberList_query,
+.mx_GroupMemberList_query,
+.mx_GroupRoomList_query {
    font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
    border-radius: 3px;
    border: 1px solid $input-border-color;
@@ -57,13 +61,17 @@ limitations under the License.
    width: 189px;
 }

-.mx_MemberList_query::-moz-placeholder {
+.mx_MemberList_query::-moz-placeholder,
+.mx_GroupMemberList_query::-moz-placeholder,
+.mx_GroupRoomList_query::-moz-placeholder {
    color: $primary-fg-color;
    opacity: 0.5;
    font-size: 14px;
 }

-.mx_MemberList_query::-webkit-input-placeholder {
+.mx_MemberList_query::-webkit-input-placeholder,
+.mx_GroupMemberList_query::-webkit-input-placeholder,
+.mx_GroupRoomList_query::-webkit-input-placeholder {
    color: $primary-fg-color;
    opacity: 0.5;
    font-size: 14px;
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomSettings.scss
@@ -21,9 +21,7 @@ limitations under the License.
 }

 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_unbanButton,
-.mx_RoomSettings_integrationsButton,
-.mx_RoomSettings_integrationsButton_error {
+.mx_RoomSettings_unbanButton {
    position: relative;
    height: 36px;
    background-color: $accent-color;
@@ -36,25 +34,37 @@ limitations under the License.
    padding-left: 12px;
    padding-right: 12px;
 }
+.mx_RoomSettings_integrationsButton_error {
+    position: relative;
+    cursor: not-allowed;
+}
+.mx_RoomSettings_integrationsButton_error img {
+    position: absolute;
+    right: -5px;
+    top: -5px;
+}
 .mx_RoomSettings_leaveButton,
-.mx_RoomSettings_integrationsButton,
 .mx_RoomSettings_integrationsButton_error {
    float: right;
 }
-.mx_RoomSettings_integrationsButton_error {
-    pointer: not-allowed;
+.mx_RoomSettings_integrationsButton_error .mx_RoomSettings_integrationsButton_errorPopup {
+    display: none;
+}
+.mx_RoomSettings_integrationsButton_error:hover .mx_RoomSettings_integrationsButton_errorPopup {
+    display: inline;
 }
 .mx_RoomSettings_integrationsButton_errorPopup {
    position: absolute;
    top: 110%;
-    left: -26%;
-    width: 150%;
+    left: -125%;
+    width: 348%;
    padding: 2%;
    font-size: 10pt;
    line-height: 1.5em;
    border-radius: 5px;
    background-color: $accent-color;
    color: $accent-fg-color;
+    text-align: center;
 }
 .mx_RoomSettings_unbanButton {
    display: inline;