diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index b199dc2..011c869 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -22,12 +22,29 @@ body { margin: 0 0.5em; } +input { + border: 1px solid; + border-radius: 0.2em; + border-color: #cccccc; + font-size: 0.9em; + padding: 0.1em 0.4em; +} +input[type=checkbox] { + height: 1em; + margin: 0; + width: 1em; +} +input:focus:not([type=checkbox]) { + outline: none; +} + .application-menu { height: 2.1em; margin: 0.5em 0; } -.application-menu a { - border: 0.1em solid; +.application-menu a, input[type=submit] { + border: 1px solid; + background-color: #ffffff; border-color: #a0a0a0; border-radius: 0.2em; color: #a0a0a0; @@ -37,7 +54,10 @@ body { margin-left: 1em; padding: 0.6em; } -.application-menu a:hover { +.application-menu a:hover, +.application-menu a:focus-visible, +input[type=submit]:hover, +input[type=submit]:focus-visible { background-color: #009ade; border-color: #009ade; color: white; @@ -94,3 +114,21 @@ a:not(:hover) { .flash button:hover { opacity: 1; } + +.field + .field, .field + .actions { + margin-top: 0.8em; +} +form label { + display: inline-block; + font-weight: bold; + font-size: 0.9em; + padding-right: 0.25em; + text-align: right; + width: 50%; +} +form input[type=submit] { + display: block; + float: none; + font-size: 0.9em; + margin: 0 auto; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d49bbe4..575074a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - FixinMe + fixin.me <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/users/sessions/new.html.erb b/app/views/users/sessions/new.html.erb index 8c4864b..1ef2d35 100644 --- a/app/views/users/sessions/new.html.erb +++ b/app/views/users/sessions/new.html.erb @@ -1,25 +1,25 @@ -

Log in

+

<%= t :sign_in %>

<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %> + <%= f.label t(:email) -%> + <%= f.email_field :email, size: 32, autofocus: true, autocomplete: "email" %>
- <%= f.label :password %>
- <%= f.password_field :password, autocomplete: "current-password" %> + <%= f.label t(:password) -%> + <%= f.password_field :password, size: 32, autocomplete: "current-password" %>
<% if devise_mapping.rememberable? %>
+ <%= f.label t(:remember_me) -%> <%= f.check_box :remember_me %> - <%= f.label :remember_me %>
<% end %>
- <%= f.submit "Log in" %> + <%= f.submit t(:sign_in) %>
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a1cd48..3c7535b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,3 +1,7 @@ en: + email: "E-mail" + password: "Password" + register: "Register" + remember_me: "Remember me" sign_in: "Sign in" sign_out: "Sign out"