projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[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 7a50c3e03b8ea2112d8e33d3e06253c7991ee4a5..b3cf9ed1151a57cac52ee8d30ae76d39b31eedcb 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 {
@@
-63,13
+63,14
@@
.scopes-input {
display: flex;
.scopes-input {
display: flex;
+ flex-direction: column;
margin-top: 1em;
text-align: left;
color: #89898a;
}
.scopes-input label:first-child {
margin-top: 1em;
text-align: left;
color: #89898a;
}
.scopes-input label:first-child {
-
flex-basis: 40%
;
+
height: 2em
;
}
.scopes {
}
.scopes {
@@
-80,13
+81,22
@@
}
.scope {
}
.scope {
- flex-basis: 100%;
display: flex;
display: flex;
+ flex-basis: 100%;
height: 2em;
align-items: center;
}
height: 2em;
align-items: center;
}
+ .scope:before {
+ color: #b9b9ba;
+ content: "✔\fe0e";
+ margin-left: 1em;
+ margin-right: 1em;
+ }
+
[type="checkbox"] + label {
[type="checkbox"] + label {
+ display: none;
+ cursor: pointer;
margin: 0.5em;
}
margin: 0.5em;
}
@@
-95,10
+105,12
@@
}
[type="checkbox"] + label:before {
}
[type="checkbox"] + label:before {
+ cursor: pointer;
display: inline-block;
color: white;
background-color: #121a24;
border: 4px solid #121a24;
display: inline-block;
color: white;
background-color: #121a24;
border: 4px solid #121a24;
+ box-shadow: 0px 0px 1px 0 #d8a070;
box-sizing: border-box;
width: 1.2em;
height: 1.2em;
box-sizing: border-box;
width: 1.2em;
height: 1.2em;
@@
-116,6
+128,7
@@
}
input:focus {
}
input:focus {
+ outline: none;
border-bottom: 2px solid #d8a070;
}
border-bottom: 2px solid #d8a070;
}
@@
-127,7
+140,8
@@
border-radius: 4px;
border: none;
padding: 10px;
border-radius: 4px;
border: none;
padding: 10px;
- margin-top: 30px;
+ margin-top: 20px;
+ margin-bottom: 20px;
text-transform: uppercase;
font-size: 16px;
box-shadow: 0px 0px 2px 0px black,
text-transform: uppercase;
font-size: 16px;
box-shadow: 0px 0px 2px 0px black,
@@
-146,8
+160,8
@@
box-sizing: border-box;
width: 100%;
background-color: #931014;
box-sizing: border-box;
width: 100%;
background-color: #931014;
+ border: 1px solid #a06060;
border-radius: 4px;
border-radius: 4px;
- border: none;
padding: 10px;
margin-top: 20px;
font-weight: 500;
padding: 10px;
margin-top: 20px;
font-weight: 500;
@@
-170,19
+184,45
@@
margin-top: 0
}
margin-top: 0
}
- .scope
s-input
{
- flex-
direction: column
;
+ .scope {
+ flex-
basis: 0%
;
}
}
- .scope {
- flex-basis: 50%;
+ .scope:before {
+ content: "";
+ margin-left: 0em;
+ margin-right: 1em;
+ }
+
+ .scope:first-child:before {
+ margin-left: 1em;
+ content: "✔\fe0e";
}
}
+
+ .scope:after {
+ content: ",";
+ }
+
+ .scope:last-child:after {
+ 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>