From 5a1498dec3ee192a49b43b9b08c4191bbdda25dd Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 3 Nov 2017 20:01:54 -0600 Subject: [PATCH 1/2] CSS for pinned indicators Signed-off-by: Travis Ralston --- .../css/matrix-react-sdk/views/rooms/_RoomHeader.scss | 8 ++++++-- src/skins/vector/css/themes/_base.scss | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss index 85ad08ec..6916298b 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss @@ -237,12 +237,16 @@ limitations under the License. position: relative; } -.mx_RoomHeader_unreadPinsIndicator { +.mx_RoomHeader_pinsIndicator { position: absolute; right: 0; bottom: 4px; width: 8px; height: 8px; border-radius: 8px; - background-color: $warning-color; + background-color: $pinned-color; +} + +.mx_RoomHeader_pinsIndicatorUnread { + background-color: $pinned-unread-color; } diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index 1a0fa5b4..d5db1367 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -22,6 +22,10 @@ $warning-color: #ff0064; $mention-user-pill-bg-color: #ff0064; $other-user-pill-bg-color: rgba(0, 0, 0, 0.1); +// pinned events indicator +$pinned-unread-color: #ff0064; // $warning-color +$pinned-color: #888; + // groups $group-my-groups-placeholder-bg: #f7f7f7; $group-my-groups-placeholder-fg: #888; From beddf3a2cbbbfc9b7d178d5037041e778940892a Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 7 Nov 2017 11:05:29 -0700 Subject: [PATCH 2/2] Get rid of accidental merge stuff Signed-off-by: Travis Ralston --- src/skins/vector/css/themes/_base.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss index fcc3c7b9..3a7eac56 100644 --- a/src/skins/vector/css/themes/_base.scss +++ b/src/skins/vector/css/themes/_base.scss @@ -26,10 +26,6 @@ $other-user-pill-bg-color: rgba(0, 0, 0, 0.1); $pinned-unread-color: #ff0064; // $warning-color $pinned-color: #888; -// groups -$group-my-groups-placeholder-bg: #f7f7f7; -$group-my-groups-placeholder-fg: #888; - // informational plinth $info-plinth-bg-color: #f7f7f7; $info-plinth-fg-color: #888;