diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index db880b2..86f6ae9 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -6,14 +6,15 @@ <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %>

- <%= f.label :email, 'Email address', class: 'block mb-1' %> + <%= f.label :email, 'Email address', class: 'block mb-1 w-full' %> <%= f.email_field :email, required: true, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email), - class: "w-full sm:w-4/5" %> + class: "w-full" %>

- <%= f.submit "Resend confirmation instructions", class: 'btn-md btn-blue' %> + <%= f.submit "Resend confirmation link", + class: 'btn-md btn-blue w-full md:w-auto' %>

<% end %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index ddd54ff..e14002b 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -7,14 +7,17 @@ <%= render "devise/shared/error_messages", resource: resource %>

<%= f.label :cn, 'User', class: 'block' %> - <%= f.text_field :cn, autofocus: true, autocomplete: "username", required: true %> @ kosmos.org + <%= f.text_field :cn, autofocus: true, autocomplete: "username", + required: true, class: "w-full md:w-3/5"%> + @ kosmos.org

<%= f.label :email, 'Email address', class: 'block' %> - <%= f.email_field :email, autocomplete: "email", required: true %> + <%= f.email_field :email, autocomplete: "email", required: true, + class: "w-full md:w-3/5"%>

- <%= f.submit "Send me a reset link", class: 'btn-md btn-blue' %> + <%= f.submit "Send me a reset link", class: 'btn-md btn-blue w-full md:w-auto' %>

<% end %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index c41dc46..f557cc1 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -5,14 +5,17 @@ <%= render "devise/shared/error_messages", resource: resource %>

<%= f.label :cn, 'User', class: 'block' %> - <%= f.text_field :cn, autofocus: true, autocomplete: "username" %> @ kosmos.org + <%= f.text_field :cn, autofocus: true, autocomplete: "username", + class: "w-full md:w-3/5"%> + @ kosmos.org

<%= f.label :password, class: 'block' %> - <%= f.password_field :password, autocomplete: "current-password" %> + <%= f.password_field :password, autocomplete: "current-password", + class: "w-full md:w-3/5"%>

- <%= f.submit "Log in", class: 'btn-md btn-blue' %> + <%= f.submit "Log in", class: 'btn-md btn-blue w-full md:w-auto' %>

<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d3de420..67c7710 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,21 +45,23 @@ <% end %>
- + <% if user_signed_in? && current_user.confirmed? %> + + <% end %>