Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master

8 years ago · 34aff3e269
parent e70661b495 f693ab69f3
commit 34aff3e269
2 changed files with 2 additions and 0 deletions
--- a/app/assets/stylesheets/accounts.scss
+++ b/app/assets/stylesheets/accounts.scss
@ -311,6 +311,7 @@
      padding: 10px;
      padding-top: 15px;
      color: $color3;
      word-wrap: break-word;
    }
  }
 }
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@ -424,6 +424,7 @@ a.status__content__spoiler-link {
 .account__header__content {
  word-wrap: break-word;
  word-break: break-all;
  font-weight: 400;
  overflow: hidden;
  color: $color3;