Iterate PR

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

res/css/views/context_menus/_WidgetContextMenu.scss

@@ -1,36 +0,0 @@
-/*
-Copyright 2019 The Matrix.org Foundaction C.I.C.
-
-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_WidgetContextMenu {
-    padding: 6px;
-
-    .mx_WidgetContextMenu_option {
-        padding: 3px 6px 3px 6px;
-        cursor: pointer;
-        white-space: nowrap;
-    }
-
-    .mx_WidgetContextMenu_separator {
-        margin-top: 0;
-        margin-bottom: 0;
-        border-bottom-style: none;
-        border-left-style: none;
-        border-right-style: none;
-        border-top-style: solid;
-        border-top-width: 1px;
-        border-color: $menu-border-color;
-    }
-}

res/css/views/right_panel/_BaseCard.scss

@@ -130,7 +130,7 @@ limitations under the License.
             }
 
             &.mx_AccessibleButton_disabled {
-                padding: 10px 12px;
+                padding-right: 12px;
                 &::after {
                     content: unset;
                 }

res/css/views/right_panel/_RoomSummaryCard.scss

@@ -157,9 +157,7 @@ limitations under the License.
         }
 
         .mx_RoomSummaryCard_Button {
-            padding-left: 12px;
-            padding-top: 6px;
-            padding-bottom: 6px;
+            padding: 6px 24px 6px 12px;
             color: $tertiary-fg-color;
             flex: 1;
 

res/css/views/right_panel/_WidgetCard.scss

@@ -24,34 +24,35 @@ limitations under the License.
         border: 0;
     }
 
-    &.mx_WidgetCard_noEdit {
-        .mx_AccessibleButton_kind_secondary {
-            margin: 0 12px;
+    .mx_BaseCard_header {
+        display: inline-flex;
 
-            &:first-child {
-                // expand the Pin to room primary action
-                flex-grow: 1;
-            }
+        & > h2 {
+            margin-right: 0;
+            flex-grow: 1;
         }
-    }
 
-    .mx_WidgetCard_optionsButton {
-        position: relative;
-        height: 18px;
-        width: 26px;
-
-        &::before {
-            content: "";
-            position: absolute;
-            width: 20px;
+        .mx_WidgetCard_optionsButton {
+            position: relative;
+            margin-right: 44px;
             height: 20px;
-            top: 6px;
-            left: 20px;
-            mask-repeat: no-repeat;
-            mask-position: center;
-            mask-size: contain;
-            mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
-            background-color: $secondary-fg-color;
+            width: 20px;
+            min-width: 20px; // prevent crushing by the flexbox
+            padding: 0;
+
+            &::before {
+                content: "";
+                position: absolute;
+                width: 20px;
+                height: 20px;
+                top: 0;
+                left: 4px;
+                mask-repeat: no-repeat;
+                mask-position: center;
+                mask-size: contain;
+                mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
+                background-color: $secondary-fg-color;
+            }
         }
     }
 }

res/css/views/rooms/_AppsDrawer.scss

@@ -118,12 +118,6 @@ $MiniAppTileHeight: 200px;
     height: $MiniAppTileHeight;
 }
 
-.mx_AppTile.mx_AppTile_minimised,
-.mx_AppTileFullWidth.mx_AppTile_minimised,
-.mx_AppTile_mini.mx_AppTile_minimised {
-    height: 14px;
-}
-
 .mx_AppTile .mx_AppTile_persistedWrapper,
 .mx_AppTileFullWidth .mx_AppTile_persistedWrapper,
 .mx_AppTile_mini .mx_AppTile_persistedWrapper {
@@ -143,11 +137,7 @@ $MiniAppTileHeight: 200px;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
-    cursor: pointer;
     width: 100%;
-}
-
-.mx_AppTileMenuBar_expanded {
     padding-bottom: 5px;
 }
 
@@ -179,31 +169,12 @@ $MiniAppTileHeight: 200px;
     margin: 0 3px;
 }
 
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_minimise {
-    mask-image: url('$(res)/img/feather-customised/widget/minimise.svg');
-    background-color: $accent-color;
-}
-
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_maximise {
-    mask-image: url('$(res)/img/feather-customised/widget/maximise.svg');
-    background-color: $accent-color;
-}
-
-.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout {
+.mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout { // TODO replace icon
     mask-image: url('$(res)/img/feather-customised/widget/external-link.svg');
 }
 
 .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_menu {
-    mask-image: url('$(res)/img/icon_context.svg');
-}
-
-.mx_AppTileMenuBarWidgetDelete {
-    filter: none;
-}
-
-.mx_AppTileMenuBarWidget:hover {
-    border: 1px solid $primary-fg-color;
-    border-radius: 2px;
+    mask-image: url('$(res)/img/element-icons/room/ellipsis.svg');
 }
 
 .mx_AppTileBody {

res/css/views/rooms/_RoomHeader.scss

@@ -241,6 +241,13 @@ limitations under the License.
     width: 26px;
 }
 
+.mx_RoomHeader_appsButton::before {
+    mask-image: url('$(res)/img/element-icons/room/apps.svg');
+}
+.mx_RoomHeader_appsButton_highlight::before {
+    background-color: $accent-color;
+}
+
 .mx_RoomHeader_searchButton::before {
     mask-image: url('$(res)/img/element-icons/room/search-inset.svg');
 }