4 files changed, 37 insertions, 9 deletions

diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 3f115d58..a57b1ba4 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -1,15 +1,17 @@
 <div id="login_form">
-  <%= form_tag session_path do -%>
-    <% if flash[:error] %>
-      <div class="error_messages"><%= flash[:error] %></div>
-    <% end %>
+  <h1><%= t(".heading") %></h1>
 
-    <div class="layout_row_label"> <%= t(".login") %> </div>
-    <div class="layout_row_content"><%= text_field_tag 'login', @login, :autocomplete => "username" %></div>
+  <%= form_tag session_path do -%>
+    <div class="login_field">
+      <%= label_tag :login, t(".login") %>
+      <%= text_field_tag 'login', @login, :autocomplete => "username" %>
+    </div>
 
-    <div class="layout_row_label"> <%= t(".password") %> </div>
-    <div class="layout_row_content"><%= password_field_tag 'password', nil, :autocomplete => "current-password" %></div>
+    <div class="login_field">
+      <%= label_tag :password, t(".password") %>
+      <%= password_field_tag 'password', nil, :autocomplete => "current-password" %>
+    </div>
 
-    <div class="layout_row_content"><%= submit_tag t(".log_in") %></div>
+    <%= submit_tag t(".log_in") %>
   <% end -%>
 </div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ae1149a4..51fafe21 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -201,6 +201,7 @@ de:
       login: "Anmeldename"
       password: "Passwort"
       log_in: "anmelden"
+      heading: "cccms"
 
   otp_challenges:
     new:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 50811b37..b3678187 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -154,6 +154,7 @@ en:
       login: "Login"
       password: "Password"
       log_in: "log in"
+      heading: "cccms"
 
   otp_challenges:
     new:
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 6664c4ce..a27968e9 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -101,6 +101,25 @@ input[type=radio] {
 
 #login_form {
   max-width: 22rem;
+  margin: 2rem auto;
+  padding: 1.25rem;
+  border: 1px solid #e8e8e8;
+  border-radius: 6px;
+}
+
+#login_form h1 {
+  margin-top: 0;
+  font-size: 1.25rem;
+}
+
+#login_form label {
+  display: block;
+  margin-bottom: 0.25rem;
+  text-transform: lowercase;
+}
+
+#login_form .login_field {
+  margin-bottom: 1rem;
 }
 
 #login_form input[type=text],
@@ -109,6 +128,11 @@ input[type=radio] {
   box-sizing: border-box;
 }
 
+#login_form input[type=submit] {
+  width: 100%;
+  padding: 0.6rem 1rem;
+}
+
 /* ============================================================
    Navigation
    ============================================================ */