Merge pull request #2239 from matrix-org/bwindels/topleftmenu1

Redesign: 1st go at top left menu & restyling context menus

res/css/_components.scss

@@ -18,7 +18,7 @@
 @import "./structures/_RoomView.scss";
 @import "./structures/_SearchBox.scss";
 @import "./structures/_TagPanel.scss";
-@import "./structures/_TopLeftMenu.scss";
+@import "./structures/_TopLeftMenuButton.scss";
 @import "./structures/_UploadBar.scss";
 @import "./structures/_UserSettings.scss";
 @import "./structures/_ViewSource.scss";
@@ -27,6 +27,7 @@
 @import "./views/context_menus/_MessageContextMenu.scss";
 @import "./views/context_menus/_RoomTileContextMenu.scss";
 @import "./views/context_menus/_TagTileContextMenu.scss";
+@import "./views/context_menus/_TopLeftMenu.scss";
 @import "./views/dialogs/_BugReportDialog.scss";
 @import "./views/dialogs/_ChangelogDialog.scss";
 @import "./views/dialogs/_ChatCreateOrReuseChatDialog.scss";

res/css/structures/_ContextualMenu.scss

@@ -30,12 +30,11 @@ limitations under the License.
 }
 
 .mx_ContextualMenu {
-    border: solid 1px $menu-border-color;
-    border-radius: 4px;
+    border-radius: 2px;
+    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
     background-color: $menu-bg-color;
     color: $primary-fg-color;
     position: absolute;
-    padding: 6px;
 	font-size: 14px;
     z-index: 5001;
 }
@@ -44,6 +43,10 @@ limitations under the License.
     right: 8px;
 }
 
+.mx_ContextualMenu_noChevron {
+    border-radius: unset !important;
+}
+
 .mx_ContextualMenu_chevron_right {
     position: absolute;
     right: -8px;
@@ -51,7 +54,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-left: 8px solid $menu-border-color;
+    border-left: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -78,7 +81,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -105,7 +108,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-left: 8px solid transparent;
-    border-bottom: 8px solid $menu-border-color;
+    border-bottom: 8px solid $menu-bg-color;
     border-right: 8px solid transparent;
 }
 
@@ -132,7 +135,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-left: 8px solid transparent;
-    border-top: 8px solid $menu-border-color;
+    border-top: 8px solid $menu-bg-color;
     border-right: 8px solid transparent;
 }
 

res/css/structures/_TopLeftMenuButton.scss

@@ -14,28 +14,31 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_TopLeftMenu {
+.mx_TopLeftMenuButton {
     height: 52px;
     border-bottom: 1px solid $panel-divider-color;
     color: $topleftmenu-color;
     background-color: $primary-bg-color;
     display: flex;
+    align-items: center;
+    min-width: 0;
+    padding: 0 7px;
+    overflow: hidden;
 }
 
-.mx_TopLeftMenu_avatar {
-    position: relative; // to get avatar in the right place
-    margin-left: 15px;
-    margin-right: 15px;
-    margin-top: 14px;
+.mx_TopLeftMenuButton .mx_BaseAvatar {
+    margin: 0 7px;
 }
 
-.mx_TopLeftMenu_name {
-    margin-top: 15px;
-    margin-right: 9px;   
+.mx_TopLeftMenuButton_name {
+    margin: 0 7px;
     font-size: 18px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
     font-weight: 600;
 }
 
-.mx_TopLeftMenu_chevron {
-    margin-top: 24px;
+.mx_TopLeftMenuButton_chevron {
+    margin: 0 7px;
 }

res/css/views/context_menus/_MessageContextMenu.scss

@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_MessageContextMenu {
+    padding: 6px;
+}
+
 .mx_MessageContextMenu_field {
     padding: 3px 6px 3px 6px;
     cursor: pointer;

res/css/views/context_menus/_RoomTileContextMenu.scss

@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_RoomTileContextMenu {
+    padding: 6px;
+}
+
 .mx_RoomTileContextMenu_tag_field, .mx_RoomTileContextMenu_leave {
     padding-top: 8px;
     padding-right: 20px;

res/css/views/context_menus/_TopLeftMenu.scss

@@ -0,0 +1,39 @@
+/*
+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_TopLeftMenu {
+    min-width: 180px;
+
+    .mx_TopLeftMenu_section:not(:last-child) {
+        border-bottom: 1px solid $menu-border-color;
+    }
+
+    .mx_TopLeftMenu_section {
+        list-style: none;
+        margin: 5px 0;
+        padding: 0;
+
+        li {
+            white-space: nowrap;
+            padding: 5px 20px;
+        }
+
+        li:hover {
+            background-color: $menu-selected-color;
+        }
+    }
+
+}

res/css/views/rooms/_RoomTooltip.scss

@@ -21,7 +21,7 @@ limitations under the License.
     width: 0;
     height: 0;
     border-top: 8px solid transparent;
-    border-right: 8px solid $menu-border-color;
+    border-right: 8px solid $menu-bg-color;
     border-bottom: 8px solid transparent;
 }
 
@@ -40,8 +40,8 @@ limitations under the License.
 .mx_RoomTooltip {
     display: none;
     position: fixed;
-    border: 1px solid $menu-border-color;
     border-radius: 5px;
+    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.21);
     background-color: $primary-bg-color;
     z-index: 2000;
     padding: 5px;