diff --git a/app/assets/stylesheets/settings/users.scss b/app/assets/stylesheets/settings/users.scss index d2822724b..383a4d4ff 100644 --- a/app/assets/stylesheets/settings/users.scss +++ b/app/assets/stylesheets/settings/users.scss @@ -146,36 +146,3 @@ } } } - -.api-key-container { - border: $border-default; - padding: 1em; - - .title { - margin-top: 0; - } - - .description { - margin-bottom: .5em; - } - - .api-key-display { - margin: 1em 0; - } - - .api-key-field { - width: 100%; - } - - .api-key-controls { - display: flex; - - .btn { - margin-right: .5em; - } - } - - .api-key-error { - color: $brand-danger; - } -} diff --git a/app/views/users/registrations/edit_partials/_api_key.html.erb b/app/views/users/registrations/edit_partials/_api_key.html.erb index bdfd1c978..d14fa9af2 100644 --- a/app/views/users/registrations/edit_partials/_api_key.html.erb +++ b/app/views/users/registrations/edit_partials/_api_key.html.erb @@ -1,21 +1,21 @@ -
-

<%= t("users.registrations.edit.api_key.title") %>

-
+
+

<%= t("users.registrations.edit.api_key.title") %>

+

<%= t("users.registrations.edit.api_key.description") %> -

+

<% if current_user.api_key %>
- <%= text_field_tag :api_key, current_user.api_key, class: "api-key-field", disabled: "disabled" %> + <%= text_field_tag :api_key, current_user.api_key, class: "p-3 mb-2 w-full", disabled: "disabled" %> <% if current_user.api_key_expires_at < Time.current %> -

+

<%= t("users.registrations.edit.api_key.expired") %>

<% end %>
<% end %> -
+
<% if current_user.api_key %> - <%= button_to t("users.registrations.edit.api_key.regenerate"), users_api_key_regenerate_path, class: "btn btn-primary" %> + <%= button_to t("users.registrations.edit.api_key.regenerate"), users_api_key_regenerate_path, class: "btn btn-primary mr-2" %> <%= button_to t("users.registrations.edit.api_key.revoke"), users_api_key_revoke_path, class: "btn btn-danger" %> <% else %> <%= button_to t("users.registrations.edit.api_key.generate"), users_api_key_regenerate_path, class: "btn btn-primary" %>