diff --git a/res/css/_components.scss b/res/css/_components.scss index a2d0e1ceb5..7e56942764 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -1,6 +1,7 @@ // autogenerated by rethemendex.sh @import "./_common.scss"; @import "./_font-sizes.scss"; +@import "./_font-weights.scss"; @import "./structures/_AutoHideScrollbar.scss"; @import "./structures/_CompatibilityPage.scss"; @import "./structures/_ContextualMenu.scss"; diff --git a/res/css/_font-weights.scss b/res/css/_font-weights.scss new file mode 100644 index 0000000000..3e2b19d516 --- /dev/null +++ b/res/css/_font-weights.scss @@ -0,0 +1,17 @@ +/* +Copyright 2020 The Matrix.org Foundation 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. +*/ + +$font-semi-bold: 600; diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss index 69fff53444..5112d07c46 100644 --- a/res/css/structures/_LeftPanel.scss +++ b/res/css/structures/_LeftPanel.scss @@ -138,9 +138,9 @@ $tagPanelWidth: 56px; // only applies in this file, used for calculations .mx_LeftPanel_roomListFilterCount { font-size: $font-13px; - font-weight: 500; + font-weight: $font-semi-bold; margin-left: 12px; - margin-top: 16px; + margin-top: 14px; margin-bottom: -4px; // to counteract the normal roomListWrapper margin-top } diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index 9a6c47ad31..78e7307bc0 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -32,15 +32,14 @@ limitations under the License. font-size: $font-13px; div:first-child { - font-weight: 500; + font-weight: $font-semi-bold; margin-bottom: 8px; } .mx_AccessibleButton { color: $secondary-fg-color; position: relative; - margin-left: 24px; - padding: 0; + padding: 0 0 0 24px; font-size: inherit; &::before { @@ -49,7 +48,7 @@ limitations under the License. height: 16px; position: absolute; top: 0; - left: -24px; + left: 0; background: $secondary-fg-color; mask-position: center; mask-size: contain;