projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#468] Merged `upstream/develop`, resolved conflicts.
[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 2a8dede80b61ca82fcc9e12d461d5e40f42bf67b..db97ccac21445183448f066ea2f2e6229d361921 100644
(file)
--- a/
lib/pleroma/web/templates/layout/app.html.eex
+++ b/
lib/pleroma/web/templates/layout/app.html.eex
@@
-1,8
+1,11
@@
<!DOCTYPE html>
<html>
<head>
<!DOCTYPE html>
<html>
<head>
- <meta charset=utf-8 />
- <title>Pleroma</title>
+ <meta charset="utf-8" />
+ <meta name="viewport" content="width=device-width,initial-scale=1,minimal-ui" />
+ <title>
+ <%= Application.get_env(:pleroma, :instance)[:name] %>
+ </title>
<style>
body {
background-color: #282c37;
<style>
body {
background-color: #282c37;
@@
-51,6
+54,10
@@
border-bottom: 2px solid #4b8ed8;
}
border-bottom: 2px solid #4b8ed8;
}
+ input[type="checkbox"] {
+ width: auto;
+ }
+
button {
box-sizing: border-box;
width: 100%;
button {
box-sizing: border-box;
width: 100%;
@@
-64,6
+71,32
@@
font-weight: 500;
font-size: 16px;
}
font-weight: 500;
font-size: 16px;
}
+
+ .alert-danger {
+ box-sizing: border-box;
+ width: 100%;
+ color: #D8000C;
+ background-color: #FFD2D2;
+ border-radius: 4px;
+ border: none;
+ padding: 10px;
+ margin-top: 20px;
+ font-weight: 500;
+ font-size: 16px;
+ }
+
+ .alert-info {
+ box-sizing: border-box;
+ width: 100%;
+ color: #00529B;
+ background-color: #BDE5F8;
+ border-radius: 4px;
+ border: none;
+ padding: 10px;
+ margin-top: 20px;
+ font-weight: 500;
+ font-size: 16px;
+ }
</style>
</head>
<body>
</style>
</head>
<body>