diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-12-23 17:43:21 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-12-23 17:43:21 +0000 |
| commit | f76c1d4f70fdda6da621a46fb75891e68e266946 (patch) | |
| tree | 328aec763c24b6426decd30fe3b6a4674510bbee /priv/static/instance | |
| parent | d8e326467c30b95c5164f6e29512057dce3c2077 (diff) | |
| parent | 91c22637de5f1683a32207a606c33e7ef3b84676 (diff) | |
| download | pleroma-f76c1d4f70fdda6da621a46fb75891e68e266946.tar.gz pleroma-f76c1d4f70fdda6da621a46fb75891e68e266946.zip | |
Merge branch 'release/2.5.0' into 'stable'
Release 2.5.0
See merge request pleroma/pleroma!3816
Diffstat (limited to 'priv/static/instance')
| -rw-r--r-- | priv/static/instance/panel.html | 4 | ||||
| -rw-r--r-- | priv/static/instance/static.css | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html index 7e73e4824..6d901e61d 100644 --- a/priv/static/instance/panel.html +++ b/priv/static/instance/panel.html @@ -1,5 +1,5 @@ <div style="margin-left:12px; margin-right:12px"> -<p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p> -<p><a href="/main/all">Pleroma FE</a> | <a href="/web">Mastodon FE</a></p> +<p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p> +<p><a href="/main/all">Pleroma FE</a></p> </div> diff --git a/priv/static/instance/static.css b/priv/static/instance/static.css index 487e1ec27..48c74c125 100644 --- a/priv/static/instance/static.css +++ b/priv/static/instance/static.css @@ -51,6 +51,7 @@ body { overflow: hidden; margin: 35px auto; box-shadow: 0 1px 4px 0px rgba(0, 0, 0, 0.5); + padding: 0em 1em 0em 1em; } .container__content { @@ -86,7 +87,6 @@ form { } input { - box-sizing: content-box; padding: 10px; margin-top: 5px; margin-bottom: 10px; @@ -97,6 +97,8 @@ input { transition-duration: 0.35s; border-bottom: 2px solid #2a384a; font-size: 14px; + width: inherit; + box-sizing: border-box; } .scopes-input { |