sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/masto-styled-login-page' into 'develop'

Browse Source 
Add styles to make login page resemble mastodon's

See merge request pleroma/pleroma!20
This commit is contained in:
lambda 2017-11-16 12:01:07 +00:00
commit a2d7e0f4d4
2 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,9 +3,73 @@
<head> <head>
<meta charset=utf-8 /> <meta charset=utf-8 />
<title>Pleroma</title> <title>Pleroma</title>
<style>
body {
background-color: #282c37;
font-family: sans-serif;
color:white;
text-align: center;
}
.container {
margin: 50px auto;
max-width: 320px;
padding: 0;
padding: 40px 40px 40px 40px;
background-color: #313543;
border-radius: 4px;
}
h1 {
margin: 0;
}
h2 {
color: #9baec8;
font-weight: normal;
font-size: 20px;
margin-bottom: 40px;
}
form {
width: 100%;
}
input {
box-sizing: border-box;
width: 100%;
padding: 10px;
margin-top: 20px;
background-color: rgba(0,0,0,.1);
color: white;
border: 0;
border-bottom: 2px solid #9baec8;
font-size: 14px;
}
input:focus {
border-bottom: 2px solid #4b8ed8;
}
button {
box-sizing: border-box;
width: 100%;
color: white;
background-color: #419bdd;
border-radius: 4px;
border: none;
padding: 10px;
margin-top: 30px;
text-transform: uppercase;
font-weight: 500;
font-size: 16px;
}
</style>
</head> </head>
<body> <body>
<h1>Welcome to Pleroma</h1> <div class="container">
<h1>Pleroma</h1>
<%= render @view_module, @view_template, assigns %> <%= render @view_module, @view_template, assigns %>
</div>
</body> </body>
</html> </html>

8
lib/pleroma/web/templates/mastodon_api/mastodon/login.html.eex
View File

@ -1,10 +1,8 @@
<h2>Login in to Mastodon Frontend</h2> <h2>Login in to Mastodon Frontend</h2>
<%= form_for @conn, mastodon_api_path(@conn, :login), [as: "authorization"], fn f -> %> <%= form_for @conn, mastodon_api_path(@conn, :login), [as: "authorization"], fn f -> %>
<%= label f, :name, "Name" %> <%= text_input f, :name, placeholder: "Username" %>
<%= text_input f, :name %>
<br> <br>
<%= label f, :password, "Password" %> <%= password_input f, :password, placeholder: "Password" %>
<%= password_input f, :password %>
<br> <br>
<%= submit "Authorize" %> <%= submit "Log in" %>
<% end %> <% end %>