diff --git a/app/javascript/src/javascripts/common.js b/app/javascript/src/javascripts/common.js index 89831b0e5..6d611bd3d 100644 --- a/app/javascript/src/javascripts/common.js +++ b/app/javascript/src/javascripts/common.js @@ -2,13 +2,6 @@ import Cookie from './cookie' import Utility from './utility' $(function() { - // Account notices - $("#hide-sign-up-notice").on("click.danbooru", function(e) { - $("#sign-up-notice").hide(); - Cookie.put("hide_sign_up_notice", "1", 7); - e.preventDefault(); - }); - $("#hide-upgrade-account-notice").on("click.danbooru", function(e) { $("#upgrade-account-notice").hide(); Cookie.put('hide_upgrade_account_notice', '1', 7); diff --git a/app/javascript/src/styles/common/main_layout.scss b/app/javascript/src/styles/common/main_layout.scss index d9191d375..8bbbf0701 100644 --- a/app/javascript/src/styles/common/main_layout.scss +++ b/app/javascript/src/styles/common/main_layout.scss @@ -20,7 +20,7 @@ div#page { margin: 0 20px; padding: 0 10px; - div#upgrade-account-notice, div#sign-up-notice, div#ban-notice, div#dmail-notice, div#mod-notice { + div#upgrade-account-notice, div#ban-notice, div#dmail-notice, div#mod-notice { margin: 1em 0; padding: 1em; text-align: center; diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 70d969c21..a882e9cf7 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -115,10 +115,6 @@
- <% if CurrentUser.is_anonymous? && session[:started_at].is_a?(ActiveSupport::TimeWithZone) && session[:started_at] < 1.minute.ago && cookies[:hide_sign_up_notice].blank? %> - <%= render "users/sign_up_notice" %> - <% end %> - <% if !CurrentUser.is_anonymous? && !CurrentUser.is_gold? && cookies[:hide_upgrade_account_notice].blank? && params[:action] != "upgrade_information" %> <%= render "users/upgrade_notice" %> <% end %> diff --git a/app/views/users/_sign_up_notice.html.erb b/app/views/users/_sign_up_notice.html.erb deleted file mode 100644 index 87086605a..000000000 --- a/app/views/users/_sign_up_notice.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -
-

Like the site? <%= link_to "Sign up for a free basic account!", new_user_path, id: "sign-up-link" %>

-

<%= link_to "No thanks", "#", :id => "hide-sign-up-notice" %>

-
- -<% content_for(:html_header) do %> - -<% end %>