diff options
author | Chocobozzz <me@florianbigard.com> | 2022-09-28 16:18:08 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-09-28 16:18:08 +0200 |
commit | 9c0cdc5047918b959ebd5e075ddad81eb7fb93f0 (patch) | |
tree | d69a990ede132d83a5b7f1491db71e24a57ae470 /client/src | |
parent | c5f3ff39e5351ac911418c432dac235c5aefec9e (diff) | |
download | PeerTube-9c0cdc5047918b959ebd5e075ddad81eb7fb93f0.tar.gz PeerTube-9c0cdc5047918b959ebd5e075ddad81eb7fb93f0.tar.zst PeerTube-9c0cdc5047918b959ebd5e075ddad81eb7fb93f0.zip |
Fix subscription button radius
Diffstat (limited to 'client/src')
4 files changed, 6 insertions, 3 deletions
diff --git a/client/src/app/+admin/overview/users/user-edit/user-edit.ts b/client/src/app/+admin/overview/users/user-edit/user-edit.ts index 0ba517edb..6dae4110d 100644 --- a/client/src/app/+admin/overview/users/user-edit/user-edit.ts +++ b/client/src/app/+admin/overview/users/user-edit/user-edit.ts | |||
@@ -3,7 +3,7 @@ import { ConfigService } from '@app/+admin/config/shared/config.service' | |||
3 | import { AuthService, ScreenService, ServerService, User } from '@app/core' | 3 | import { AuthService, ScreenService, ServerService, User } from '@app/core' |
4 | import { FormReactive } from '@app/shared/shared-forms' | 4 | import { FormReactive } from '@app/shared/shared-forms' |
5 | import { USER_ROLE_LABELS } from '@shared/core-utils/users' | 5 | import { USER_ROLE_LABELS } from '@shared/core-utils/users' |
6 | import { HTMLServerConfig, UserAdminFlag, UserRole, VideoResolution } from '@shared/models' | 6 | import { HTMLServerConfig, UserAdminFlag, UserRole } from '@shared/models' |
7 | import { SelectOptionsItem } from '../../../../../types/select-options-item.model' | 7 | import { SelectOptionsItem } from '../../../../../types/select-options-item.model' |
8 | 8 | ||
9 | @Directive() | 9 | @Directive() |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index 6cfe26431..cd57e134e 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
@@ -402,6 +402,6 @@ my-global-icon { | |||
402 | } | 402 | } |
403 | 403 | ||
404 | &.channel-icon { | 404 | &.channel-icon { |
405 | top: -2px; | 405 | top: -2px; |
406 | } | 406 | } |
407 | } | 407 | } |
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 0e09c2697..341b83a04 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 | |||
@@ -37,7 +37,7 @@ | |||
37 | 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" |
38 | 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 |
39 | > | 39 | > |
40 | <button class="btn dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label> | 40 | <button class="btn dropdown-toggle-split last-in-group" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label> |
41 | <ng-container | 41 | <ng-container |
42 | *ngIf="!isUserLoggedIn(); then userLoggedOut"> | 42 | *ngIf="!isUserLoggedIn(); then userLoggedOut"> |
43 | </ng-container> | 43 | </ng-container> |
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 97f72c41f..9328a27a2 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -333,7 +333,10 @@ | |||
333 | .input-group-text > .dropdown-toggle { | 333 | .input-group-text > .dropdown-toggle { |
334 | display: flex; | 334 | display: flex; |
335 | } | 335 | } |
336 | } | ||
336 | 337 | ||
338 | .input-group, | ||
339 | .btn-group { | ||
337 | .last-in-group { | 340 | .last-in-group { |
338 | border-top-right-radius: 3px !important; | 341 | border-top-right-radius: 3px !important; |
339 | border-bottom-right-radius: 3px !important; | 342 | border-bottom-right-radius: 3px !important; |