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

2019-06-28 12:11:45 +02:00
parent 6ad870a410 ca8944728f
commit c8ba75b963
8 changed files with 74 additions and 5 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -3996,6 +3996,11 @@ a.status-card.compact:hover {
  }
 }

+.search-results__info {
+  padding: 10px;
+  color: $secondary-text-color;
+}
+
 .modal-root {
  position: relative;
  transition: opacity 0.3s linear;