diff --git a/app/assets/stylesheets/apps.css.erb b/app/assets/stylesheets/apps.css.erb index 46fa64b7..5771e366 100644 --- a/app/assets/stylesheets/apps.css.erb +++ b/app/assets/stylesheets/apps.css.erb @@ -2,16 +2,13 @@ position: relative; margin: 0 auto; width: auto; - max-width: 960px; + max-width: 800px; overflow: hidden; box-shadow: 0 1px 3px rgba(0,0,0,.12),0 1px 2px rgba(0,0,0,.24); background: #fff; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - border: 1px solid #dcdcdc; box-sizing: border-box; padding: 15px; + font-family: 'din-regular', sans-serif; } .centerContent .page-header { diff --git a/app/views/doorkeeper/authorized_applications/index.html.erb b/app/views/doorkeeper/authorized_applications/index.html.erb index d6391215..42c3127d 100644 --- a/app/views/doorkeeper/authorized_applications/index.html.erb +++ b/app/views/doorkeeper/authorized_applications/index.html.erb @@ -33,6 +33,5 @@ <% end %> -<%= render partial: 'shared/go_to_maps' %> <%= render 'script' %> diff --git a/app/views/layouts/doorkeeper.html.erb b/app/views/layouts/doorkeeper.html.erb index 960502d9..f4696a37 100644 --- a/app/views/layouts/doorkeeper.html.erb +++ b/app/views/layouts/doorkeeper.html.erb @@ -38,6 +38,9 @@
Authorized Apps
+ +
Maps +
diff --git a/app/views/notifications/_header.html.erb b/app/views/notifications/_header.html.erb index 794bfdf7..2507b2ef 100644 --- a/app/views/notifications/_header.html.erb +++ b/app/views/notifications/_header.html.erb @@ -5,6 +5,9 @@
Notifications
+ +
Maps +
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index 9e37c220..ee075410 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -30,7 +30,7 @@ <% end %> <% if @notifications.count == 0 %>
- You have ZERO unread notifications. Huzzah! + You have no notifications. More time for dancing.
<% end %> @@ -41,8 +41,6 @@ <%= paginate @notifications %> <% end %> - - <%= render partial: 'shared/go_to_maps' %> <%= render partial: 'notifications/header' %> diff --git a/app/views/notifications/show.html.erb b/app/views/notifications/show.html.erb index a003a0e1..b56fb177 100644 --- a/app/views/notifications/show.html.erb +++ b/app/views/notifications/show.html.erb @@ -2,18 +2,15 @@ <% content_for :mobile_title, 'Notifications' %>
+
+ <%= link_to 'Back to notifications', notifications_path %> +

<%= @notification.subject %>

<%= raw @notification.body %>
- -
- <%= link_to 'Back to notifications', notifications_path %> -
- - <%= render partial: 'shared/go_to_maps' %>
<%= render partial: 'notifications/header' %> diff --git a/app/views/shared/_go_to_maps.html.erb b/app/views/shared/_go_to_maps.html.erb deleted file mode 100644 index 04c88574..00000000 --- a/app/views/shared/_go_to_maps.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -
- Go to maps -
diff --git a/frontend/src/components/Maps/Header.js b/frontend/src/components/Maps/Header.js index c0a7e1cd..f360e7a5 100644 --- a/frontend/src/components/Maps/Header.js +++ b/frontend/src/components/Maps/Header.js @@ -36,6 +36,12 @@ class Header extends Component {
+ -