diff --git a/relay/frontend/base.haml b/relay/frontend/base.haml index 13b83e9..aa118bd 100644 --- a/relay/frontend/base.haml +++ b/relay/frontend/base.haml @@ -35,8 +35,13 @@ #container #header.section - %span#menu-open.button << ⁞ - %a(href="https://{{domain}}/") -> =config.name + %span#menu-open << ⁞ + %span.title-container + %a.title(href="/") -> =config.name + + -if view.request.path not in ["/", "/login"] + .page -> =page + .empty -if error diff --git a/relay/frontend/page/admin-domain_bans.haml b/relay/frontend/page/admin-domain_bans.haml index e2b3e5a..fc5010a 100644 --- a/relay/frontend/page/admin-domain_bans.haml +++ b/relay/frontend/page/admin-domain_bans.haml @@ -21,7 +21,7 @@ %thead %tr %td.domain << Instance - %td.date << Joined + %td << Joined %td.remove %tbody diff --git a/relay/frontend/page/admin-instances.haml b/relay/frontend/page/admin-instances.haml index b563383..c366acc 100644 --- a/relay/frontend/page/admin-instances.haml +++ b/relay/frontend/page/admin-instances.haml @@ -7,10 +7,13 @@ #add-instance %label(for="domain") << Domain %input(type="domain", id="domain" name="domain", placeholder="Domain") + %label(for="actor") << Actor URL %input(type="url", id="actor" name="actor", placeholder="Actor URL") + %label(for="inbox") << Inbox URL %input(type="url", id="inbox" name="inbox", placeholder="Inbox URL") + %label(for="software") << Software %input(name="software", id="software" placeholder="software") @@ -22,7 +25,7 @@ %tr %td.instance << Instance %td.software << Software - %td.date << Joined + %td << Joined %td.remove %tbody diff --git a/relay/frontend/style.css b/relay/frontend/style.css index 986426f..b489fb1 100644 --- a/relay/frontend/style.css +++ b/relay/frontend/style.css @@ -53,6 +53,7 @@ table { border: 1px solid var(--primary); border-radius: 5px; border-spacing: 0px; + width: 100%; } table tbody tr:nth-child(even) td { @@ -81,7 +82,8 @@ table td { table thead td { background-color: var(--primary); - color: var(--table-background) + color: var(--background); + text-align: center; } table tbody td { @@ -105,8 +107,17 @@ table tbody td { font-size: 2em; } -#header > *:nth-child(2) { +#header .title-container { + text-align: center; +} + +#header .title { font-weight: bold; + line-height: 0.75em; +} + +#header .page { + font-size: 0.5em; } #menu { @@ -153,11 +164,19 @@ table tbody td { color: var(--primary); } +#menu-open { + color: var(--primary); +} + +#menu-open:hover { + color: var(--primary-hover); +} + #menu-open, #menu-close { cursor: pointer; } -#menu-close, #menu-open { +#menu-open, #menu-close { min-width: 35px; text-align: center; } diff --git a/relay/frontend/style/domain_bans.css b/relay/frontend/style/domain_bans.css index 437ab98..af4705a 100644 --- a/relay/frontend/style/domain_bans.css +++ b/relay/frontend/style/domain_bans.css @@ -14,10 +14,6 @@ table .items { margin-top: var(--spacing); } -#domains table { - width: 100%; -} - #domains .domain { width: 100%; } @@ -27,10 +23,6 @@ table .items { text-align: right; } -#domains thead td { - text-align: center !important; -} - #add-domain { display: grid; grid-template-columns: max-content auto; diff --git a/relay/frontend/style/instances.css b/relay/frontend/style/instances.css index 8e8789b..256ca12 100644 --- a/relay/frontend/style/instances.css +++ b/relay/frontend/style/instances.css @@ -3,10 +3,6 @@ form input[type="submit"] { margin: 0 auto; } -#instances table { - width: 100%; -} - #instances .instance { width: 100%; } @@ -20,10 +16,6 @@ form input[type="submit"] { text-align: right; } -#instances thead td { - text-align: center !important; -} - #add-instance { display: grid; grid-template-columns: max-content auto;