Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one

1 files changed, 15 insertions, 10 deletions

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index cba552433..41654af55 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -186,17 +186,22 @@ $content-width: 840px;
 
       padding-bottom: 40px;
       border-bottom: 1px solid lighten($ui-base-color, 8%);
-      margin-bottom: 40px;
+
+      margin: -15px -15px 40px 0;
 
       flex-wrap: wrap;
       align-items: center;
-
       justify-content: space-between;
 
+      & > * {
+        margin-top: 15px;
+        margin-right: 15px;
+      }
+
       &-actions {
         display: inline-flex;
 
-        & > * {
+        & > :not(:first-child) {
           margin-left: 5px;
         }
       }
@@ -227,8 +232,7 @@ $content-width: 840px;
     }
 
     h4 {
-      text-transform: uppercase;
-      font-size: 13px;
+      font-size: 14px;
       font-weight: 700;
       color: $darker-text-color;
       padding-bottom: 8px;
@@ -403,8 +407,7 @@ body,
 
     strong {
       font-weight: 500;
-      text-transform: uppercase;
-      font-size: 12px;
+      font-size: 13px;
 
       @each $lang in $cjk-langs {
         &:lang(#{$lang}) {
@@ -417,8 +420,7 @@ body,
       display: inline-block;
       color: $darker-text-color;
       text-decoration: none;
-      text-transform: uppercase;
-      font-size: 12px;
+      font-size: 13px;
       font-weight: 500;
       border-bottom: 2px solid $ui-base-color;
 
@@ -784,7 +786,6 @@ a.name-tag,
       flex: 0 0 auto;
       font-weight: 500;
       color: $darker-text-color;
-      text-transform: uppercase;
       text-align: right;
 
       a {
@@ -910,3 +911,7 @@ a.name-tag,
     color: $primary-text-color;
   }
 }
+
+.center-text {
+  text-align: center;
+}