diff options
author | Chocobozzz <chocobozzz@framasoft.org> | 2018-04-20 08:17:29 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@framasoft.org> | 2018-04-20 08:17:29 +0200 |
commit | 3689141ac3ed59d6681eeca89b33eaf2310042bc (patch) | |
tree | 2eb4ac588a24fd63e50710f398cc12664a3f8424 | |
parent | d4f3fea659163749f9ea879a5e1dd313106353c6 (diff) | |
parent | f7ecffa49a487655a4527c1631e7539b50feb6ef (diff) | |
download | PeerTube-3689141ac3ed59d6681eeca89b33eaf2310042bc.tar.gz PeerTube-3689141ac3ed59d6681eeca89b33eaf2310042bc.tar.zst PeerTube-3689141ac3ed59d6681eeca89b33eaf2310042bc.zip |
Fix word-wrap on comments and description (#397 regression)
See merge request chocobozzz/PeerTube!10
-rw-r--r-- | client/src/app/videos/+video-watch/comment/video-comment.component.scss | 7 | ||||
-rw-r--r-- | client/src/app/videos/+video-watch/video-watch.component.scss | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/client/src/app/videos/+video-watch/comment/video-comment.component.scss b/client/src/app/videos/+video-watch/comment/video-comment.component.scss index 3a3f32b83..4c481d486 100644 --- a/client/src/app/videos/+video-watch/comment/video-comment.component.scss +++ b/client/src/app/videos/+video-watch/comment/video-comment.component.scss | |||
@@ -48,6 +48,11 @@ | |||
48 | .comment-html { | 48 | .comment-html { |
49 | word-break: normal; | 49 | word-break: normal; |
50 | word-wrap: break-word; | 50 | word-wrap: break-word; |
51 | overflow-wrap: break-word; | ||
52 | -webkit-hyphens: auto; | ||
53 | -ms-hyphens: auto; | ||
54 | -moz-hyphens: auto; | ||
55 | hyphens: auto; | ||
51 | text-align: justify; | 56 | text-align: justify; |
52 | 57 | ||
53 | /deep/ a { | 58 | /deep/ a { |
@@ -100,4 +105,4 @@ | |||
100 | .root-comment { | 105 | .root-comment { |
101 | img { margin-right: 10px; } | 106 | img { margin-right: 10px; } |
102 | } | 107 | } |
103 | } \ No newline at end of file | 108 | } |
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index fe3cc4ded..b9596cbee 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
@@ -216,7 +216,12 @@ | |||
216 | 216 | ||
217 | .video-info-description-html { | 217 | .video-info-description-html { |
218 | word-break: normal; | 218 | word-break: normal; |
219 | word-wrap: normal; | 219 | word-wrap: break-word; |
220 | overflow-wrap: break-word; | ||
221 | -webkit-hyphens: auto; | ||
222 | -ms-hyphens: auto; | ||
223 | -moz-hyphens: auto; | ||
224 | hyphens: auto; | ||
220 | text-align: justify; | 225 | text-align: justify; |
221 | } | 226 | } |
222 | 227 | ||
@@ -252,6 +257,8 @@ | |||
252 | } | 257 | } |
253 | 258 | ||
254 | .other-videos { | 259 | .other-videos { |
260 | padding-left: 1em; | ||
261 | |||
255 | .title-page { | 262 | .title-page { |
256 | margin-top: 0; | 263 | margin-top: 0; |
257 | } | 264 | } |