squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OAuth form: add instance header

Browse Source
This commit is contained in:
Alex Gleason 2020-07-27 17:15:42 -05:00
parent 6afbd60af6
commit 2208e5d9ba
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +1,19 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" /> <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui">
<title> <title><%= Pleroma.Config.get([:instance, :name]) %></title>
<%= Pleroma.Config.get([:instance, :name]) %>
</title>
<link rel="stylesheet" href="/instance/static.css"> <link rel="stylesheet" href="/instance/static.css">
</head> </head>
<body> <body>
<div class="instance-header">
<div class="instance-header__content">
<img class="instance-header__thumbnail" src="<%= Pleroma.Config.get([:instance, :instance_thumbnail]) %>">
<h1 class="instance-header__title"><%= Pleroma.Config.get([:instance, :name]) %></h1>
</div>
</div>
<div class="container"> <div class="container">
<h1><%= Pleroma.Config.get([:instance, :name]) %></h1>
<%= render @view_module, @view_template, assigns %> <%= render @view_module, @view_template, assigns %>
</div> </div>
</body> </body>

39
priv/static/instance/static.css
View File

@ -1,16 +1,46 @@
* {
box-sizing: border-box;
}
body { body {
background-color: #121a24; background-color: #121a24;
font-family: sans-serif; font-family: sans-serif;
color: #b9b9ba; color: #b9b9ba;
padding: 0;
margin: 0;
}
.instance-header {
padding: 10px;
background: #182230;
box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.5);
}
.instance-header__content {
display: flex;
align-items: center;
max-width: 400px;
margin: 0 auto;
}
.instance-header__thumbnail {
max-width: 40px;
border-radius: 4px;
margin-right: 10px;
}
.instance-header__title {
font-size: 16px;
font-weight: bold;
} }
.container { .container {
max-width: 420px; max-width: 400px;
padding: 20px; padding: 20px;
background-color: #182230; background-color: #182230;
border-radius: 4px; border-radius: 4px;
margin: auto; margin: auto;
margin-top: 10vh; margin-top: 35px;
box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.5); box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.5);
} }
@ -104,7 +134,6 @@ input {
background-color: #121a24; background-color: #121a24;
border: 4px solid #121a24; border: 4px solid #121a24;
box-shadow: 0px 0px 1px 0 #d8a070; box-shadow: 0px 0px 1px 0 #d8a070;
box-sizing: border-box;
width: 1.2em; width: 1.2em;
height: 1.2em; height: 1.2em;
margin-right: 1.0em; margin-right: 1.0em;
@ -126,7 +155,6 @@ input:focus {
} }
button { button {
box-sizing: border-box;
width: 100%; width: 100%;
background-color: #1c2a3a; background-color: #1c2a3a;
color: #b9b9ba; color: #b9b9ba;
@ -150,7 +178,6 @@ button:hover {
} }
.alert-danger { .alert-danger {
box-sizing: border-box;
width: 100%; width: 100%;
background-color: #931014; background-color: #931014;
border: 1px solid #a06060; border: 1px solid #a06060;
@ -162,7 +189,6 @@ button:hover {
} }
.alert-info { .alert-info {
box-sizing: border-box;
width: 100%; width: 100%;
border-radius: 4px; border-radius: 4px;
border: 1px solid #7d796a; border: 1px solid #7d796a;
@ -174,7 +200,6 @@ button:hover {
.account-header { .account-header {
display: flex; display: flex;
margin: 20px 0;
} }
.account-header .avatar { .account-header .avatar {