Merge branch 'release/4.2.0' into develop

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

diff --git a/client/src/app/+video-channels/video-channels.component.scss b/client/src/app/+video-channels/video-channels.component.scss
index 470f648789a4fc8bbac707a881d3fec4a770c9ce..945d9a13db462380753bcad455c5e8956a1a6f9c 100644 (file)
--- a/client/src/app/+video-channels/video-channels.component.scss
+++ b/client/src/app/+video-channels/video-channels.component.scss
@@ -1,7 +1,7 @@
-@import '_variables';
-@import '_mixins';
-@import '_actor';
-@import '_miniature';
+@use '_variables' as *;
+@use '_mixins' as *;
+@use '_account-channel-page' as *;
+@use '_miniature' as *;
 
 .root {
   --myGlobalTopPadding: 60px;
@@ -71,12 +71,12 @@
   flex-wrap: wrap;
 
   > *:not(:last-child) {
-    margin-right: 15px;
+    @include margin-right(15px);
   }
 }
 
 .channel-buttons.right {
-  margin-left: 45px;
+  @include margin-left(45px);
 }
 
 // Only used by mobile
@@ -85,7 +85,7 @@
 }
 
 .owner-card {
-  margin-left: 105px;
+  @include margin-left(105px);
   grid-column: 2;
   // Takes all the column
   grid-row: 1 / 3;
@@ -107,12 +107,8 @@
     display: flex;
     margin-bottom: 15px;
 
-    .account-avatar {
-      @include actor-avatar-size(48px);
-    }
-
     .actor-info {
-      margin-left: 15px;
+      @include margin-left(15px);
     }
 
     h4 {
@@ -128,6 +124,10 @@
       font-size: var(--myGreyOwnerFontSize);
       color: pvar(--greyForegroundColor);
     }
+
+    .account-avatar {
+      @include actor-avatar-size(48px);
+    }
   }
 
   .owner-description {
@@ -150,7 +150,13 @@
 }
 
 .copy-button {
+  @include margin-left(3px);
+
   border: 0;
+
+  my-global-icon {
+    width: 15px;
+  }
 }
 
 @media screen and (max-width: 1400px) {
@@ -160,8 +166,9 @@
   }
 
   .owner-card {
+    @include margin-left(60px);
+
     grid-row: 2;
-    margin-left: 60px;
   }
 }
 
@@ -215,8 +222,9 @@
     padding: 0;
 
     .avatar-row {
+      @include margin-right(30px);
+
       grid-column: 1;
-      margin-right: 30px;
     }
 
     .owner-description {
@@ -233,7 +241,7 @@
 
   .view-account.complete {
     display: block;
-    text-align: right;
+    text-align: end;
     margin-top: 10px;
     color: pvar(--mainColor);
   }