From 2db803e496d6be7798c975b0acfa41b21eb620e9 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 24 Nov 2016 17:31:58 -0500 Subject: [PATCH] notifications bar --- app/assets/stylesheets/clean.css.erb | 7 +++++++ app/assets/stylesheets/notifications.scss | 6 ++++++ app/views/notifications/_header.html.erb | 18 ++++++++++++++++++ app/views/notifications/index.html.erb | 4 +++- app/views/notifications/show.html.erb | 2 ++ 5 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 app/views/notifications/_header.html.erb diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index e4da394b..7902b580 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -781,6 +781,10 @@ background-image: url(<%= asset_path 'exploremaps_sprite.png' %>); background-position: -96px 0; } +.exploreMapsCenter .notificationsLink .exploreMapsIcon { + background-image: url(<%= asset_path 'user_sprite.png' %>); + background-position: 0 -128px; +} .authedApps:hover .exploreMapsIcon, .authedApps.active .exploreMapsIcon { background-position-x: -32px; } @@ -799,6 +803,9 @@ .sharedMaps:hover .exploreMapsIcon, .sharedMaps.active .exploreMapsIcon { background-position: -128px -32px; } +.notificationsLink:hover .exploreMapsIcon, .notificationsLink.active .exploreMapsIcon { + background-position-x: -32px; +} .mapsWrapper { /*overflow-y: auto; */ diff --git a/app/assets/stylesheets/notifications.scss b/app/assets/stylesheets/notifications.scss index 74b5db42..7c3d6bfa 100644 --- a/app/assets/stylesheets/notifications.scss +++ b/app/assets/stylesheets/notifications.scss @@ -3,3 +3,9 @@ list-style: none; } } + +$menu_bar_height: 6em; +.notificationsPage { + margin: 1em; + margin-top: 1em + $menu_bar_height; +} diff --git a/app/views/notifications/_header.html.erb b/app/views/notifications/_header.html.erb new file mode 100644 index 00000000..f93f46a6 --- /dev/null +++ b/app/views/notifications/_header.html.erb @@ -0,0 +1,18 @@ +
+ +
+

+ <% if devise_error_messages? %> + <%= devise_error_messages! %> + <% elsif notice %> + <%= notice %> + <% end %> +

diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index 65cb52b2..6a98c75b 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -2,7 +2,7 @@ <% content_for :mobile_title, 'Notifications' %>
-
+

Notifications

    <% @notifications.each do |notification| %> @@ -26,3 +26,5 @@
+ +<%= render partial: 'notifications/header' %> diff --git a/app/views/notifications/show.html.erb b/app/views/notifications/show.html.erb index 14aedd75..922668c3 100644 --- a/app/views/notifications/show.html.erb +++ b/app/views/notifications/show.html.erb @@ -10,3 +10,5 @@ <%= link_to 'Back', notifications_path %>
+ +<%= render partial: 'notifications/header' %>