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

Merge pull request #6762 from svbergerem/fix-notifications-design-regression

Browse source 
Fix notifications page design regressions
This commit is contained in:
Jonne Haß 2016-03-21 13:48:41 +01:00
commit 47f6ea4b98
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,8 @@
.btn-toolbar { margin: 11px 0; } .btn-toolbar { margin: 11px 0; }
.framed-content { padding-bottom: 10px; }
.year { .year {
background-color: $white; background-color: $white;
color: $text-grey; color: $text-grey;
@ -43,7 +45,10 @@
.pagination { text-align: center; } .pagination { text-align: center; }
.no_notifications { text-align: center; } .no-notifications {
margin: 0 10px;
text-align: center;
}
} }
.list-group .list-group-item { .list-group .list-group-item {

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

@ -71,7 +71,7 @@
= will_paginate @notifications, renderer: WillPaginate::ActionView::BootstrapLinkRenderer = will_paginate @notifications, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
- else - else
.no_notifications.well .no-notifications.well
%h4 %h4
= t(".no_notifications") = t(".no_notifications")