aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-09-27 16:23:04 +0200
committerChocobozzz <me@florianbigard.com>2022-09-27 16:23:04 +0200
commitca68986083edfc530985f47007a099b94cd65325 (patch)
treef5c86d8480bc864919fa8c2583eee301faddd9ad /client/src/app
parent97922ecf640eb449f0664f23f9f69eeb4d9f5cd9 (diff)
parent2b32c5b37e0b10261a108cc7c23b72d64f806576 (diff)
downloadPeerTube-ca68986083edfc530985f47007a099b94cd65325.tar.gz
PeerTube-ca68986083edfc530985f47007a099b94cd65325.tar.zst
PeerTube-ca68986083edfc530985f47007a099b94cd65325.zip
Merge branch 'release/4.3.0' into develop
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss4
-rw-r--r--client/src/app/shared/shared-main/buttons/action-dropdown.component.html2
-rw-r--r--client/src/app/shared/shared-main/buttons/action-dropdown.component.scss12
3 files changed, 17 insertions, 1 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
index 1bc9aebba..dda5d0b5e 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss
@@ -36,6 +36,10 @@ input[type=number] {
36 position: absolute; 36 position: absolute;
37 top: 0.2em; 37 top: 0.2em;
38 right: 2.5rem; 38 right: 2.5rem;
39
40 @media screen and (max-width: $mobile-view) {
41 display: none;
42 }
39 } 43 }
40 44
41 input[disabled] { 45 input[disabled] {
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html
index 017355bd0..37cf63fcd 100644
--- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html
+++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html
@@ -18,7 +18,7 @@
18 <ng-template #templateActionLabel let-action> 18 <ng-template #templateActionLabel let-action>
19 <my-global-icon *ngIf="action.iconName" [iconName]="action.iconName" [ngClass]="'icon-' + action.iconName" aria-hidden="true"></my-global-icon> 19 <my-global-icon *ngIf="action.iconName" [iconName]="action.iconName" [ngClass]="'icon-' + action.iconName" aria-hidden="true"></my-global-icon>
20 20
21 <div class="d-flex flex-column"> 21 <div class="item-label">
22 <span i18n>{{ action.label }}</span> 22 <span i18n>{{ action.label }}</span>
23 <small class="muted" *ngIf="action.description">{{ action.description }}</small> 23 <small class="muted" *ngIf="action.description">{{ action.description }}</small>
24 </div> 24 </div>
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss b/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss
index fe65d6e7e..4c8a591aa 100644
--- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss
+++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss
@@ -53,6 +53,8 @@
53} 53}
54 54
55.dropdown-menu { 55.dropdown-menu {
56 max-width: 75vw;
57
56 .dropdown-header { 58 .dropdown-header {
57 padding: 0.2rem 1rem; 59 padding: 0.2rem 1rem;
58 } 60 }
@@ -72,3 +74,13 @@
72 } 74 }
73 } 75 }
74} 76}
77
78.item-label {
79 display: flex;
80 flex-direction: column;
81 min-width: 1px;
82
83 > * {
84 @include ellipsis;
85 }
86}