aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/videos
diff options
context:
space:
mode:
authorGérald Niel <gerald.niel@gegeweb.org>2018-04-19 07:54:51 +0200
committerGérald Niel <gerald.niel@gegeweb.org>2018-04-19 07:54:51 +0200
commit0030284b0df2983914291d6fe83675e2aa892e6a (patch)
tree2379f6f0c8a5e6ec1cb86d4bc808c7c48a4c4422 /client/src/app/videos
parentea5cd0fa2cdc7655ed5ecf134dedd52400837ef2 (diff)
parentf55e5a7bf81c2c27db1514273e3366511aabf4ae (diff)
downloadPeerTube-0030284b0df2983914291d6fe83675e2aa892e6a.tar.gz
PeerTube-0030284b0df2983914291d6fe83675e2aa892e6a.tar.zst
PeerTube-0030284b0df2983914291d6fe83675e2aa892e6a.zip
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
Diffstat (limited to 'client/src/app/videos')
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comment.component.scss27
-rw-r--r--client/src/app/videos/+video-watch/comment/video-comments.component.scss10
-rw-r--r--client/src/app/videos/+video-watch/video-watch.component.scss2
3 files changed, 32 insertions, 7 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 3b0b7eafd..3a3f32b83 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
@@ -14,6 +14,8 @@
14 14
15 .comment { 15 .comment {
16 flex-grow: 1; 16 flex-grow: 1;
17 // Fix word-wrap with flex
18 min-width: 1px;
17 19
18 .highlighted-comment { 20 .highlighted-comment {
19 display: inline-block; 21 display: inline-block;
@@ -44,8 +46,8 @@
44 } 46 }
45 47
46 .comment-html { 48 .comment-html {
47 word-wrap: initial;
48 word-break: normal; 49 word-break: normal;
50 word-wrap: break-word;
49 text-align: justify; 51 text-align: justify;
50 52
51 /deep/ a { 53 /deep/ a {
@@ -76,3 +78,26 @@
76 } 78 }
77 } 79 }
78} 80}
81
82// Decrease the space of child comments on small screens
83@media screen and (max-width: 1600px) {
84 .children {
85 margin-left: -20px;
86 }
87}
88
89@media screen and (max-width: 1200px) {
90 .children {
91 margin-left: -30px;
92 }
93}
94
95@media screen and (max-width: 600px) {
96 .children {
97 margin-left: -40px;
98 }
99
100 .root-comment {
101 img { margin-right: 10px; }
102 }
103} \ No newline at end of file
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.scss b/client/src/app/videos/+video-watch/comment/video-comments.component.scss
index 7aadc2866..0b8aa1854 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.scss
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.scss
@@ -19,8 +19,8 @@
19 font-size: 13px; 19 font-size: 13px;
20} 20}
21 21
22.comment-html { 22@media screen and (max-width: 600px) {
23 word-wrap: normal; 23 .view-replies {
24 word-break: normal; 24 margin-left: 46px;
25 text-align: justify; 25 }
26} 26} \ No newline at end of file
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 9b7bc7351..d78e5c6a1 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -335,7 +335,7 @@
335 335
336 .video-actions-rates { 336 .video-actions-rates {
337 margin-top: 20px; 337 margin-top: 20px;
338 align-items: left; 338 align-items: start;
339 339
340 .video-info-likes-dislikes-bar { 340 .video-info-likes-dislikes-bar {
341 margin-top: 10px; 341 margin-top: 10px;