A couple more ui tweaks

This commit is contained in:
asonix 2020-03-26 14:19:23 -05:00
parent f11043e57d
commit 66c7e9d299
3 changed files with 36 additions and 18 deletions

View file

@ -63,12 +63,12 @@ section {
} }
.info { .info {
border-bottom: 1px solid #e5e5e5;
padding-bottom: 36px; padding-bottom: 36px;
} }
li { li {
padding-top: 36px; padding-top: 36px;
border-bottom: 1px solid #e5e5e5;
} }
.padded { .padded {
@ -82,10 +82,13 @@ section {
a { a {
&, &,
&:focus, &:focus,
&:hover,
&:active { &:active {
color: #c92a60; color: #c92a60;
} }
&:hover {
color: #9d2a60;
}
} }
} }
@ -113,10 +116,13 @@ pre {
a { a {
&, &,
&:focus, &:focus,
&:hover,
&:active { &:active {
color: #f9a6c2; color: #f9a6c2;
} }
&:hover {
color: #f2739f;
}
} }
footer { footer {
@ -142,16 +148,18 @@ footer {
} }
.instance-info { .instance-info {
background-color: #f5f5f5;
border-top: 1px solid #e5e5e5;
border-bottom: 1px solid #e5e5e5;
padding: 24px; padding: 24px;
padding-bottom: 36px; padding-bottom: 36px;
border-top: 1px solid #e5e5e5;
background-color: #f5f5f5;
.instance-description { .instance-description {
margin: 0; margin: 0;
margin-bottom: 24px; margin-bottom: 24px;
} }
.instance-admin {
margin: 24px 0;
}
} }
a { a {

View file

@ -1,6 +1,7 @@
@use crate::data::Contact; @use crate::data::Contact;
@use activitystreams::primitives::XsdAnyUri;
@(contact: &Contact) @(contact: &Contact, base: &XsdAnyUri)
<div class="admin"> <div class="admin">
<div class="left"> <div class="left">
@ -10,6 +11,10 @@
</div> </div>
<div class="right"> <div class="right">
<p class="display-name"><a href="@contact.url">@contact.display_name</a></p> <p class="display-name"><a href="@contact.url">@contact.display_name</a></p>
<p class="username">@@@contact.username</p> @if let Some(domain) = base.as_url().domain() {
<p class="username">@@@contact.username@@@domain</p>
} else {
<p class="username">@@@contact.username</p>
}
</div> </div>
</div> </div>

View file

@ -18,15 +18,20 @@
Registration is closed Registration is closed
} }
</p> </p>
<div class="instance-info"> @if !instance.description.trim().is_empty() || contact.is_some() {
<h5 class="instance-description">Description:</h5> <div class="instance-info">
<div class="description"> @if !instance.description.trim().is_empty() {
<div class="please-stay"> <h5 class="instance-description">@instance.title's description:</h5>
@Html(&instance.description) <div class="description">
</div> <div class="please-stay">
@Html(instance.description.trim())
</div>
</div>
}
@if let Some(contact) = contact {
<h5 class="instance-admin">@instance.title's admin:</h5>
@:admin(contact, base)
}
</div> </div>
@if let Some(contact) = contact { }
@:admin(contact)
}
</div>
</article> </article>