diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-04-20 08:19:46 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-04-20 08:19:46 +0200 |
| commit | 7a14004b4e16e23076f29d9c5d890f2a5130e171 (patch) | |
| tree | 0c5befe56320b80d07ffb2223cd7bb4143de0775 | |
| parent | 3689141ac3ed59d6681eeca89b33eaf2310042bc (diff) | |
| download | PeerTube-7a14004b4e16e23076f29d9c5d890f2a5130e171.tar.gz PeerTube-7a14004b4e16e23076f29d9c5d890f2a5130e171.tar.zst PeerTube-7a14004b4e16e23076f29d9c5d890f2a5130e171.zip | |
Use mixin for word wrap
3 files changed, 13 insertions, 16 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 4c481d486..c90f9849b 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 | |||
| @@ -46,14 +46,7 @@ | |||
| 46 | } | 46 | } |
| 47 | 47 | ||
| 48 | .comment-html { | 48 | .comment-html { |
| 49 | word-break: normal; | 49 | @include peertube-word-wrap; |
| 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; | ||
| 56 | text-align: justify; | ||
| 57 | 50 | ||
| 58 | /deep/ a { | 51 | /deep/ a { |
| 59 | @include disable-default-a-behaviour; | 52 | @include disable-default-a-behaviour; |
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 b9596cbee..1b44f0d6a 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss | |||
| @@ -215,14 +215,7 @@ | |||
| 215 | font-size: 15px; | 215 | font-size: 15px; |
| 216 | 216 | ||
| 217 | .video-info-description-html { | 217 | .video-info-description-html { |
| 218 | word-break: normal; | 218 | @include peertube-word-wrap; |
| 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; | ||
| 225 | text-align: justify; | ||
| 226 | } | 219 | } |
| 227 | 220 | ||
| 228 | .description-loading { | 221 | .description-loading { |
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index f905f9ae5..7e7a38bbd 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss | |||
| @@ -16,6 +16,17 @@ | |||
| 16 | } | 16 | } |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | @mixin peertube-word-wrap { | ||
| 20 | word-break: normal; | ||
| 21 | word-wrap: break-word; | ||
| 22 | overflow-wrap: break-word; | ||
| 23 | -webkit-hyphens: auto; | ||
| 24 | -ms-hyphens: auto; | ||
| 25 | -moz-hyphens: auto; | ||
| 26 | hyphens: auto; | ||
| 27 | text-align: justify; | ||
| 28 | } | ||
| 29 | |||
| 19 | @mixin peertube-input-text($width) { | 30 | @mixin peertube-input-text($width) { |
| 20 | display: inline-block; | 31 | display: inline-block; |
| 21 | height: $button-height; | 32 | height: $button-height; |