about summary refs log tree commit diff
path: root/app/assets
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-04-02 12:36:26 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-04-02 12:36:26 +0200
commit34aff3e269de6d4e8823e0814e660a257c415625 (patch)
tree8c66a6c35f787ee834a2863a07f8b663a6759ed2 /app/assets
parente70661b495fc0e302bdd1d658bca320381ffa9f4 (diff)
parentf693ab69f3596c689d9df9ea2e749dc614839a8e (diff)
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/accounts.scss1
-rw-r--r--app/assets/stylesheets/components.scss1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/accounts.scss b/app/assets/stylesheets/accounts.scss
index 7c48c91f3..25e24a95a 100644
--- 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;
     }
   }
 }
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index d87e09453..422927195 100644
--- 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;