nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6342 from svbergerem/sidebar-polishing-code-style

Browse source 
Fix style regressions and code style for sidebar polishing PR
This commit is contained in:
Jonne Haß 2015-08-23 16:13:40 +02:00
commit 865cfc1cc2
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/assets/stylesheets/navbar_left.scss
View file

@ -34,43 +34,43 @@
.selected, .selected a { color: $black; } .selected, .selected a { color: $black; }
.hoverable { .hoverable {
display: block; border-bottom: 1px solid $border-grey;
&.selected a, &.selected a:hover, color: $link-grey;
.followed-tags-sidebar a.hoverable.selected {
color: white;
background: #666;
}
}
a.hoverable, li.hoverable {
padding: 10px 20px;
display: block; display: block;
font-weight: normal; font-weight: normal;
color: $link-grey; padding: 10px 20px;
border-bottom: 1px solid #ddd;
&:hover, &:hover a, &:hover, &:hover a, &:hover [class^="entypo"] {
&:hover .entypo-check{
background-color: $blue; background-color: $blue;
color: $white; 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 { #aspects_list, #tags_list {
background: $left-navbar-drawer-background; background: $left-navbar-drawer-background;
li { padding: 0; } li { padding: 0; }
.entypo-check { visibility: hidden; }
.entypo-check.selected { visibility: visible; }
.selectable { .selectable {
display: block; display: block;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
padding: 10px 20px 10px 40px; padding: 10px 20px 10px 40px;
} }
.action.modify_aspect, .action.delete-tag-following { .hoverable > .action {
position: relative; position: relative;
bottom: 30px; bottom: 30px;
right: 20px; right: 20px;
visibility: hidden;
} }
.hoverable:hover > .action { visibility: visible; }
} }
#home_user_badge { #home_user_badge {

12
app/assets/templates/aspect_tpl.jst.hbs
View file

@ -1,10 +1,10 @@
<a href="/aspects/query" class="selectable aspect-item" data-guid="{{id}}"> <a href="/aspects/query" class="selectable aspect-item" data-guid="{{id}}">
{{#if selected}} {{#if selected}}
<i class="entypo-check selected"></i> <i class="entypo-check selected"></i>
{{else}} {{else}}
<div class="entypo-check"></div> <div class="entypo-check"></div>
{{/if}} {{/if}}
{{name}} {{name}}
</a> </a>
<a href="/contacts?a_id={{id}}" class="action modify_aspect pull-right"> <a href="/contacts?a_id={{id}}" class="action modify_aspect pull-right">
<i class="entypo-pencil"></i> <i class="entypo-pencil"></i>