diff --git a/app/assets/stylesheets/clean.css.erb b/app/assets/stylesheets/clean.css.erb index 947a7a18..7fa23e16 100644 --- a/app/assets/stylesheets/clean.css.erb +++ b/app/assets/stylesheets/clean.css.erb @@ -603,6 +603,10 @@ margin-top: 110px; } +.appsPage #exploreMapsHeader { + display: block; +} + #exploreMapsHeader { display: none; position: absolute; diff --git a/app/views/doorkeeper/applications/_script.html.erb b/app/views/doorkeeper/applications/_script.html.erb index 7f4a7944..284a98a2 100644 --- a/app/views/doorkeeper/applications/_script.html.erb +++ b/app/views/doorkeeper/applications/_script.html.erb @@ -1,10 +1,3 @@ diff --git a/app/views/doorkeeper/authorized_applications/_script.html.erb b/app/views/doorkeeper/authorized_applications/_script.html.erb index cebf167b..284a98a2 100644 --- a/app/views/doorkeeper/authorized_applications/_script.html.erb +++ b/app/views/doorkeeper/authorized_applications/_script.html.erb @@ -1,10 +1,3 @@ diff --git a/app/views/layouts/doorkeeper.html.erb b/app/views/layouts/doorkeeper.html.erb index bba3cc71..b39730da 100644 --- a/app/views/layouts/doorkeeper.html.erb +++ b/app/views/layouts/doorkeeper.html.erb @@ -16,8 +16,15 @@ <% end %> <%= content_tag :div, class: "main" do %> + + <% if params[:controller] == 'doorkeeper/applications' || params[:controller] == 'doorkeeper/authorized_applications' + classes = 'appsPage' + else + classes = '' + end + %> -
+
<%= render :partial => 'layouts/upperelements', :locals => {:appsPage => true } %> @@ -33,7 +40,20 @@ <% end %> <%= render :partial => 'layouts/lowermapelements' %> -
+

<% if devise_error_messages? %> <%= devise_error_messages! %> diff --git a/frontend/src/components/Header.js b/frontend/src/components/Header.js index 45958ea5..f9a037c9 100644 --- a/frontend/src/components/Header.js +++ b/frontend/src/components/Header.js @@ -30,7 +30,6 @@ class Header extends Component { const explore = section == "mine" || section == "active" || section == "shared" || section == "featured" const mapper = section == "mapper" - const apps = section == "registered" || section == "authorized" return (

@@ -68,17 +67,6 @@ class Header extends Component {
) : null } - - -