From 4381bdfdbf1f5571f807dcce07713d4e76f8ec4b Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 14 Aug 2020 18:53:56 +0100 Subject: [PATCH] fix typo --- res/css/structures/_LeftPanel.scss | 14 +++++++------- res/css/structures/_RoomSearch.scss | 12 ++++++------ res/img/element-icons/roomlist/search-clear.svg | 3 +++ res/img/element-icons/roomlist/search.svg | 3 +++ res/img/feather-customised/compass.svg | 1 - res/themes/legacy-dark/css/_legacy-dark.scss | 1 + res/themes/legacy-light/css/_legacy-light.scss | 1 + res/themes/light/css/_light.scss | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 res/img/element-icons/roomlist/search-clear.svg create mode 100644 res/img/element-icons/roomlist/search.svg delete mode 100644 res/img/feather-customised/compass.svg diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss index 354dc87b8f..3c3c5f4444 100644 --- a/res/css/structures/_LeftPanel.scss +++ b/res/css/structures/_LeftPanel.scss @@ -111,9 +111,9 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations } .mx_LeftPanel_exploreButton { - width: 28px; - height: 28px; - border-radius: 20px; + width: 32px; + height: 32px; + border-radius: 8px; background-color: $roomlist-button-bg-color; position: relative; margin-left: 8px; @@ -121,15 +121,15 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations &::before { content: ''; position: absolute; - top: 6px; - left: 6px; + top: 8px; + left: 8px; width: 16px; height: 16px; - mask-image: url('$(res)/img/feather-customised/compass.svg'); + mask-image: url('$(res)/img/element-icons/roomlist/explore.svg'); mask-position: center; mask-size: contain; mask-repeat: no-repeat; - background: $primary-fg-color; + background: $secondary-fg-color; } } } diff --git a/res/css/structures/_RoomSearch.scss b/res/css/structures/_RoomSearch.scss index 39a3dee30b..031ac37f9c 100644 --- a/res/css/structures/_RoomSearch.scss +++ b/res/css/structures/_RoomSearch.scss @@ -17,7 +17,7 @@ limitations under the License. // Note: this component expects to be contained within a flexbox .mx_RoomSearch { flex: 1; - border-radius: 20px; + border-radius: 8px; background-color: $roomlist-button-bg-color; height: 28px; padding: 2px; @@ -29,9 +29,9 @@ limitations under the License. .mx_RoomSearch_icon { width: 16px; height: 16px; - mask: url('$(res)/img/feather-customised/search-input.svg'); + mask: url('$(res)/img/element-icons/roomlist/search.svg'); mask-repeat: no-repeat; - background: $primary-fg-color; + background-color: $secondary-fg-color; margin-left: 7px; } @@ -46,7 +46,7 @@ limitations under the License. line-height: $font-16px; &:not(.mx_RoomSearch_inputExpanded)::placeholder { - color: $primary-fg-color !important; // !important to override default app-wide styles + color: $tertiary-fg-color !important; // !important to override default app-wide styles } } @@ -54,11 +54,11 @@ limitations under the License. .mx_RoomSearch_clearButton { width: 16px; height: 16px; - mask-image: url('$(res)/img/feather-customised/x.svg'); + mask-image: url('$(res)/img/element-icons/roomlist/search-clear.svg'); mask-position: center; mask-size: contain; mask-repeat: no-repeat; - background: $primary-fg-color; + background-color: $secondary-fg-color; margin-right: 8px; } } diff --git a/res/img/element-icons/roomlist/search-clear.svg b/res/img/element-icons/roomlist/search-clear.svg new file mode 100644 index 0000000000..29fc097600 --- /dev/null +++ b/res/img/element-icons/roomlist/search-clear.svg @@ -0,0 +1,3 @@ + + + diff --git a/res/img/element-icons/roomlist/search.svg b/res/img/element-icons/roomlist/search.svg new file mode 100644 index 0000000000..b706092a5c --- /dev/null +++ b/res/img/element-icons/roomlist/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/res/img/feather-customised/compass.svg b/res/img/feather-customised/compass.svg deleted file mode 100644 index 3296260803..0000000000 --- a/res/img/feather-customised/compass.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss index 287723ec9c..fe1103a529 100644 --- a/res/themes/legacy-dark/css/_legacy-dark.scss +++ b/res/themes/legacy-dark/css/_legacy-dark.scss @@ -16,6 +16,7 @@ $room-highlight-color: #343a46; // typical text (dark-on-white in light skin) $primary-fg-color: $text-primary-color; $secondary-fg-color: $primary-fg-color; +$tertiary-fg-color: $primary-fg-color; $primary-bg-color: $bg-color; $muted-fg-color: $header-panel-text-primary-color; diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss index e5ae7f866e..0aa9bd0394 100644 --- a/res/themes/legacy-light/css/_legacy-light.scss +++ b/res/themes/legacy-light/css/_legacy-light.scss @@ -24,6 +24,7 @@ $header-panel-bg-color: #f3f8fd; // typical text (dark-on-white in light skin) $primary-fg-color: #2e2f32; $secondary-fg-color: $primary-fg-color; +$tertiary-fg-color: $primary-fg-color; $primary-bg-color: #ffffff; $muted-fg-color: #61708b; // Commonly used in headings and relevant alt text diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss index e9ade7eb97..5a86a29248 100644 --- a/res/themes/light/css/_light.scss +++ b/res/themes/light/css/_light.scss @@ -171,7 +171,7 @@ $header-divider-color: #91A1C0; $theme-button-bg-color: #e3e8f0; -$roomlist-button-bg-color: #fff; // Buttons include the filter box, explore button, and sublist buttons +$roomlist-button-bg-color: rgba(141, 151, 165, 0.2); // Buttons include the filter box, explore button, and sublist buttons $roomlist-bg-color: rgba(245, 245, 245, 0.90); $roomlist-header-color: $tertiary-fg-color; $roomsublist-divider-color: $primary-fg-color;