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

2019-03-26 17:39:20 +01:00
parent 872eab5784 6df4a82969
commit fae53e1a39
11 changed files with 53 additions and 11 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4128,6 +4128,7 @@ a.status-card.compact:hover {

 .confirmation-modal__action-bar,
 .mute-modal__action-bar {
+  .confirmation-modal__secondary-button,
  .confirmation-modal__cancel-button,
  .mute-modal__cancel-button {
    background-color: transparent;