From 8ccc238791742770ecc5e9fe353c3043d1d8fc59 Mon Sep 17 00:00:00 2001 From: evazion Date: Sun, 26 Aug 2018 12:55:50 -0500 Subject: [PATCH] =?UTF-8?q?nav=20menu:=20remove=20duplicate=20"More=20?= =?UTF-8?q?=C2=BB"=20link.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove a second hidden "More ยป" link from the nav menu. This was leftover code first added in f2f524b87 and later reverted in 68161f7b8. --- app/javascript/src/javascripts/news_updates.js | 4 ---- app/javascript/src/styles/common/main_layout.scss | 11 ----------- app/views/layouts/_main_links.html.erb | 2 +- app/views/layouts/_more_links.html.erb | 5 ----- app/views/layouts/default.html.erb | 2 -- 5 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 app/views/layouts/_more_links.html.erb diff --git a/app/javascript/src/javascripts/news_updates.js b/app/javascript/src/javascripts/news_updates.js index 950db3684..8a5027b29 100644 --- a/app/javascript/src/javascripts/news_updates.js +++ b/app/javascript/src/javascripts/news_updates.js @@ -14,10 +14,6 @@ NewsUpdate.initialize = function() { $("#news-updates").hide(); Cookie.put("news-ticker", key); - // need to reset the more link - var $site_map_link = $("#site-map-link"); - $("#more-links").hide().offset({top: $site_map_link.offset().top + $site_map_link.height() + 10, left: $site_map_link.offset().left}); - return false; }); } diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss index 7c35ada30..ce5bd12ce 100644 --- a/app/javascript/src/styles/common/main_layout.scss +++ b/app/javascript/src/styles/common/main_layout.scss @@ -84,14 +84,3 @@ footer#page-footer { div.clearfix { clear: both; } - -div#more-links { - z-index: 5000; - position: absolute; - background: white; - border: 1px solid #999; - width: 8em; - line-height: 1.3em; - padding: 0.2em 0.6em; - @include box-shadow(2px 2px 2px #ccc); -} diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb index ab80980e1..9fae2f822 100644 --- a/app/views/layouts/_main_links.html.erb +++ b/app/views/layouts/_main_links.html.erb @@ -19,5 +19,5 @@ <% if CurrentUser.is_moderator? %> <%= nav_link_to("Dashboard", moderator_dashboard_path) %> <% end %> - <%= nav_link_to("More »".html_safe, site_map_path, :id => "site-map-link") %> + <%= nav_link_to("More »".html_safe, site_map_path) %> diff --git a/app/views/layouts/_more_links.html.erb b/app/views/layouts/_more_links.html.erb deleted file mode 100644 index 33f3d15dc..000000000 --- a/app/views/layouts/_more_links.html.erb +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 54f2cefb2..6fab91fba 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -101,8 +101,6 @@ <%= render "layouts/main_links" %> <%= yield :secondary_links %> - - <%= render "layouts/more_links" %>