Fix style regressions and code style for sidebar polishing PR

This commit is contained in:
Steffen van Bergerem 2015-08-23 13:15:01 +02:00
parent eddfa7cb5c
commit eaf012c82c
2 changed files with 23 additions and 23 deletions

View file

@ -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 {

View file

@ -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>