Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-user-subscription / subscribe-button.component.scss

diff --git a/client/src/app/shared/shared-user-subscription/subscribe-button.component.scss b/client/src/app/shared/shared-user-subscription/subscribe-button.component.scss
index b739c5ae29a9d07109f59628a7015d8fb2643980..889596b620ec65c56a905e0def114dfc3ed1b0ce 100644 (file)
--- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.scss
+++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.scss
@@ -1,16 +1,12 @@
-@import '_variables';
-@import '_mixins';
+@use '_variables' as *;
+@use '_mixins' as *;
 
 .btn-group-subscribe {
   @include peertube-button;
-  @include disable-default-a-behaviour;
 
-  float: right;
-  padding: 0;
-
-  & > .btn,
-  & > .dropdown > .dropdown-toggle {
-    font-size: 15px;
+  button.dropdown-toggle {
+    font-size: $button-font-size;
+    line-height: 1.2;
   }
 
   &:not(.big) {
@@ -20,15 +16,16 @@
   &.big {
     height: 35px;
 
-    & > button:first-child {
-      width: 175px;
+    > button:first-child {
+      width: max-content;
+      min-width: 175px;
     }
 
     button .extra-text {
       span:first-child {
         line-height: 80%;
       }
-    
+
       span:not(:first-child) {
         font-size: 75%;
       }
@@ -36,16 +33,16 @@
   }
 
   // Unlogged
-  & > .dropdown > .dropdown-toggle span {
-    padding-right: 3px;
+  > .dropdown > .dropdown-toggle span {
+    @include padding-right(5px);
   }
 
   // Logged
-  & > .btn {
-    padding-right: 4px;
+  > .btn {
+    @include padding-right(4px);
 
-    & + .dropdown > button {
-      padding-left: 2px;
+    + .dropdown > button {
+      @include padding-left(2px);
 
       &::after {
         position: relative;
@@ -61,12 +58,14 @@
     }
 
     span.followers-count {
-      padding-left: 5px;
+      @include padding-left(5px);
     }
   }
+
   &.unsubscribe-button {
     .btn {
       @include grey-button;
+
       font-weight: 600;
     }
   }
@@ -107,6 +106,6 @@
 
   span:not(:first-child) {
     font-size: 60%;
-    text-align: left;
+    text-align: start;
   }
 }