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

Style fixes for left navbar in notification view

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-03 00:28:26 +02:00 committed by Jonne Haß
parent 8e9ceb9a2b
commit 46abdbdd1f
5 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/views/notifications_view.js
View file

@ -74,10 +74,10 @@ app.views.Notifications = Backbone.View.extend({
[allNotes, typeNotes].forEach(function(badge) { [allNotes, typeNotes].forEach(function(badge) {
if(badge.text() > 0) { if(badge.text() > 0) {
badge.addClass("badge-important").removeClass("badge-default"); badge.removeClass("hidden");
} }
else { else {
badge.removeClass("badge-important").addClass("badge-default"); badge.addClass("hidden");
} }
}); });

3
app/assets/stylesheets/application.scss
View file

@ -34,9 +34,6 @@
@import 'new_styles/registration'; @import 'new_styles/registration';
@import 'new_styles/forms'; @import 'new_styles/forms';
/* navs */
@import 'new_styles/navs';
/* profile and settings pages */ /* profile and settings pages */
@import 'new_styles/settings'; @import 'new_styles/settings';

15
app/assets/stylesheets/new_styles/_navs.scss
View file

@ -1,15 +0,0 @@
.nav.nav-tabs{
li > a {
color: $text-dark-grey;
.entypo, .mentionIcon {
color: $text-dark-grey;
margin-right: 5px;
}
.mentionIcon { font-weight: 700; }
}
li.active > a {
background-color: $background-grey;
color: $black;
.entypo, .mentionIcon { color: $black; }
}
}

17
app/assets/stylesheets/notifications.scss
View file

@ -1,17 +1,8 @@
#notifications_container { #notifications_container {
.nav.nav-tabs{
li > a {
.badge.badge-default { display: none; }
}
}
.stream { .stream {
.header { .header {
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
.btn-toolbar, h4 { .btn-toolbar { margin: 11px 0; }
margin: 11px 0;
line-height: 40px;
}
margin-bottom: 10px; margin-bottom: 10px;
} }
@ -58,7 +49,6 @@
.stream_element.media { .stream_element.media {
padding: 10px; padding: 10px;
margin: 0px; margin: 0px;
font-size: 13px;
line-height: 18px; line-height: 18px;
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
&:last-child { border: none !important; } &:last-child { border: none !important; }
@ -98,4 +88,9 @@
.no_notifications { text-align: center; } .no_notifications { text-align: center; }
} }
.list-group .list-group-item {
.entypo, .mentionIcon { margin-right: 5px; }
.mentionIcon { font-weight: bold; }
}
} }

6
app/views/notifications/index.html.haml
View file

@ -3,14 +3,14 @@
.col-md-3 .col-md-3
%h3 %h3
= t('.notifications') = t('.notifications')
%ul.list-group .list-group
%a.list-group-item{class: ('active' unless params[:type] && @grouped_unread_notification_counts.has_key?(params[:type])), href: '/notifications' + (params[:show] == 'unread' ? '?show=unread' : '') } %a.list-group-item{class: ('active' unless params[:type] && @grouped_unread_notification_counts.has_key?(params[:type])), href: '/notifications' + (params[:show] == 'unread' ? '?show=unread' : '') }
%span.pull-right.badge{class: (@unread_notification_count > 0 ? 'badge-important' : 'badge-default')} %span.pull-right.badge{class: ("hidden" unless @unread_notification_count > 0)}
= @unread_notification_count = @unread_notification_count
= t('.all_notifications') = t('.all_notifications')
- @grouped_unread_notification_counts.each do |key, count| - @grouped_unread_notification_counts.each do |key, count|
%a.list-group-item{class: ('active' if params[:type] == key), data: { type: key }, href: '/notifications?type=' + key + (params[:show] == 'unread' ? '&show=unread' : '') } %a.list-group-item{class: ('active' if params[:type] == key), data: { type: key }, href: '/notifications?type=' + key + (params[:show] == 'unread' ? '&show=unread' : '') }
%span.pull-right.badge{class: (count > 0 ? 'badge-important' :'badge-default') } %span.pull-right.badge{class: ("hidden" unless count > 0)}
= count = count
- case key - case key
- when 'also_commented', 'comment_on_post' - when 'also_commented', 'comment_on_post'