Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / client / src / app / videos / +video-watch / comment / video-comment.component.scss

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 b03bc73d0b158c87f1122461b7c4fc25d4a8fea5..731ecbf8f97736fa341b57cbb09c241bdeebe0a9 100644 (file)
--- 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,19 @@
 
   .comment {
     flex-grow: 1;
+    // Fix word-wrap with flex
+    min-width: 1px;
+
+    .highlighted-comment {
+      display: inline-block;
+      background-color: #F5F5F5;
+      color: #3d3d3d;
+      padding: 0 5px;
+      font-size: 13px;
+      margin-bottom: 5px;
+      font-weight: $font-semibold;
+      border-radius: 3px;
+    }
 
     .comment-account-date {
       display: flex;
@@ -22,28 +35,31 @@
       .comment-account {
         @include disable-default-a-behaviour;
 
-        color: #000;
+        word-break: break-all;
+        color: var(--mainForegroundColor);
         font-weight: $font-bold;
       }
 
       .comment-date {
-        color: #585858;
+        color: $grey-foreground-color;
         margin-left: 10px;
       }
     }
 
-    .marked-comment {
-      background-color: #F5F5F5;
-      padding-left: 3px;
-      padding-right: 3px;
-      font-size: 12px;
-    }
-
     .comment-html {
-      a {
-        @include disable-default-a-behaviour;
+      @include peertube-word-wrap;
+
+      // Mentions
+      /deep/ a {
+
+        &:not(.linkified-url) {
+          @include disable-default-a-behaviour;
+
+          color: var(--mainForegroundColor);
+
+          font-weight: $font-semibold;
+        }
 
-        color: #000;
       }
     }
 
@@ -51,15 +67,45 @@
       margin: 10px 0;
       display: flex;
 
-      .comment-action-reply, .comment-action-delete {
-        color: #585858;
+      .comment-action-reply,
+      .comment-action-delete {
+        color: $grey-foreground-color;
         cursor: pointer;
         margin-right: 10px;
 
         &:hover {
-          color: #000;
+          color: var(--mainForegroundColor);
         }
       }
     }
   }
 }
+
+// Decrease the space of child comments on small screens
+@media screen and (max-width: 1600px) {
+  .children {
+    margin-left: -20px;
+  }
+}
+
+@media screen and (max-width: 1200px) {
+  .children {
+    margin-left: -30px;
+  }
+}
+
+@media screen and (max-width: 600px) {
+  .children {
+    margin-left: -35px;
+  }
+
+  .root-comment {
+    img { margin-right: 10px; }
+  }
+}
+
+@media screen and (max-width: 450px) {
+  .root-comment {
+    font-size: 14px;
+  }
+}