From 3c1db0fec8ee4827a1fb49bf699e053f0c128a0e Mon Sep 17 00:00:00 2001 From: JC Brand Date: Mon, 2 Jul 2018 21:13:15 +0200 Subject: [PATCH] Fixes #1069 Only show bookmark icons on hover --- css/converse.css | 38 +++++++++++++++++++++++++++----------- sass/_bookmarks.scss | 11 ++++++++++- sass/_roomslist.scss | 25 +++++-------------------- 3 files changed, 42 insertions(+), 32 deletions(-) diff --git a/css/converse.css b/css/converse.css index 4f1064db7..0fae6c9b0 100644 --- a/css/converse.css +++ b/css/converse.css @@ -8275,12 +8275,15 @@ body.reset { #conversejs .list-container .items-list .open-headline:hover, #conversejs .list-container .items-list .open-chatroom:hover { background-color: #eff4f7; } - #conversejs .list-container .items-list .available-chatroom:hover a.add-bookmark, - #conversejs .list-container .items-list .available-chatroom:hover a.room-info, - #conversejs .list-container .items-list .open-headline:hover a.add-bookmark, - #conversejs .list-container .items-list .open-headline:hover a.room-info, - #conversejs .list-container .items-list .open-chatroom:hover a.add-bookmark, - #conversejs .list-container .items-list .open-chatroom:hover a.room-info { + #conversejs .list-container .items-list .available-chatroom:hover .remove-bookmark, + #conversejs .list-container .items-list .available-chatroom:hover .add-bookmark, + #conversejs .list-container .items-list .available-chatroom:hover .room-info, + #conversejs .list-container .items-list .open-headline:hover .remove-bookmark, + #conversejs .list-container .items-list .open-headline:hover .add-bookmark, + #conversejs .list-container .items-list .open-headline:hover .room-info, + #conversejs .list-container .items-list .open-chatroom:hover .remove-bookmark, + #conversejs .list-container .items-list .open-chatroom:hover .add-bookmark, + #conversejs .list-container .items-list .open-chatroom:hover .room-info { display: block !important; } #conversejs .list-container .items-list .available-chatroom.unread-msgs .msgs-indicator, #conversejs .list-container .items-list .open-headline.unread-msgs .msgs-indicator, @@ -8299,15 +8302,19 @@ body.reset { #conversejs .list-container .items-list .open-headline a:hover, #conversejs .list-container .items-list .open-chatroom a:hover { color: #206485; } - #conversejs .list-container .items-list .available-chatroom a.add-bookmark, #conversejs .list-container .items-list .available-chatroom a.room-info, + #conversejs .list-container .items-list .available-chatroom a.remove-bookmark, #conversejs .list-container .items-list .available-chatroom a.add-bookmark, #conversejs .list-container .items-list .available-chatroom a.room-info, + #conversejs .list-container .items-list .open-headline a.remove-bookmark, #conversejs .list-container .items-list .open-headline a.add-bookmark, #conversejs .list-container .items-list .open-headline a.room-info, + #conversejs .list-container .items-list .open-chatroom a.remove-bookmark, #conversejs .list-container .items-list .open-chatroom a.add-bookmark, #conversejs .list-container .items-list .open-chatroom a.room-info { display: none; } - #conversejs .list-container .items-list .available-chatroom a.add-bookmark:before, #conversejs .list-container .items-list .available-chatroom a.room-info:before, + #conversejs .list-container .items-list .available-chatroom a.remove-bookmark:before, #conversejs .list-container .items-list .available-chatroom a.add-bookmark:before, #conversejs .list-container .items-list .available-chatroom a.room-info:before, + #conversejs .list-container .items-list .open-headline a.remove-bookmark:before, #conversejs .list-container .items-list .open-headline a.add-bookmark:before, #conversejs .list-container .items-list .open-headline a.room-info:before, + #conversejs .list-container .items-list .open-chatroom a.remove-bookmark:before, #conversejs .list-container .items-list .open-chatroom a.add-bookmark:before, #conversejs .list-container .items-list .open-chatroom a.room-info:before { font-size: 15px; } @@ -8326,29 +8333,35 @@ body.reset { width: 85%; } #conversejs .list-container .items-list .available-chatroom .add-bookmark, #conversejs .list-container .items-list .available-chatroom .remove-bookmark, + #conversejs .list-container .items-list .available-chatroom .remove-bookmark, #conversejs .list-container .items-list .open-headline .add-bookmark, #conversejs .list-container .items-list .open-headline .remove-bookmark, + #conversejs .list-container .items-list .open-headline .remove-bookmark, #conversejs .list-container .items-list .open-chatroom .add-bookmark, + #conversejs .list-container .items-list .open-chatroom .remove-bookmark, #conversejs .list-container .items-list .open-chatroom .remove-bookmark { color: #A8ABA1; } #conversejs .list-container .items-list .available-chatroom .add-bookmark.button-on, #conversejs .list-container .items-list .available-chatroom .remove-bookmark.button-on, + #conversejs .list-container .items-list .available-chatroom .remove-bookmark.button-on, #conversejs .list-container .items-list .open-headline .add-bookmark.button-on, #conversejs .list-container .items-list .open-headline .remove-bookmark.button-on, + #conversejs .list-container .items-list .open-headline .remove-bookmark.button-on, #conversejs .list-container .items-list .open-chatroom .add-bookmark.button-on, + #conversejs .list-container .items-list .open-chatroom .remove-bookmark.button-on, #conversejs .list-container .items-list .open-chatroom .remove-bookmark.button-on { color: #578EA9; } #conversejs .list-container .items-list .available-chatroom .add-bookmark.button-on:hover, #conversejs .list-container .items-list .available-chatroom .remove-bookmark.button-on:hover, + #conversejs .list-container .items-list .available-chatroom .remove-bookmark.button-on:hover, #conversejs .list-container .items-list .open-headline .add-bookmark.button-on:hover, #conversejs .list-container .items-list .open-headline .remove-bookmark.button-on:hover, + #conversejs .list-container .items-list .open-headline .remove-bookmark.button-on:hover, #conversejs .list-container .items-list .open-chatroom .add-bookmark.button-on:hover, + #conversejs .list-container .items-list .open-chatroom .remove-bookmark.button-on:hover, #conversejs .list-container .items-list .open-chatroom .remove-bookmark.button-on:hover { color: #206485; } -#conversejs.fullscreen #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom a.open-room { - width: 80%; } - #conversejs #converse-roster { text-align: left; width: 100%; @@ -9032,6 +9045,9 @@ body.reset { #conversejs.converse-overlayed #minimized-chats .chat-head-message-count-hidden { display: none; } +#conversejs.fullscreen #controlbox #chatrooms .bookmarks-list dl.rooms-list.bookmarks dd.available-chatroom a.open-room { + width: 80%; } + #conversejs [hidden] { display: none; } #conversejs .visually-hidden { diff --git a/sass/_bookmarks.scss b/sass/_bookmarks.scss index 302ce4a0b..f79747702 100644 --- a/sass/_bookmarks.scss +++ b/sass/_bookmarks.scss @@ -1,7 +1,16 @@ -#conversejs { +#conversejs.fullscreen { #controlbox { #chatrooms { .bookmarks-list { + dl.rooms-list.bookmarks { + dd.available-chatroom { + a { + &.open-room { + width: 80%; + } + } + } + } } } } diff --git a/sass/_roomslist.scss b/sass/_roomslist.scss index 8bdb7a442..8b717d7b5 100644 --- a/sass/_roomslist.scss +++ b/sass/_roomslist.scss @@ -32,8 +32,9 @@ .open-chatroom { &:hover { background-color: lighten($controlbox-head-color, 45%); - a.add-bookmark, - a.room-info { + .remove-bookmark, + .add-bookmark, + .room-info { display: block !important; } } @@ -52,6 +53,7 @@ &:hover { color: $dark-link-color; } + &.remove-bookmark, &.add-bookmark, &.room-info { display: none; @@ -72,6 +74,7 @@ } } .add-bookmark, + .remove-bookmark, .remove-bookmark { &.button-on { color: $link-color; @@ -85,21 +88,3 @@ } } } - -#conversejs.fullscreen { - #controlbox { - #chatrooms { - .bookmarks-list { - dl.rooms-list.bookmarks { - dd.available-chatroom { - a { - &.open-room { - width: 80%; - } - } - } - } - } - } - } -}