OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix subscription button radius

pull/5318/head
Chocobozzz 2022-09-28 16:18:08 +02:00
parent c5f3ff39e5
commit 9c0cdc5047
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/.eslintrc.json
View File

@ -2,7 +2,8 @@
"root": true, "root": true,
"ignorePatterns": [ "ignorePatterns": [
"projects/**/*", "projects/**/*",
"node_modules/" "node_modules/",
"src/standalone/player/dist"
], ],
"overrides": [ "overrides": [
{ {

2
client/src/app/+admin/overview/users/user-edit/user-edit.ts
View File

@ -3,7 +3,7 @@ import { ConfigService } from '@app/+admin/config/shared/config.service'
import { AuthService, ScreenService, ServerService, User } from '@app/core' import { AuthService, ScreenService, ServerService, User } from '@app/core'
import { FormReactive } from '@app/shared/shared-forms' import { FormReactive } from '@app/shared/shared-forms'
import { USER_ROLE_LABELS } from '@shared/core-utils/users' import { USER_ROLE_LABELS } from '@shared/core-utils/users'
import { HTMLServerConfig, UserAdminFlag, UserRole, VideoResolution } from '@shared/models' import { HTMLServerConfig, UserAdminFlag, UserRole } from '@shared/models'
import { SelectOptionsItem } from '../../../../../types/select-options-item.model' import { SelectOptionsItem } from '../../../../../types/select-options-item.model'
@Directive() @Directive()

2
client/src/app/menu/menu.component.scss
View File

@ -402,6 +402,6 @@ my-global-icon {
} }
&.channel-icon { &.channel-icon {
top: -2px; top: -2px;
} }
} }

2
client/src/app/shared/shared-user-subscription/subscribe-button.component.html
View File

@ -37,7 +37,7 @@
class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right bottom-left bottom auto" class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right bottom-left bottom auto"
role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label
> >
<button class="btn dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label> <button class="btn dropdown-toggle-split last-in-group" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label>
<ng-container <ng-container
*ngIf="!isUserLoggedIn(); then userLoggedOut"> *ngIf="!isUserLoggedIn(); then userLoggedOut">
</ng-container> </ng-container>

3
client/src/sass/bootstrap.scss
View File

@ -333,7 +333,10 @@
.input-group-text > .dropdown-toggle { .input-group-text > .dropdown-toggle {
display: flex; display: flex;
} }
}
.input-group,
.btn-group {
.last-in-group { .last-in-group {
border-top-right-radius: 3px !important; border-top-right-radius: 3px !important;
border-bottom-right-radius: 3px !important; border-bottom-right-radius: 3px !important;