Merge branch 'release/1.4.0' into develop

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

diff --git a/client/src/app/shared/user-subscription/subscribe-button.component.scss b/client/src/app/shared/user-subscription/subscribe-button.component.scss
index 7a8a8ee08cdae945140a4d6790a4b43502fc6658..92a28aad9af4ee765e7de69945b42730528157da 100644 (file)
--- a/client/src/app/shared/user-subscription/subscribe-button.component.scss
+++ b/client/src/app/shared/user-subscription/subscribe-button.component.scss
@@ -4,15 +4,32 @@
 .btn-group-subscribe {
   @include peertube-button;
   @include disable-default-a-behaviour;
+
   float: right;
   padding: 0;
 
-  &.btn-group > .btn:not(.dropdown-toggle) {
-    padding-right: 5px;
+  & > .btn,
+  & > .dropdown > .dropdown-toggle {
     font-size: 15px;
   }
-  &.btn-group > .btn-group:not(:first-child) > .btn {
-    padding-left: 2px;
+
+  // Unlogged
+  & > .dropdown > .dropdown-toggle span {
+    padding-right: 3px;
+  }
+
+  // Logged
+  & > .btn {
+    padding-right: 4px;
+
+    & + .dropdown > button {
+      padding-left: 2px;
+
+      &::after {
+        position: relative;
+        top: 1px;
+      }
+    }
   }
 
   &.subscribe-button {
@@ -22,7 +39,7 @@
     }
 
     span.followers-count {
-      padding-left:5px;
+      padding-left: 5px;
     }
   }
   &.unsubscribe-button {
@@ -32,11 +49,19 @@
     }
   }
 
+  .dropdown-menu {
+    cursor: default;
+
+    button {
+      cursor: pointer;
+    }
+  }
+
   .dropdown-header {
     padding-left: 1rem;
   }
 
-  /deep/ form {
+  ::ng-deep form {
     padding: 0.25rem 1rem;
   }