projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/new-registrations-digest
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
layout
/
app.html.eex
diff --git
a/lib/pleroma/web/templates/layout/app.html.eex
b/lib/pleroma/web/templates/layout/app.html.eex
index 7d2d609d13f6780bd51f28d2c5948188b3d71c0b..5836ec1e0b705bf6f5bc02cfadb5c6c9ee3f1352 100644
(file)
--- a/
lib/pleroma/web/templates/layout/app.html.eex
+++ b/
lib/pleroma/web/templates/layout/app.html.eex
@@
-4,7
+4,7
@@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
<title>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
<title>
- <%=
Application.get_env(:pleroma, :instance)[:name]
%>
+ <%=
Pleroma.Config.get([:instance, :name])
%>
</title>
<style>
body {
</title>
<style>
body {
@@
-36,6
+36,11
@@
margin-bottom: 20px;
}
margin-bottom: 20px;
}
+ a {
+ color: color: #d8a070;
+ text-decoration: none;
+ }
+
form {
width: 100%;
}
form {
width: 100%;
}
@@
-89,7
+94,7
@@
.scope:before {
color: #b9b9ba;
.scope:before {
color: #b9b9ba;
- content: "✔";
+ content: "✔
\fe0e
";
margin-left: 1em;
margin-right: 1em;
}
margin-left: 1em;
margin-right: 1em;
}
@@
-161,7
+166,6
@@
width: 100%;
background-color: #931014;
border: 1px solid #a06060;
width: 100%;
background-color: #931014;
border: 1px solid #a06060;
- color: #902020;
border-radius: 4px;
padding: 10px;
margin-top: 20px;
border-radius: 4px;
padding: 10px;
margin-top: 20px;
@@
-197,7
+201,7
@@
.scope:first-child:before {
margin-left: 1em;
.scope:first-child:before {
margin-left: 1em;
- content: "✔";
+ content: "✔
\fe0e
";
}
.scope:after {
}
.scope:after {
@@
-208,11
+212,22
@@
content: "";
}
}
content: "";
}
}
+ .form-row {
+ display: flex;
+ }
+ .form-row > label {
+ text-align: left;
+ line-height: 47px;
+ flex: 1;
+ }
+ .form-row > input {
+ flex: 2;
+ }
</style>
</head>
<body>
<div class="container">
</style>
</head>
<body>
<div class="container">
- <h1><%=
Application.get_env(:pleroma, :instance)[:name]
%></h1>
+ <h1><%=
Pleroma.Config.get([:instance, :name])
%></h1>
<%= render @view_module, @view_template, assigns %>
</div>
</body>
<%= render @view_module, @view_template, assigns %>
</div>
</body>