diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3dd6432c4..696b26ae0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -17,7 +17,7 @@ class UsersController < ApplicationController
@user = CurrentUser.user
if @user.is_anonymous?
- redirect_to new_session_path
+ redirect_to login_path(url: settings_path)
else
params[:action] = "edit"
respond_with(@user, template: "users/edit")
@@ -54,7 +54,7 @@ class UsersController < ApplicationController
params[:action] = "show"
respond_with(@user, methods: @user.full_attributes, template: "users/show")
elsif request.format.html?
- redirect_to new_session_path
+ redirect_to login_path(url: profile_path)
else
raise ActiveRecord::RecordNotFound
end
diff --git a/app/javascript/src/styles/base/040_colors.css b/app/javascript/src/styles/base/040_colors.css
index e2c5ad565..7cbbdb8a8 100644
--- a/app/javascript/src/styles/base/040_colors.css
+++ b/app/javascript/src/styles/base/040_colors.css
@@ -161,7 +161,7 @@
--bulk-update-request-approved-color: green;
--bulk-update-request-failed-color: red;
- --sign-in-link-color: #E00;
+ --login-link-color: #E00;
--footer-border: 1px solid #EEE;
--jquery-ui-widget-content-background: var(--body-background-color);
@@ -434,7 +434,7 @@ body[data-user-theme="dark"] {
--wiki-page-versions-diff-ins-background: var(--green-0);
--low-post-count-color: var(--red-1);
- --sign-in-link-color: var(--red-1);
+ --login-link-color: var(--red-1);
--new-artist-color: var(--red-1);
--remove-favorite-button: var(--red-1);
--fetch-source-data-border: 1px solid var(--grey-4);
diff --git a/app/javascript/src/styles/common/page_header.scss b/app/javascript/src/styles/common/page_header.scss
index 77b9de8fa..a9a65f8fc 100644
--- a/app/javascript/src/styles/common/page_header.scss
+++ b/app/javascript/src/styles/common/page_header.scss
@@ -41,9 +41,9 @@ header#top {
font-weight: bold;
}
- li#nav-sign-in a {
+ li#nav-login a {
font-weight: bold;
- color: var(--sign-in-link-color);
+ color: var(--login-link-color);
}
li.forum-updated a {
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index 09de054ed..a16ed243c 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -1,6 +1,6 @@