diff --git a/static/js/popovers.js b/static/js/popovers.js index b7e8cbb0e6..56f381d4e0 100644 --- a/static/js/popovers.js +++ b/static/js/popovers.js @@ -868,7 +868,7 @@ exports.register_click_handlers = function () { e.preventDefault(); }); - $('#user_presences').on('click', '.user-list-arrow', function (e) { + $('#user_presences').on('click', '.user-list-sidebar-menu-icon', function (e) { e.stopPropagation(); // use email of currently selected user, rather than some elem comparison, diff --git a/static/js/stream_popover.js b/static/js/stream_popover.js index eec01504b2..73461b7250 100644 --- a/static/js/stream_popover.js +++ b/static/js/stream_popover.js @@ -263,7 +263,7 @@ function build_starred_messages_popover(e) { } exports.register_click_handlers = function () { - $('#stream_filters').on('click', '.stream-sidebar-arrow', function (e) { + $('#stream_filters').on('click', '.stream-sidebar-menu-icon', function (e) { e.stopPropagation(); const elt = e.target; @@ -276,10 +276,10 @@ exports.register_click_handlers = function () { }); }); - $('#stream_filters').on('click', '.topic-sidebar-arrow', function (e) { + $('#stream_filters').on('click', '.topic-sidebar-menu-icon', function (e) { e.stopPropagation(); - const elt = $(e.target).closest('.topic-sidebar-arrow').expectOne()[0]; + const elt = $(e.target).closest('.topic-sidebar-menu-icon').expectOne()[0]; const stream_li = $(elt).closest('.narrow-filter').expectOne(); const stream_id = elem_to_stream_id(stream_li); const topic_name = $(elt).closest('li').expectOne().attr('data-topic-name'); @@ -291,9 +291,9 @@ exports.register_click_handlers = function () { }); }); - $('#global_filters').on('click', '.all-messages-arrow', build_all_messages_popover); + $('#global_filters').on('click', '.all-messages-sidebar-menu-icon', build_all_messages_popover); - $('#global_filters').on('click', '.starred-messages-sidebar-arrow', build_starred_messages_popover); + $('#global_filters').on('click', '.starred-messages-sidebar-menu-icon', build_starred_messages_popover); exports.register_stream_handlers(); exports.register_topic_handlers(); diff --git a/static/styles/left-sidebar.scss b/static/styles/left-sidebar.scss index 4d03ee4d1c..d42242f183 100644 --- a/static/styles/left-sidebar.scss +++ b/static/styles/left-sidebar.scss @@ -294,10 +294,10 @@ li.top_left_starred_messages { line-height: 1.1; } -.all-messages-arrow i, -.stream-sidebar-arrow i, -.starred-messages-sidebar-arrow i, -.topic-sidebar-arrow i { +.all-messages-sidebar-menu-icon i, +.stream-sidebar-menu-icon i, +.starred-messages-sidebar-menu-icon i, +.topic-sidebar-menu-icon i { padding-right: 0.25em; display: inline-block; width: 13px; @@ -307,10 +307,10 @@ li.top_left_starred_messages { All of our left sidebar handlers use absolute positioning. We should fix that. */ -.all-messages-arrow, -.stream-sidebar-arrow, -.starred-messages-sidebar-arrow, -.topic-sidebar-arrow { +.all-messages-sidebar-menu-icon, +.stream-sidebar-menu-icon, +.starred-messages-sidebar-menu-icon, +.topic-sidebar-menu-icon { position: absolute; display: none; } @@ -319,9 +319,9 @@ li.top_left_starred_messages { The All Messages and Stream chevrons are pretty similar. */ -.all-messages-arrow, -.starred-messages-sidebar-arrow, -.stream-sidebar-arrow { +.all-messages-sidebar-menu-icon, +.starred-messages-sidebar-menu-icon, +.stream-sidebar-menu-icon { top: 3px; right: 10px; font-size: 0.8em; @@ -332,7 +332,7 @@ li.top_left_starred_messages { font to show they're "lower" in the hierarchy, which also affects it positioning. */ -.topic-sidebar-arrow { +.topic-sidebar-menu-icon { top: 1px; right: 10px; font-size: 0.7em; @@ -342,10 +342,10 @@ li.top_left_starred_messages { When you hover over list items, we hover the relevant chevrons in light gray. */ -li.top_left_all_messages:hover .all-messages-arrow, -li.top_left_starred_messages:hover .starred-messages-sidebar-arrow, -#stream_filters li:hover .stream-sidebar-arrow, -li.topic-list-item:hover .topic-sidebar-arrow { +li.top_left_all_messages:hover .all-messages-sidebar-menu-icon, +li.top_left_starred_messages:hover .starred-messages-sidebar-menu-icon, +#stream_filters li:hover .stream-sidebar-menu-icon, +li.topic-list-item:hover .topic-sidebar-menu-icon { display: inline; cursor: pointer; color: hsl(0, 0%, 53%); @@ -355,10 +355,10 @@ li.topic-list-item:hover .topic-sidebar-arrow { If you hover directly over the chevron itself, show it in black. */ -.starred-messages-sidebar-arrow:hover, -.all-messages-arrow:hover, -.stream-sidebar-arrow:hover, -.topic-sidebar-arrow:hover { +.starred-messages-sidebar-menu-icon:hover, +.all-messages-sidebar-menu-icon:hover, +.stream-sidebar-menu-icon:hover, +.topic-sidebar-menu-icon:hover { color: hsl(0, 0%, 0%) !important; } diff --git a/static/styles/night_mode.scss b/static/styles/night_mode.scss index 191a4ecfa9..3dfaf96fb3 100644 --- a/static/styles/night_mode.scss +++ b/static/styles/night_mode.scss @@ -308,11 +308,11 @@ on a dark background, and don't change the dark labels dark either. */ #searchbox .search_icon, #searchbox .search_button, .close, - #user_presences li:hover .user-list-arrow, - li.top_left_all_messages:hover .all-messages-arrow, - li.top_left_starred_messages:hover .starred-messages-sidebar-arrow, - #stream_filters li:hover .stream-sidebar-arrow, - li.topic-list-item:hover .topic-sidebar-arrow { + #user_presences li:hover .user-list-sidebar-menu-icon, + li.top_left_all_messages:hover .all-messages-sidebar-menu-icon, + li.top_left_starred_messages:hover .starred-messages-sidebar-menu-icon, + #stream_filters li:hover .stream-sidebar-menu-icon, + li.topic-list-item:hover .topic-sidebar-menu-icon { color: hsl(236, 33%, 80%); } @@ -326,11 +326,11 @@ on a dark background, and don't change the dark labels dark either. */ color: hsl(0, 0%, 100%); } - #user_presences li .user-list-arrow:hover, - .all-messages-arrow:hover, - .starred-messages-sidebar-arrow:hover, - .stream-sidebar-arrow:hover, - .topic-sidebar-arrow:hover { + #user_presences li .user-list-sidebar-menu-icon:hover, + .all-messages-sidebar-menu-icon:hover, + .starred-messages-sidebar-menu-icon:hover, + .stream-sidebar-menu-icon:hover, + .topic-sidebar-menu-icon:hover { color: hsl(0, 0%, 100%) !important; } diff --git a/static/styles/right-sidebar.scss b/static/styles/right-sidebar.scss index 1e7bb93c42..6c704f3deb 100644 --- a/static/styles/right-sidebar.scss +++ b/static/styles/right-sidebar.scss @@ -33,7 +33,7 @@ white-space: nowrap; text-overflow: ellipsis; - .user-list-arrow { + .user-list-sidebar-menu-icon { position: absolute; top: 0px; right: 10px; @@ -54,7 +54,7 @@ } &:hover { - .user-list-arrow { + .user-list-sidebar-menu-icon { display: inline; cursor: pointer; color: hsl(0, 0%, 53%); diff --git a/static/templates/stream_sidebar_row.hbs b/static/templates/stream_sidebar_row.hbs index e35fd0a5aa..2a71a85292 100644 --- a/static/templates/stream_sidebar_row.hbs +++ b/static/templates/stream_sidebar_row.hbs @@ -12,6 +12,6 @@