diff --git a/app/assets/stylesheets/navbar_left.scss b/app/assets/stylesheets/navbar_left.scss index 282136518642cc0c9be54503321fd7f83a27f3b8..5a94e358ea531d4ee4d7ba81dc96b3c4fac3f733 100644 --- a/app/assets/stylesheets/navbar_left.scss +++ b/app/assets/stylesheets/navbar_left.scss @@ -34,43 +34,43 @@ .selected, .selected a { color: $black; } .hoverable { - display: block; - &.selected a, &.selected a:hover, - .followed-tags-sidebar a.hoverable.selected { - color: white; - background: #666; - } - } - - a.hoverable, li.hoverable { - padding: 10px 20px; + border-bottom: 1px solid $border-grey; + color: $link-grey; display: block; font-weight: normal; - color: $link-grey; - border-bottom: 1px solid #ddd; - &:hover, &:hover a, - &:hover .entypo-check{ + padding: 10px 20px; + + &:hover, &:hover a, &:hover [class^="entypo"] { background-color: $blue; color: $white; } - &:not(:hover) [class^="entypo"] { visibility: hidden; } - .entypo-check.selected { visibility: visible; } + } + + .all_aspects a.hoverable.selected, + .followed-tags-sidebar a.hoverable.selected, + li.selected > a.hoverable { + color: $white; + background: $gray; } #aspects_list, #tags_list { background: $left-navbar-drawer-background; li { padding: 0; } + .entypo-check { visibility: hidden; } + .entypo-check.selected { visibility: visible; } .selectable { display: block; overflow: hidden; text-overflow: ellipsis; padding: 10px 20px 10px 40px; } - .action.modify_aspect, .action.delete-tag-following { + .hoverable > .action { position: relative; bottom: 30px; right: 20px; + visibility: hidden; } + .hoverable:hover > .action { visibility: visible; } } #home_user_badge { diff --git a/app/assets/templates/aspect_tpl.jst.hbs b/app/assets/templates/aspect_tpl.jst.hbs index 38c23ec228b5ef5cdac30f7579018d41d2ff049b..f441ad540068f7ad158d2aeeaaed3e8b3bafd4b2 100644 --- a/app/assets/templates/aspect_tpl.jst.hbs +++ b/app/assets/templates/aspect_tpl.jst.hbs @@ -1,10 +1,10 @@ <a href="/aspects/query" class="selectable aspect-item" data-guid="{{id}}"> - {{#if selected}} - <i class="entypo-check selected"></i> - {{else}} - <div class="entypo-check"></div> - {{/if}} - {{name}} + {{#if selected}} + <i class="entypo-check selected"></i> + {{else}} + <div class="entypo-check"></div> + {{/if}} + {{name}} </a> <a href="/contacts?a_id={{id}}" class="action modify_aspect pull-right"> <i class="entypo-pencil"></i>