new styles for static pages

This commit is contained in:
Henry Jameson 2025-08-12 02:31:47 +03:00
commit baa8004a2a
4 changed files with 287 additions and 244 deletions

View file

@ -13,8 +13,10 @@
<h1 class="instance-header__title"><%= Pleroma.Config.get([:instance, :name]) %></h1> <h1 class="instance-header__title"><%= Pleroma.Config.get([:instance, :name]) %></h1>
</a> </a>
</div> </div>
<div class="container"> <div class="contents">
<div class="panel">
<%= @inner_content %> <%= @inner_content %>
</div> </div>
</div>
</body> </body>
</html> </html>

View file

@ -5,10 +5,19 @@
<% # Note: using hidden input with `unchecked_value` in order to distinguish user's empty selection from `scope` param being omitted %> <% # Note: using hidden input with `unchecked_value` in order to distinguish user's empty selection from `scope` param being omitted %>
<%= if scope in @scopes do %> <%= if scope in @scopes do %>
<div class="scope"> <div class="scope">
<span class="checkbox">
<%= checkbox @form, :"scope_#{scope}", value: scope in @scopes && scope, checked_value: scope, unchecked_value: "", name: "authorization[scope][]" %> <%= checkbox @form, :"scope_#{scope}", value: scope in @scopes && scope, checked_value: scope, unchecked_value: "", name: "authorization[scope][]" %>
<%= label @form, :"scope_#{scope}", String.capitalize(scope) %> <%= label @form, :"scope_#{scope}", "" %>
</span>
<%= if scope in @scopes && scope do %> <%= if scope in @scopes && scope do %>
<code><%= scope %></code> <%= :"Elixir.Gettext".dgettext(Gettext, "oauth_scopes", scope) %> <dl>
<dt>
<%= :"Elixir.Gettext".dgettext(Gettext, "oauth_scopes", scope) %>
</dt>
<dd>
<code><%= scope %></code>
</dd>
</dl>
<% end %> <% end %>
</div> </div>
<% else %> <% else %>

View file

@ -9,7 +9,10 @@
<%= if @user do %> <%= if @user do %>
<div class="account-header"> <div class="account-header">
<div class="account-header__banner" style="background-image: url('<%= Pleroma.User.banner_url(@user) %>')"></div> <div class="account-header_container">
<img class="account-header__banner" src="<%= Pleroma.User.banner_url(@user) %>">
<div class="account-header__overlay"></div>
</div>
<div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div> <div class="account-header__avatar" style="background-image: url('<%= Pleroma.User.avatar_url(@user) %>')"></div>
<div class="account-header__meta"> <div class="account-header__meta">
<div class="account-header__display-name"><%= @user.name %></div> <div class="account-header__display-name"><%= @user.name %></div>
@ -18,7 +21,7 @@
</div> </div>
<% end %> <% end %>
<div class="container__content"> <div class="panel-body">
<%= if @app do %> <%= if @app do %>
<p><%= raw Gettext.dpgettext("static_pages", "oauth authorize message", "Application <strong>%{client_name}</strong> is requesting access to your account.", client_name: safe_to_string(html_escape(@app.client_name))) %></p> <p><%= raw Gettext.dpgettext("static_pages", "oauth authorize message", "Application <strong>%{client_name}</strong> is requesting access to your account.", client_name: safe_to_string(html_escape(@app.client_name))) %></p>
<%= render Phoenix.Controller.view_module(@conn), "_scopes.html", Map.merge(assigns, %{form: f}) %> <%= render Phoenix.Controller.view_module(@conn), "_scopes.html", Map.merge(assigns, %{form: f}) %>
@ -29,7 +32,7 @@
<a class="button button--cancel" href="/"> <a class="button button--cancel" href="/">
<%= Gettext.dpgettext("static_pages", "oauth authorize cancel button", "Cancel") %> <%= Gettext.dpgettext("static_pages", "oauth authorize cancel button", "Cancel") %>
</a> </a>
<%= submit Gettext.dpgettext("static_pages", "oauth authorize approve button", "Approve"), class: "button--approve" %> <%= submit Gettext.dpgettext("static_pages", "oauth authorize approve button", "Approve"), class: "button button--approve" %>
</div> </div>
<% else %> <% else %>
<%= if @params["registration"] in ["true", true] do %> <%= if @params["registration"] in ["true", true] do %>
@ -51,7 +54,9 @@
<%= label f, :password, Gettext.dpgettext("static_pages", "oauth login password prompt", "Password") %> <%= label f, :password, Gettext.dpgettext("static_pages", "oauth login password prompt", "Password") %>
<%= password_input f, :password %> <%= password_input f, :password %>
</div> </div>
<%= submit Gettext.dpgettext("static_pages", "oauth login button", "Log In") %> <div class="actions">
<%= submit Gettext.dpgettext("static_pages", "oauth login button", "Log In"), class: "button button--approve" %>
</div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>

View file

@ -3,206 +3,84 @@
} }
:root { :root {
--brand-color: #d8a070; font-size: 16px;
--background-color: #121a24;
--foreground-color: #182230; --bg: rgba(18, 26, 36, 1);
--primary-text-color: #b9b9ba; --fg: rgba(24, 34, 48, 1);
--muted-text-color: #89898a; --text: rgba(185, 185, 186, 1);
--link: rgba(216, 160, 112, 1);
--accent: rgba(216, 160, 112, 1);
--cRed: rgba(211, 16, 20, 1);
--cBlue: rgba(0, 149, 255, 1);
--cGreen: rgba(15, 160, 15, 1);
--cOrange: rgba(255, 165, 0, 1);
--font: sans-serif;
--monoFont: monospace;
--wallpaper: rgba(14, 21, 29, 1);
--selectionBackground: rgba(216, 160, 112, 1);
--selectionText: rgba(0, 0, 0, 1);
--badgeNotification: rgba(211, 16, 20, 1);
} }
body { body {
background-color: var(--background-color); background-color: var(--wallpaper);
font-family: sans-serif; font-family: sans-serif;
color: var(--primary-text-color); color: var(--text);
padding: 0; padding: 0;
margin: 0; margin: 0;
}
.instance-header {
height: 60px;
padding: 10px;
background: var(--foreground-color);
box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.5);
}
.instance-header__content {
display: flex; display: flex;
align-items: center; flex-direction: column;
max-width: 400px; align-items: stretch;
margin: 0 auto;
}
.instance-header__thumbnail {
max-width: 40px;
border-radius: 4px;
margin-right: 12px;
}
.instance-header__title {
font-size: 16px;
font-weight: bold;
color: var(--primary-text-color);
}
.container {
max-width: 400px;
background-color: var(--foreground-color);
border-radius: 4px;
overflow: hidden;
margin: 35px auto;
box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.5);
padding: 0em 1em 0em 1em;
}
.container__content {
padding: 0 20px;
}
h1 {
margin: 0;
font-size: 24px;
text-align: center;
}
h2 {
color: var(--primary-text-color);
font-weight: normal;
font-size: 18px;
margin-bottom: 20px;
} }
a { a {
color: var(--brand-color); color: var(--link);
text-decoration: none; text-decoration: none;
} }
form { .button {
width: 100%;
}
.input {
color: var(--muted-text-color);
display: flex;
flex-direction: column;
}
input {
padding: 10px;
margin-top: 5px;
margin-bottom: 10px;
background-color: var(--background-color);
color: var(--primary-text-color);
border: 0;
transition-property: border-bottom;
transition-duration: 0.35s;
border-bottom: 2px solid #2a384a;
font-size: 14px;
width: inherit;
box-sizing: border-box;
}
.scopes-input {
display: flex;
flex-direction: column;
margin: 1em 0;
color: var(--muted-text-color);
}
.scopes-input label:first-child {
height: 2em;
}
.scopes {
display: flex;
flex-wrap: wrap;
color: var(--primary-text-color);
}
.scope {
display: flex;
flex-basis: 100%;
height: 2em;
align-items: center;
}
.scope:before {
color: var(--primary-text-color);
content: "✔\fe0e";
margin-left: 1em;
margin-right: 1em;
}
[type="checkbox"] + label {
display: none;
cursor: pointer;
margin: 0.5em;
}
[type="checkbox"] {
display: none;
}
[type="checkbox"] + label:before {
cursor: pointer;
display: inline-block;
color: white;
background-color: var(--background-color);
border: 4px solid var(--background-color);
box-shadow: 0px 0px 1px 0 var(--brand-color);
width: 1.2em;
height: 1.2em;
margin-right: 1.0em;
content: "";
transition-property: background-color;
transition-duration: 0.35s;
color: var(--background-color);
margin-bottom: -0.2em;
border-radius: 2px;
}
[type="checkbox"]:checked + label:before {
background-color: var(--brand-color);
}
input:focus {
outline: none;
border-bottom: 2px solid var(--brand-color);
}
.actions {
display: flex;
justify-content: flex-end;
}
.actions button,
.actions a.button {
width: auto;
margin-left: 10px;
}
a.button,
button {
width: 100%; width: 100%;
background-color: #1c2a3a; background-color: #1c2a3a;
color: var(--primary-text-color); color: var(--primary-text-color);
border-radius: 4px; border-radius: 4px;
border: none; border: none;
padding: 10px 16px; padding: 0 1em;
margin-top: 20px; line-height: 2;
margin-bottom: 20px; margin-top: 2em;
text-transform: uppercase; font-size: 1em;
font-size: 16px; cursor: pointer;
box-shadow: 0px 0px 2px 0px black, box-shadow:
0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0 0 2px 0 black,
0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset; 0 1px 0 0 rgba(255, 255, 255, 0.2) inset,
0 -1px 0 0 rgba(0, 0, 0, 0.2) inset;
} }
a.button:hover, .button:hover {
button:hover { box-shadow:
cursor: pointer; 0 0 1px 2px rgba(185, 185, 186, 0.4),
box-shadow: 0px 0px 0px 1px var(--brand-color), 0 1px 0 0 rgba(255, 255, 255, 0.2) inset,
0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0 -1px 0 0 rgba(0, 0, 0, 0.2) inset;
0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset; }
.button:active {
transform: translate(1px, 1px);
box-shadow:
0 0 2px 0 black,
0 -1px 0 0 rgba(255, 255, 255, 0.2) inset,
0 1px 0 0 rgba(0, 0, 0, 0.2) inset;
}
.button:hover:active {
box-shadow:
0 0 1px 2px rgba(185, 185, 186, 0.4),
0 -1px 0 0 rgba(255, 255, 255, 0.2) inset,
0 1px 0 0 rgba(0, 0, 0, 0.2) inset;
}
.input {
color: var(--text);
display: flex;
flex-direction: column;
} }
.alert-danger { .alert-danger {
@ -226,73 +104,222 @@ button:hover {
font-size: 16px; font-size: 16px;
} }
.account-header__banner { .instance-header {
display: flex;
height: 3.5rem;
padding: 0 1em;
background: var(--fg);
box-shadow:
0 1px 4px 0 rgba(0, 0, 0, 0.4),
0 2px 7px 0 rgba(0, 0, 0, 0.3);
justify-content: center;
align-self: stretch;
margin-bottom: 1rem;
}
.instance-header__content {
line-height: 3.5rem;
display: flex;
flex: 1 1 45em;
max-width: 45em;
align-items: center;
}
.instance-header__thumbnail {
max-width: 3.5em;
border-radius: 0.25em;
margin-right: 0.75em;
}
.instance-header__title {
font-weight: bold;
color: var(--text);
font-size: 1rem;
}
.contents {
display: flex;
align-items: stretch;
justify-content: center;
}
.panel {
color: var(--text);
background-color: var(--bg);
position: relative;
max-width: 45em;
border-radius: 0.5em;
overflow: hidden;
margin: 0;
box-shadow:
0 0 3px 0 rgba(0, 0, 0, 0.5),
0 4px 6px 3px rgba(0, 0, 0, 0.3);
padding: 0;
flex: 1 1 45em;
}
.button {
width: auto;
}
.panel-body {
padding: 0 1em 1em;
background-color: var(--bg);
}
.actions {
display: flex;
justify-content: flex-end;
}
.actions .button {
margin-left: 0.5em;
}
.account-header {
position: relative;
display: flex;
align-items: end;
width: 100%;
aspect-ratio: 3;
gap: 1em;
padding: 0 1em;
}
.account-header_container {
position: absolute;
inset: 0;
z-index: 0;
mask: linear-gradient(to top,transparent 0,white 5em) bottom no-repeat;
}
.account-header__overlay,
.account-header__banner {
position: absolute;
width: 100%;
inset: 0;
}
.account-header__overlay {
background-color: rgba(18, 26, 36, 0.5);
z-index: -1;
}
.account-header__banner {
z-index: -2;
object-fit: cover;
width: 100%; width: 100%;
height: 112px;
background-size: cover;
background-position: center;
} }
.account-header__avatar { .account-header__avatar {
width: 94px; width: 6em;
height: 94px; height: 6em;
flex: 0 0 6em;
z-index: 1;
background-size: cover; background-size: cover;
background-position: center; background-position: center;
margin: -47px 10px 0;
border: 6px solid var(--foreground-color);
border-radius: 999px;
} }
.account-header__meta { .account-header__meta {
padding: 6px 20px 17px; z-index: 1;
flex: 1 1 0;
display: flex;
flex-direction: column;
min-width: 10em;
font-size: 125%;
} }
.account-header__nickname,
.account-header__display-name { .account-header__display-name {
font-size: 20px; font-size: 1.25em;
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;
}
.acocunt-header__display-name {
font-weight: bold; font-weight: bold;
} }
.account-header__nickname { .account-header__nickname {
font-size: 14px; font-size: 0.75em;
color: var(--muted-text-color); color: var(--link);
} }
@media all and (max-width: 420px) { input {
.container { display: inline-block;
margin: 0 auto; background-color: var(--background);
border-radius: 0; outline: none;
color: var(--text);
line-height: 2;
border-radius: 0.5em;
box-shadow: var(--shadow);
border: none;
padding: 0 0.5em;
}
input[type="checkbox"] {
display: none;
}
input, label, label::before {
--background: rgba(15, 21, 30, 1);
--shadow:
0 0 2px 0 rgba(0, 0, 0, 1),
0 -1px 0 0 rgba(255, 255, 255, 0.2) inset,
0 1px 0 0 rgba(0, 0, 0, 0.2) inset,
0 0 2px 0 rgba(0, 0, 0, 0.15) inset,
1px 0 1px 1px rgba(185, 185, 186, 0.15),
-1px 0 1px 1px rgba(185, 185, 186, 0.15);
--shadowHover:
0 0 4px 0 rgba(185, 185, 186, 0.5),
0 -1px 0 0 rgba(255, 255, 255, 0.2) inset,
0 1px 0 0 rgba(0, 0, 0, 0.2) inset,
0 0 2px 0 rgba(0, 0, 0, 0.15) inset,
1px 0 1px 1px rgba(185, 185, 186, 0.15),
-1px 0 1px 1px rgba(185, 185, 186, 0.15);
}
label[type="checkbox"]::before {
content: ""
}
input[type="checkbox"]:checked + label::before {
content: "✓"
}
label {
padding: 1em;
display: inline-block;
}
input[type="checkbox"] + label::before {
content: "";
box-shadow:
min-width: 1em;
min-height: 1em;
text-align: center;
box-shadow: var(--shadow);
}
label:hover::before {
box-shadow: var(--shadowHover);
} }
.scope { .scope {
flex-basis: 0%;
}
.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; display: flex;
align-items: center;
dl {
margin: 0.75em;
display: flex;
flex-direction: column;
dt, dd {
margin: 0;
} }
.form-row > label {
line-height: 47px;
flex: 1;
} }
.form-row > input {
flex: 2;
} }