Merge branch 'fix/732-password-align' into 'develop'

password reset page labels align See merge request pleroma/pleroma!986

Merge branch 'fix/732-password-align' into 'develop'
57d5ff57 · lain · 1b4c4d29 · 3ca6c4f4 · 57d5ff57 · 57d5ff57
Commit 57d5ff57 authored 6 years ago by lain
--- a/lib/pleroma/web/templates/layout/app.html.eex
+++ b/lib/pleroma/web/templates/layout/app.html.eex
@@ -179,6 +179,17 @@
          flex-basis: 50%;
        }
      }
+      .form-row {
+        display: flex;
+      }
+      .form-row > label {
+        text-align: left;
+        line-height: 47px;
+        flex: 1;
+      }
+      .form-row > input {
+        flex: 2;
+      }
    </style>
  </head>
  <body>

--- a/lib/pleroma/web/templates/twitter_api/util/password_reset.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/util/password_reset.html.eex
 <h2>Password Reset for <%= @user.nickname %></h2>
 <%= form_for @conn, util_path(@conn, :password_reset), [as: "data"], fn f -> %>
-<%= label f, :password, "Password" %>
-<%= password_input f, :password %>
-<br>
-
-<%= label f, :password_confirmation, "Confirmation" %>
-<%= password_input f, :password_confirmation %>
-<br>
-<%= hidden_input f, :token, value: @token.token %>
-<%= submit "Reset" %>
+  <div class="form-row">
+    <%= label f, :password, "Password" %>
+    <%= password_input f, :password %>
+  </div>
+  <div class="form-row">
+    <%= label f, :password_confirmation, "Confirmation" %>
+    <%= password_input f, :password_confirmation %>
+  </div>
+  <%= hidden_input f, :token, value: @token.token %>
+  <%= submit "Reset" %>
 <% end %>