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

app/javascript/styles/mastodon/components.scss

@@ -33,7 +33,7 @@
   cursor: pointer;
   display: inline-block;
   font-family: inherit;
-  font-size: 14px;
+  font-size: 15px;
   font-weight: 500;
   height: 36px;
   letter-spacing: 0;
@@ -42,7 +42,6 @@
   padding: 0 16px;
   position: relative;
   text-align: center;
-  text-transform: uppercase;
   text-decoration: none;
   text-overflow: ellipsis;
   transition: all 100ms ease-in;
@@ -887,9 +886,8 @@
   border: 0;
   color: $inverted-text-color;
   font-weight: 700;
-  font-size: 11px;
+  font-size: 12px;
   padding: 0 6px;
-  text-transform: uppercase;
   line-height: 20px;
   cursor: pointer;
   vertical-align: middle;
@@ -1411,8 +1409,7 @@ a .account__avatar {
 
   & > span {
     display: block;
-    text-transform: uppercase;
-    font-size: 11px;
+    font-size: 12px;
     color: $darker-text-color;
   }
 
@@ -2760,9 +2757,8 @@ a.account__display-name {
   background: $ui-base-color;
   color: $dark-text-color;
   padding: 8px 20px;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: 500;
-  text-transform: uppercase;
   cursor: default;
 }
 
@@ -2827,8 +2823,7 @@ a.account__display-name {
     margin-top: 10px;
 
     h4 {
-      font-size: 12px;
-      text-transform: uppercase;
+      font-size: 13px;
       color: $darker-text-color;
       padding: 10px;
       font-weight: 500;
@@ -3350,9 +3345,8 @@ a.status-card.compact:hover {
 
 .loading-indicator {
   color: $dark-text-color;
-  font-size: 12px;
+  font-size: 13px;
   font-weight: 400;
-  text-transform: uppercase;
   overflow: visible;
   position: absolute;
   top: 50%;
@@ -3716,8 +3710,7 @@ a.status-card.compact:hover {
   display: block;
   vertical-align: top;
   background-color: $base-overlay-background;
-  text-transform: uppercase;
-  font-size: 11px;
+  font-size: 12px;
   font-weight: 500;
   padding: 4px;
   border-radius: 4px;
@@ -3969,8 +3962,7 @@ a.status-card.compact:hover {
   }
 
   span {
-    font-size: 12px;
-    text-transform: uppercase;
+    font-size: 13px;
     font-weight: 500;
     display: block;
   }
@@ -4569,8 +4561,7 @@ a.status-card.compact:hover {
     font-weight: 500;
     color: $inverted-text-color;
     margin-bottom: 5px;
-    text-transform: uppercase;
-    font-size: 12px;
+    font-size: 13px;
   }
 
   &__case {