diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index bf0a249..28d662b 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -51,7 +51,8 @@ input[type=checkbox] { width: 1.1rem; -webkit-appearance: none; } -input:focus-visible, input:hover { +input:focus-visible, +input:hover { accent-color: #006c9b; background-color: #f3f3f3; } @@ -59,6 +60,15 @@ input[type=checkbox]:checked { appearance: checkbox; -webkit-appearance: checkbox; } +input[type=text]:read-only { + border: none; + padding-left: 0; + padding-right: 0; +} +input:read-only:focus-visible, +input:read-only:hover { + background: white; +} .app-menu { height: 2.2rem; @@ -74,16 +84,18 @@ input[type=checkbox]:checked { margin: 0.4rem 0; } .nav-menu .image-button { - border: none; - border-radius: 0; font-size: 0.9rem; - margin: 0 0.8rem; padding: 0.6rem 1rem; } .nav-menu .right .image-button { float: right; } -.nav-menu .image-button.active { +.nav-menu .tab-button { + border: none; + border-radius: 0; + margin: 0 0.8rem; +} +.nav-menu .tab-button.active { border-bottom: solid 0.2rem; color: #009ade; fill: #009ade; @@ -181,6 +193,7 @@ form table { border-spacing: 0.8rem; } form tr td:first-child { + color: #a0a0a0; font-size: 0.9rem; padding-right: 0.25rem; text-align: right; diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb deleted file mode 100644 index 9dda632..0000000 --- a/app/views/users/edit.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -

Editing user

- -<%= render "form", user: @user %> - -
- -
- <%= link_to "Show this user", @user %> | - <%= link_to "Back to users", users_path %> -
diff --git a/app/views/users/registrations/edit.html.erb b/app/views/users/registrations/edit.html.erb index 54a7c4a..9dda632 100644 --- a/app/views/users/registrations/edit.html.erb +++ b/app/views/users/registrations/edit.html.erb @@ -1,43 +1,10 @@ -

Edit <%= resource_name.to_s.humanize %>

+

Editing user

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= render "users/shared/error_messages", resource: resource %> +<%= render "form", user: @user %> -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %> -
+
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
- <% end %> - -
- <%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password, autocomplete: "new-password" %> - <% if @minimum_password_length %> -
- <%= @minimum_password_length %> characters minimum - <% end %> -
- -
- <%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation, autocomplete: "new-password" %> -
- -
- <%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password, autocomplete: "current-password" %> -
- -
- <%= f.submit "Update" %> -
-<% end %> - -

Cancel my account

- -
Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %>
- -<%= link_to "Back", :back %> +
+ <%= link_to "Show this user", @user %> | + <%= link_to "Back to users", users_path %> +