diff options
Diffstat (limited to 'client/src/app/shared/shared-user-subscription')
-rw-r--r-- | client/src/app/shared/shared-user-subscription/subscribe-button.component.html | 14 | ||||
-rw-r--r-- | client/src/app/shared/shared-user-subscription/subscribe-button.component.scss | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/client/src/app/shared/shared-user-subscription/subscribe-button.component.html b/client/src/app/shared/shared-user-subscription/subscribe-button.component.html index a6d851315..0e09c2697 100644 --- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.html +++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <div | 1 | <div |
2 | class="btn-group-subscribe btn-group" | 2 | class="btn-group-subscribe btn-group" role="group" |
3 | [ngClass]="{'subscribe-button': !isAllChannelsSubscribed, 'unsubscribe-button': isAllChannelsSubscribed, 'big': isBigButton }" | 3 | [ngClass]="{'subscribe-button': !isAllChannelsSubscribed, 'unsubscribe-button': isAllChannelsSubscribed, 'big': isBigButton }" |
4 | > | 4 | > |
5 | 5 | ||
@@ -20,17 +20,11 @@ | |||
20 | </ng-template> | 20 | </ng-template> |
21 | 21 | ||
22 | <ng-template #userLoggedIn> | 22 | <ng-template #userLoggedIn> |
23 | <button | 23 | <button *ngIf="!isAllChannelsSubscribed" type="button" class="btn" (click)="subscribe()"> |
24 | *ngIf="!isAllChannelsSubscribed" type="button" | ||
25 | class="btn btn-sm" (click)="subscribe()" | ||
26 | > | ||
27 | <ng-template [ngTemplateOutlet]="userLoggedOut"></ng-template> | 24 | <ng-template [ngTemplateOutlet]="userLoggedOut"></ng-template> |
28 | </button> | 25 | </button> |
29 | 26 | ||
30 | <button | 27 | <button *ngIf="isAllChannelsSubscribed" type="button" class="btn" role="button" (click)="unsubscribe()"> |
31 | *ngIf="isAllChannelsSubscribed" type="button" | ||
32 | class="btn btn-sm" role="button" | ||
33 | (click)="unsubscribe()"> | ||
34 | <ng-container i18n>{account + "", select, undefined {Unsubscribe} other {Unsubscribe from all channels}}</ng-container> | 28 | <ng-container i18n>{account + "", select, undefined {Unsubscribe} other {Unsubscribe from all channels}}</ng-container> |
35 | </button> | 29 | </button> |
36 | </ng-template> | 30 | </ng-template> |
@@ -43,7 +37,7 @@ | |||
43 | class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right bottom-left bottom auto" | 37 | class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right bottom-left bottom auto" |
44 | role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label | 38 | role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label |
45 | > | 39 | > |
46 | <button class="btn btn-sm dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label> | 40 | <button class="btn dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label> |
47 | <ng-container | 41 | <ng-container |
48 | *ngIf="!isUserLoggedIn(); then userLoggedOut"> | 42 | *ngIf="!isUserLoggedIn(); then userLoggedOut"> |
49 | </ng-container> | 43 | </ng-container> |
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 da8eaf646..889596b62 100644 --- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.scss +++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.scss | |||
@@ -3,14 +3,10 @@ | |||
3 | 3 | ||
4 | .btn-group-subscribe { | 4 | .btn-group-subscribe { |
5 | @include peertube-button; | 5 | @include peertube-button; |
6 | @include disable-default-a-behaviour; | ||
7 | 6 | ||
8 | float: right; | 7 | button.dropdown-toggle { |
9 | padding: 0; | 8 | font-size: $button-font-size; |
10 | 9 | line-height: 1.2; | |
11 | > .btn, | ||
12 | > .dropdown > .dropdown-toggle { | ||
13 | font-size: 15px; | ||
14 | } | 10 | } |
15 | 11 | ||
16 | &:not(.big) { | 12 | &:not(.big) { |
@@ -38,7 +34,7 @@ | |||
38 | 34 | ||
39 | // Unlogged | 35 | // Unlogged |
40 | > .dropdown > .dropdown-toggle span { | 36 | > .dropdown > .dropdown-toggle span { |
41 | @include padding-right(3px); | 37 | @include padding-right(5px); |
42 | } | 38 | } |
43 | 39 | ||
44 | // Logged | 40 | // Logged |
@@ -65,9 +61,11 @@ | |||
65 | @include padding-left(5px); | 61 | @include padding-left(5px); |
66 | } | 62 | } |
67 | } | 63 | } |
64 | |||
68 | &.unsubscribe-button { | 65 | &.unsubscribe-button { |
69 | .btn { | 66 | .btn { |
70 | @include grey-button; | 67 | @include grey-button; |
68 | |||
71 | font-weight: 600; | 69 | font-weight: 600; |
72 | } | 70 | } |
73 | } | 71 | } |