Revert "touched up notifications page" because it completly breaks the page (in matter of style and localization [dates!])
This reverts commit a16e83df9e.
This commit is contained in:
parent
7216c8d5cb
commit
981d39d220
2 changed files with 17 additions and 60 deletions
|
|
@ -1,28 +1,24 @@
|
||||||
- content_for :head do
|
- content_for :head do
|
||||||
= include_javascripts :notifications
|
= include_javascripts :notifications
|
||||||
.span-13
|
.span-1
|
||||||
|
= image_tag 'icons/mail_big.png', :height => 30, :width => 30, :style=>"margin-top:3px;"
|
||||||
|
.span-10
|
||||||
%h2
|
%h2
|
||||||
%span.notification_count{:class => ('unread' if @notification_count > 0)}
|
|
||||||
= @notification_count
|
|
||||||
= t('.notifications')
|
= t('.notifications')
|
||||||
.span-8.last.left
|
.span-13.last.left
|
||||||
= link_to t('.mark_all_as_read'), read_all_notifications_path, :class => 'button'
|
= link_to t('.mark_all_as_read'), read_all_notifications_path, :class => 'button'
|
||||||
|
|
||||||
.span-24.last
|
.span-24.last
|
||||||
.stream.notifications
|
%ul.stream.notifications
|
||||||
- @group_days.each do |day, notes|
|
- @group_days.each do |day, notes|
|
||||||
.span-3
|
%li
|
||||||
.date
|
%h4= day
|
||||||
.day= day.split(' ').last
|
%ul.notifications_for_day
|
||||||
.month= day.split(' ').first
|
|
||||||
|
|
||||||
.span-8.notifications_for_day
|
|
||||||
- notes.each do |note|
|
- notes.each do |note|
|
||||||
.stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
|
.stream_element{:data=>{:guid => note.id}, :class => "#{note.unread ? 'unread' : ''}"}
|
||||||
%span.from
|
%span.from
|
||||||
= notification_people_link(note)
|
= notification_people_link(note)
|
||||||
= object_link(note)
|
= object_link(note)
|
||||||
|
|
||||||
%br
|
%span.time= timeago(note.created_at)
|
||||||
%time= timeago(note.created_at)
|
|
||||||
= will_paginate @notifications
|
= will_paginate @notifications
|
||||||
|
|
|
||||||
|
|
@ -236,10 +236,7 @@ header
|
||||||
:display block
|
:display block
|
||||||
|
|
||||||
.unread
|
.unread
|
||||||
:font-weight bold
|
:background-color #eee
|
||||||
:color #333 !important
|
|
||||||
time
|
|
||||||
:color #333 !important
|
|
||||||
|
|
||||||
.diaspora_header_logo
|
.diaspora_header_logo
|
||||||
:position relative
|
:position relative
|
||||||
|
|
@ -270,6 +267,8 @@ header
|
||||||
:font
|
:font
|
||||||
:weight normal
|
:weight normal
|
||||||
:size smaller
|
:size smaller
|
||||||
|
:position absolute
|
||||||
|
:right 20px
|
||||||
|
|
||||||
.from
|
.from
|
||||||
a
|
a
|
||||||
|
|
@ -2822,41 +2821,3 @@ h1.tag
|
||||||
:bottom 4px
|
:bottom 4px
|
||||||
.see_all
|
.see_all
|
||||||
:text-align center
|
:text-align center
|
||||||
|
|
||||||
.date
|
|
||||||
:background
|
|
||||||
:color #e6e6e6
|
|
||||||
:border-radius 8px
|
|
||||||
:padding 5px
|
|
||||||
:color #999
|
|
||||||
|
|
||||||
:text-align center
|
|
||||||
.day
|
|
||||||
:font-size 50px
|
|
||||||
:font-weight 200
|
|
||||||
:margin-bottom -15px
|
|
||||||
:margin-top -10px
|
|
||||||
|
|
||||||
.month
|
|
||||||
:font-size 14px
|
|
||||||
|
|
||||||
.notification_count
|
|
||||||
:background
|
|
||||||
:color #f0f0f0
|
|
||||||
:color #999
|
|
||||||
:font
|
|
||||||
:weight normal
|
|
||||||
|
|
||||||
:padding 0 5px
|
|
||||||
:left 11px
|
|
||||||
:margin
|
|
||||||
:right 5px
|
|
||||||
:border
|
|
||||||
:radius 5px
|
|
||||||
|
|
||||||
&.unread
|
|
||||||
:background
|
|
||||||
:color lighten(#A40802, 5%)
|
|
||||||
:color #eee !important
|
|
||||||
:font
|
|
||||||
:weight bold
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue