From f8fa19ed47a4b8150267c9c89b7dfde778231300 Mon Sep 17 00:00:00 2001 From: wmwragg Date: Wed, 10 Aug 2016 15:04:02 +0100 Subject: [PATCH] Room tag menu dohickey on the avatar on hover --- .../matrix-react-sdk/views/rooms/RoomTile.css | 36 +++++++++++++++++++ .../context_menus/RoomTagContextMenu.css | 2 -- src/skins/vector/img/icon_context_delete.svg | 14 ++------ src/skins/vector/img/icons_ellipsis.svg | 11 ++++++ 4 files changed, 50 insertions(+), 13 deletions(-) create mode 100644 src/skins/vector/img/icons_ellipsis.svg diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css index b86f39a2de..eb55f63f06 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css @@ -39,6 +39,42 @@ limitations under the License. vertical-align: middle; } +.mx_RoomTile_avatar_container:hover:before, +.mx_RoomTile_avatar_container.mx_RoomTile_avatar_roomTagMenu:before { + display: block; + position: absolute; + content: ""; + border-radius: 40px; + background-image: url("img/icons_ellipsis.svg"); + background-size: 25px; + left: 17px; + width: 24px; + height: 24px; + z-index: 4; +} + +.mx_RoomTile_avatar_container:hover:after, +.mx_RoomTile_avatar_container.mx_RoomTile_avatar_roomTagMenu:after { + display: block; + position: absolute; + content: ""; + border-radius: 40px; + background: #4A4A4A; + top: 5px; + width: 24px; + height: 24px; + opacity: 0.6; + z-index: 2; +} + +.collapsed .mx_RoomTile_avatar_container:hover:before { + display: none; +} + +.collapsed .mx_RoomTile_avatar_container:hover:after { + display: none; +} + .mx_RoomTile_name { display: inline-block; position: relative; diff --git a/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css b/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css index 556d404acb..b9684b0700 100644 --- a/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css +++ b/src/skins/vector/css/vector-web/views/context_menus/RoomTagContextMenu.css @@ -33,8 +33,6 @@ limitations under the License. color: #ff0064; } - - .mx_RoomTagContextMenu_field.mx_RoomTagContextMenu_fieldSet { font-weight: bold; } diff --git a/src/skins/vector/img/icon_context_delete.svg b/src/skins/vector/img/icon_context_delete.svg index 7e8eb51e75..896b94ad13 100644 --- a/src/skins/vector/img/icon_context_delete.svg +++ b/src/skins/vector/img/icon_context_delete.svg @@ -1,18 +1,10 @@ - + - - - - - - - - - - + + diff --git a/src/skins/vector/img/icons_ellipsis.svg b/src/skins/vector/img/icons_ellipsis.svg new file mode 100644 index 0000000000..43a5496e43 --- /dev/null +++ b/src/skins/vector/img/icons_ellipsis.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +