diff --git a/app/assets/javascripts/mobile.js b/app/assets/javascripts/mobile.js index 83f787d95..b1db9351c 100644 --- a/app/assets/javascripts/mobile.js +++ b/app/assets/javascripts/mobile.js @@ -8,6 +8,7 @@ //= require mbp-helper //= require jquery.autoSuggest.custom //= require fileuploader-custom +//= require rails-timeago $(document).ready(function(){ diff --git a/app/assets/javascripts/pages/notifications-index.js b/app/assets/javascripts/pages/notifications-index.js index f66c9adfd..7633a4d7d 100644 --- a/app/assets/javascripts/pages/notifications-index.js +++ b/app/assets/javascripts/pages/notifications-index.js @@ -3,6 +3,6 @@ Diaspora.Pages.NotificationsIndex = function() { this.subscribe("page/ready", function(evt, document) { self.infiniteScroll = self.instantiate("InfiniteScroll"); - self.instantiate("TimeAgo", document.find("abbr.timeago")); + self.instantiate("TimeAgo", document.find("time.timeago")); }); }; diff --git a/app/assets/javascripts/widgets/notifications-badge.js b/app/assets/javascripts/widgets/notifications-badge.js index 53fd75099..1f60bc794 100644 --- a/app/assets/javascripts/widgets/notifications-badge.js +++ b/app/assets/javascripts/widgets/notifications-badge.js @@ -64,7 +64,7 @@ self.dropdownNotifications.append(notification.note_html); }); }); - self.dropdownNotifications.find("abbr.timeago").timeago(); + self.dropdownNotifications.find("time.timeago").timeago(); self.dropdownNotifications.find('.unread').each(function(index) { Diaspora.page.header.notifications.setUpUnread( $(this) ); diff --git a/app/assets/stylesheets/conversations.css.scss b/app/assets/stylesheets/conversations.css.scss index cc5c06459..50de2fc69 100644 --- a/app/assets/stylesheets/conversations.css.scss +++ b/app/assets/stylesheets/conversations.css.scss @@ -95,7 +95,7 @@ .last_message { color: $white; } - .timestamp { color: $background-grey; } + .timeago { color: $background-grey; } } &.selected:hover { background-color: lighten($blue,5%); } &:hover { cursor: pointer; } @@ -130,7 +130,7 @@ } } - .timestamp { + .timeago { float: right; line-height: normal; font-weight: normal; @@ -150,7 +150,7 @@ .last_message { color: $white; } - .timestamp { color: $background-grey; } + .timeago { color: $background-grey; } } #left_pane { diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index b61ca4725..6124e1e81 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -75,7 +75,7 @@ h3 { .photo_attachments { margin: { top: 6px; }; } - .time { + .timeago { font: { weight: normal; }; } padding: 0 !important; @@ -217,7 +217,7 @@ h3 { color: #ccc; } } .comment { - .time { + .timeago { color: $text-dark-grey; } } .info { diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 48f8bf951..40860ca12 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -18,7 +18,7 @@ module ApplicationHelper end def timeago(time, options={}) - timeago_tag(time, options.merge(:title => time.iso8601)) if time + timeago_tag(time, options.merge(:class => 'timeago', :title => time.iso8601, :force => true)) if time end def bookmarklet