From e54cc15cbd0b21c32acfa223e57f24667b158f48 Mon Sep 17 00:00:00 2001 From: Satoshi KOJIMA Date: Fri, 28 Jul 2017 08:55:52 +0900 Subject: fix #4356 : place sw.js to assets/sw.js (#4357) --- public/sw.js | 1 + 1 file changed, 1 insertion(+) create mode 120000 public/sw.js (limited to 'public') diff --git a/public/sw.js b/public/sw.js new file mode 120000 index 000000000..1471a9e64 --- /dev/null +++ b/public/sw.js @@ -0,0 +1 @@ +assets/sw.js \ No newline at end of file -- cgit From 13bb1ddc7f5f5e3a7fc57396427c750f40d80603 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 28 Jul 2017 18:13:42 +0200 Subject: Use consistent icons for web push notifications, same as web UI (#4426) --- app/models/web/push_subscription.rb | 6 +++--- public/web-push-icon_expand.png | Bin 0 -> 1380 bytes public/web-push-icon_favourite.png | Bin 0 -> 1046 bytes public/web-push-icon_reblog.png | Bin 0 -> 851 bytes 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 public/web-push-icon_expand.png create mode 100644 public/web-push-icon_favourite.png create mode 100644 public/web-push-icon_reblog.png (limited to 'public') diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 7356ed882..b343cf044 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -118,7 +118,7 @@ class Web::PushSubscription < ApplicationRecord when :mention then [ { title: translate('push_notifications.mention.action_favourite'), - icon: full_asset_url('emoji/2b50.png', skip_pipeline: true), + icon: full_asset_url('web-push-icon_favourite.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/favourite", @@ -131,11 +131,11 @@ class Web::PushSubscription < ApplicationRecord can_boost = notification.type.equal?(:mention) && !notification.target_status.nil? && !notification.target_status.hidden? if should_hide - actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('emoji/1f441.png'), todo: 'expand', action: 'expand') + actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('web-push-icon_expand.png', skip_pipeline: true), todo: 'expand', action: 'expand') end if can_boost - actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('emoji/1f504.png'), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" } + actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('web-push-icon_boost.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" } end actions diff --git a/public/web-push-icon_expand.png b/public/web-push-icon_expand.png new file mode 100644 index 000000000..972c28886 Binary files /dev/null and b/public/web-push-icon_expand.png differ diff --git a/public/web-push-icon_favourite.png b/public/web-push-icon_favourite.png new file mode 100644 index 000000000..ef36b8898 Binary files /dev/null and b/public/web-push-icon_favourite.png differ diff --git a/public/web-push-icon_reblog.png b/public/web-push-icon_reblog.png new file mode 100644 index 000000000..0f555ed09 Binary files /dev/null and b/public/web-push-icon_reblog.png differ -- cgit