diff options
author | Thibaut Girka <thib@sitedethib.com> | 2020-06-26 13:02:14 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2020-06-26 13:02:14 +0200 |
commit | a01674fb2b4eb210b300b380899d388b0807999a (patch) | |
tree | d497e4b75d85ad5e8dd29416775730d29e13f79d /app/javascript/styles/mastodon/admin.scss | |
parent | 8f4aff9b6fe638b26b9d0bf0fe4151c2cc214d6d (diff) | |
parent | 08cf81f8c1b445eba9972214869c376fe6097efb (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/javascript/styles/mastodon/admin.scss')
-rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 78dea92b9..fea64f45c 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -171,9 +171,7 @@ $content-width: 840px; } .content { - padding: 20px 15px; - padding-top: 60px; - padding-left: 25px; + padding: 55px 15px 20px 25px; @media screen and (max-width: $no-columns-breakpoint) { max-width: none; @@ -184,7 +182,7 @@ $content-width: 840px; &-heading { display: flex; - padding-bottom: 40px; + padding-bottom: 36px; border-bottom: 1px solid lighten($ui-base-color, 8%); margin: -15px -15px 40px 0; @@ -215,7 +213,7 @@ $content-width: 840px; h2 { color: $secondary-text-color; font-size: 24px; - line-height: 28px; + line-height: 36px; font-weight: 400; @media screen and (max-width: $no-columns-breakpoint) { @@ -544,6 +542,16 @@ body, max-width: 100%; } +.simple_form { + .actions { + margin-top: 15px; + } + + .button { + font-size: 15px; + } +} + .batch-form-box { display: flex; flex-wrap: wrap; |