moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

password reset page labels align

See merge request pleroma/pleroma!986
This commit is contained in:
lambda 2019-04-12 09:13:30 +00:00
parent 1b4c4d29a3 3ca6c4f443
commit 57d5ff57d6
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/templates/layout/app.html.eex
View File

@ -179,6 +179,17 @@
flex-basis: 50%; flex-basis: 50%;
} }
} }
.form-row {
display: flex;
}
.form-row > label {
text-align: left;
line-height: 47px;
flex: 1;
}
.form-row > input {
flex: 2;
}
</style> </style>
</head> </head>
<body> <body>

7
lib/pleroma/web/templates/twitter_api/util/password_reset.html.eex
View File

@ -1,12 +1,13 @@
<h2>Password Reset for <%= @user.nickname %></h2> <h2>Password Reset for <%= @user.nickname %></h2>
<%= form_for @conn, util_path(@conn, :password_reset), [as: "data"], fn f -> %> <%= form_for @conn, util_path(@conn, :password_reset), [as: "data"], fn f -> %>
<div class="form-row">
<%= label f, :password, "Password" %> <%= label f, :password, "Password" %>
<%= password_input f, :password %> <%= password_input f, :password %>
<br> </div>
<div class="form-row">
<%= label f, :password_confirmation, "Confirmation" %> <%= label f, :password_confirmation, "Confirmation" %>
<%= password_input f, :password_confirmation %> <%= password_input f, :password_confirmation %>
<br> </div>
<%= hidden_input f, :token, value: @token.token %> <%= hidden_input f, :token, value: @token.token %>
<%= submit "Reset" %> <%= submit "Reset" %>
<% end %> <% end %>