Merge tag 'v2.9.3' into hometown-2.9.3

2019-08-19 14:28:19 -07:00
parent f66e192c2e 06f906acac
commit 6c2e2969ca
98 changed files with 852 additions and 270 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -4071,6 +4071,11 @@ a.status-card.compact:hover {
  }
 }

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