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

app/javascript/styles/mastodon/components.scss

@@ -337,7 +337,6 @@
     position: absolute;
     top: 5px;
     right: 5px;
-    z-index: 1;
   }
 
   .compose-form__autosuggest-wrapper {
@@ -413,15 +412,6 @@
     height: 0;
   }
 
-  .emoji-picker-wrapper {
-    position: relative;
-    height: 0;
-
-    &.emoji-picker-wrapper--hidden {
-      display: none;
-    }
-  }
-
   .autosuggest-textarea__suggestions {
     box-sizing: border-box;
     display: none;
@@ -1965,11 +1955,6 @@ a.account__display-name {
     font-size: 16px;
   }
 
-  &.active {
-    border-bottom: 2px solid $highlight-text-color;
-    color: $highlight-text-color;
-  }
-
   &:hover,
   &:focus,
   &:active {
@@ -1979,6 +1964,11 @@ a.account__display-name {
     }
   }
 
+  &.active {
+    border-bottom: 2px solid $highlight-text-color;
+    color: $highlight-text-color;
+  }
+
   span {
     margin-left: 5px;
     display: none;