merge upstream

src/components/emoji_reactions/emoji_reactions.vue

@@ -111,7 +111,6 @@
   border: 1px solid var(--accent, $fallback--link);
   margin-left: -1px; // offset the border, can't use inset shadows either
   margin-right: calc(0.5em - 1px);
-  box-shadow: 0 0 4px 4px rgba(255,255,255,.5) inset;
 }
 
 </style>

src/components/search/search.vue

@@ -170,6 +170,7 @@
   border-bottom: 1px solid;
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
+  padding: .75em;
 }
 
 .search-result-footer {