aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/.eslintrc.json3
-rw-r--r--client/src/app/+admin/overview/users/user-edit/user-edit.ts2
-rw-r--r--client/src/app/menu/menu.component.scss2
-rw-r--r--client/src/app/shared/shared-user-subscription/subscribe-button.component.html2
-rw-r--r--client/src/sass/bootstrap.scss3
5 files changed, 8 insertions, 4 deletions
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
index f9326acc8..f7b207b58 100644
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -2,7 +2,8 @@
2 "root": true, 2 "root": true,
3 "ignorePatterns": [ 3 "ignorePatterns": [
4 "projects/**/*", 4 "projects/**/*",
5 "node_modules/" 5 "node_modules/",
6 "src/standalone/player/dist"
6 ], 7 ],
7 "overrides": [ 8 "overrides": [
8 { 9 {
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'
3import { AuthService, ScreenService, ServerService, User } from '@app/core' 3import { AuthService, ScreenService, ServerService, User } from '@app/core'
4import { FormReactive } from '@app/shared/shared-forms' 4import { FormReactive } from '@app/shared/shared-forms'
5import { USER_ROLE_LABELS } from '@shared/core-utils/users' 5import { USER_ROLE_LABELS } from '@shared/core-utils/users'
6import { HTMLServerConfig, UserAdminFlag, UserRole, VideoResolution } from '@shared/models' 6import { HTMLServerConfig, UserAdminFlag, UserRole } from '@shared/models'
7import { SelectOptionsItem } from '../../../../../types/select-options-item.model' 7import { 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;