Merge branch 'develop' into release-v1.0.0

Author: jryans

res/css/_common.scss

@@ -50,8 +50,54 @@ a:visited {
     color: $accent-color-alt;
 }
 
+input[type=text],
+input[type=search],
+input[type=password] {
+    padding: 9px;
+    font-family: $font-family;
+    font-size: 14px;
+    font-weight: 600;
+    min-width: 0;
+}
+
+input[type=text].mx_textinput_icon,
+input[type=search].mx_textinput_icon {
+    padding-left: 36px;
+    background-repeat: no-repeat;
+    background-position: 10px center;
+}
+
+// FIXME THEME - Tint by CSS rather than referencing a duplicate asset
+input[type=text].mx_textinput_icon.mx_textinput_search,
+input[type=search].mx_textinput_icon.mx_textinput_search {
+    background-image: url('$(res)/img/feather-icons/search-input.svg');
+}
+
+// dont search UI as not all browsers support it,
+// we implement it ourselves where needed instead
+input[type=search]::-webkit-search-decoration,
+input[type=search]::-webkit-search-cancel-button,
+input[type=search]::-webkit-search-results-button,
+input[type=search]::-webkit-search-results-decoration {
+    display: none;
+}
+
+.input[type=text]::-webkit-input-placeholder,
+.input[type=text]::-moz-placeholder,
+.input[type=search]::-webkit-input-placeholder,
+.input[type=search]::-moz-placeholder {
+    color: #a5aab2;
+}
+
+// Override Firefox's UA style so we get a consistent look across browsers
+input::placeholder,
+textarea::placeholder {
+    opacity: initial;
+}
+
 input[type=text], input[type=password], textarea {
     background-color: transparent;
+    color: $primary-fg-color;
 }
 
 input[type=text]:focus, input[type=password]:focus, textarea:focus {
@@ -62,6 +108,7 @@ input[type=text]:focus, input[type=password]:focus, textarea:focus {
 /* Required by Firefox */
 textarea {
     font-family: $font-family;
+    color: $primary-fg-color;
 }
 
 /* Prevent ugly dotted highlight around selected elements in Firefox */
@@ -242,7 +289,7 @@ textarea {
     font-weight: 600;
     border: 1px solid $accent-color ! important;
     color: $accent-color;
-    background-color: $accent-fg-color;
+    background-color: $button-secondary-bg-color;
 }
 
 .mx_Dialog button:hover, .mx_Dialog input[type="submit"]:hover {

res/css/_components.scss

@@ -7,6 +7,7 @@
 @import "./structures/_CustomRoomTagPanel.scss";
 @import "./structures/_FilePanel.scss";
 @import "./structures/_GroupView.scss";
+@import "./structures/_HeaderButtons.scss";
 @import "./structures/_HomePage.scss";
 @import "./structures/_LeftPanel.scss";
 @import "./structures/_MatrixChat.scss";
@@ -57,6 +58,7 @@
 @import "./views/dialogs/_DevtoolsDialog.scss";
 @import "./views/dialogs/_EncryptedEventDialog.scss";
 @import "./views/dialogs/_GroupAddressPicker.scss";
+@import "./views/dialogs/_IncomingSasDialog.scss";
 @import "./views/dialogs/_RestoreKeyBackupDialog.scss";
 @import "./views/dialogs/_RoomSettingsDialog.scss";
 @import "./views/dialogs/_RoomUpgradeDialog.scss";
@@ -126,6 +128,7 @@
 @import "./views/rooms/_PinnedEventsPanel.scss";
 @import "./views/rooms/_PresenceLabel.scss";
 @import "./views/rooms/_ReplyPreview.scss";
+@import "./views/rooms/_RoomBreadcrumbs.scss";
 @import "./views/rooms/_RoomDropTarget.scss";
 @import "./views/rooms/_RoomHeader.scss";
 @import "./views/rooms/_RoomList.scss";

res/css/structures/_AutoHideScrollbar.scss

@@ -74,6 +74,7 @@ body.mx_scrollbar_nooverlay {
 // or fallback for webkit browsers
 ::-webkit-scrollbar {
     width: 6px;
+    height: 6px;
     background-color: $scrollbar-track-color;
 }
 

res/css/structures/_ContextualMenu.scss

@@ -31,7 +31,7 @@ limitations under the License.
 
 .mx_ContextualMenu {
     border-radius: 4px;
-    box-shadow: 4px 4px 12px 0 rgba(118, 131, 156, 0.6);;
+    box-shadow: 4px 4px 12px 0 $menu-box-shadow-color;
     background-color: $menu-bg-color;
     color: $primary-fg-color;
     position: absolute;

res/css/structures/_GroupView.scss

@@ -44,13 +44,22 @@ limitations under the License.
 }
 
 .mx_GroupHeader_button {
-    margin-left: 12px;
+    margin-left: 5px;
+    margin-right: 5px;
     cursor: pointer;
+    height: 20px;
+    width: 20px;
+    background-color: $groupheader-button-color;
+    mask-repeat: no-repeat;
+    mask-size: contain;
 }
 
-.mx_GroupHeader_button object {
-    // prevents clicks from being swallowed by svg in 'object' tag
-    pointer-events: none;
+.mx_GroupHeader_editButton {
+    mask-image: url('$(res)/img/icons-settings-room.svg');
+}
+
+.mx_GroupHeader_shareButton {
+    mask-image: url('$(res)/img/icons-share.svg');
 }
 
 .mx_GroupView_editable {

res/css/structures/_HeaderButtons.scss

@@ -0,0 +1,28 @@
+/*
+Copyright 2019 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_HeaderButtons {
+    display: flex;
+}
+
+.mx_HeaderButtons::before {
+    content: "";
+    background-color: $header-divider-color;
+    opacity: 0.5;
+    margin: 0 15px;
+    border-radius: 1px;
+    width: 1px;
+}

res/css/structures/_RightPanel.scss

@@ -25,9 +25,7 @@ limitations under the License.
 
 .mx_RightPanel_header {
     order: 1;
-
     border-bottom: 1px solid $primary-hairline-color;
-
     flex: 0 0 52px;
 }
 
@@ -45,20 +43,55 @@ limitations under the License.
     cursor: pointer;
     flex: 0 0 auto;
     vertical-align: top;
-    margin-top: 4px;
-    padding-left: 5px;
-    padding-right: 5px;
+    margin-left: 5px;
+    margin-right: 5px;
     text-align: center;
-    position: relative;
     border-bottom: 2px solid transparent;
+    height: 20px;
+    width: 20px;
+    position: relative;
+}
+
+.mx_RightPanel_headerButton::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 20px;
+    width: 20px;
+    background-color: $rightpanel-button-color;
+    mask-repeat: no-repeat;
+    mask-size: contain;
+}
+
+.mx_RightPanel_membersButton::before {
+    mask-image: url('$(res)/img/feather-icons/user.svg');
+}
+
+.mx_RightPanel_filesButton::before {
+    mask-image: url('$(res)/img/feather-icons/files.svg');
+}
+
+.mx_RightPanel_notifsButton::before {
+    mask-image: url('$(res)/img/feather-icons/notifications.svg');
+}
+
+.mx_RightPanel_groupMembersButton::before {
+    mask-image: url('$(res)/img/icons-people.svg');
 }
 
-.mx_RightPanel_headerButton object {
-    pointer-events: none;
+.mx_RightPanel_roomsButton::before {
+    mask-image: url('$(res)/img/icons-room-nobg.svg');
 }
 
-.mx_RightPanel_headerButton_highlight {
-    border-color: $button-bg-color;
+.mx_RightPanel_headerButton_highlight::after {
+    content: '';
+    position: absolute;
+    bottom: -6px;
+    left: 0;
+    right: 0;
+    height: 2px;
+    background-color: $button-bg-color;
 }
 
 .mx_RightPanel_headerButton_badge {

res/css/structures/_RoomSubList.scss

@@ -152,7 +152,7 @@ limitations under the License.
     &.mx_IndicatorScrollbar_topOverflow::before {
         top: 0;
         transition: background-image 0.1s ease-in;
-        background: linear-gradient(to top, rgba(242,245,248,0), rgba(242,245,248,1));
+        background: linear-gradient(to top, $panel-gradient);
     }
 
 /*

res/css/structures/_TabbedView.scss

@@ -28,8 +28,8 @@ limitations under the License.
 }
 
 .mx_TabbedView_tabLabels {
-    width: 150px;
-    max-width: 150px;
+    width: 170px;
+    max-width: 170px;
     color: $tab-label-fg-color;
     position: fixed;
 }
@@ -39,9 +39,8 @@ limitations under the License.
     cursor: pointer;
     display: block;
     border-radius: 3px;
-    font-size: 12px;
-    font-weight: 600;
-    min-height: 20px; // use min-height instead of height to allow the label to overflow a bit
+    font-size: 14px;
+    min-height: 24px; // use min-height instead of height to allow the label to overflow a bit
     margin-bottom: 6px;
     position: relative;
 }
@@ -55,18 +54,18 @@ limitations under the License.
     margin-left: 6px;
     margin-right: 9px;
     margin-top: 1px;
-    width: 14px;
-    height: 14px;
+    width: 16px;
+    height: 16px;
     display: inline-block;
 }
 
 .mx_TabbedView_maskedIcon:before {
     display: inline-block;
     background-color: $tab-label-icon-bg-color;
     mask-repeat: no-repeat;
-    mask-size: 14px;
+    mask-size: 16px;
     width: 14px;
-    height: 18px;
+    height: 22px;
     mask-position: center;
     content: '';
     vertical-align: middle;
@@ -81,7 +80,7 @@ limitations under the License.
 }
 
 .mx_TabbedView_tabPanel {
-    margin-left: 220px; // 150px sidebar + 70px padding
+    margin-left: 240px; // 170px sidebar + 70px padding
     flex-grow: 1;
     display: flex;
     flex-direction: column;

res/css/structures/_TagPanelButtons.scss

@@ -38,7 +38,7 @@ limitations under the License.
     height: 40px;
     width: 40px;
     border-radius: 20px;
-    background-color: $roomheader-addroom-color;
+    background-color: $tagpanel-button-color;
     position: relative;
     /* overwrite mx_RoleButton inline-block */
     display: block !important;