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

Fix menu dropdowns 

Better responsive
Avoid menu scrollbar displayed in notification popove
pull/5817/head
Chocobozzz 2023-05-22 08:10:52 +02:00
parent 9ba1faa2ee
commit 8527f4b163
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<div> <div>
<div <div
class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left auto" class="logged-in-more" ngbDropdown #dropdown="ngbDropdown" placement="bottom-left auto"
[container]="dropdownContainer" (openChange)="onDropdownOpenChange($event)" autoClose="outside" container="body" (openChange)="onDropdownOpenChange($event)" autoClose="outside"
> >
<button class="border-0 text-start" ngbDropdownToggle> <button class="border-0 text-start" ngbDropdownToggle>
<my-actor-avatar [actor]="user.account" actorType="account" size="34"></my-actor-avatar> <my-actor-avatar [actor]="user.account" actorType="account" size="34"></my-actor-avatar>

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

@ -114,7 +114,7 @@ my-notification {
display: inherit !important; display: inherit !important;
} }
> .dropdown-toggle { &.dropdown-toggle {
max-width: 88% !important; max-width: 88% !important;
} }
} }
@ -144,7 +144,7 @@ my-notification {
/* fill space when on mobile */ /* fill space when on mobile */
max-width: calc(100% - 80px); max-width: calc(100% - 80px);
.dropdown-toggle { &.dropdown-toggle {
max-width: 100%; max-width: 100%;
} }
@ -171,7 +171,8 @@ my-notification {
> .dropdown-toggle:first-child { > .dropdown-toggle:first-child {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 5px 7px; width: 100%;
padding: 5px 25px 5px 7px;
} }
} }

6
client/src/app/menu/menu.component.ts
View File

@ -86,12 +86,6 @@ export class MenuComponent implements OnInit, OnDestroy {
return this.screenService.isInMobileView() return this.screenService.isInMobileView()
} }
get dropdownContainer () {
if (this.isInMobileView) return null
return 'body' as 'body'
}
get language () { get language () {
return this.languageChooserModal.getCurrentLanguage() return this.languageChooserModal.getCurrentLanguage()
} }

2
client/src/app/menu/notification.component.html
View File

@ -4,7 +4,7 @@
</ng-template> </ng-template>
<button <button
[ngbPopover]="popContent" autoClose="outside" placement="bottom" container={this} popoverClass="popover-notifications" [ngbPopover]="popContent" autoClose="outside" placement="bottom" container="body" popoverClass="popover-notifications"
i18n-title title="View your notifications" i18n-title title="View your notifications"
class="border-0 text-start" [ngClass]="{ 'notification-inbox-popover': true, 'shown': opened, 'hidden': isInMobileView }" class="border-0 text-start" [ngClass]="{ 'notification-inbox-popover': true, 'shown': opened, 'hidden': isInMobileView }"
#popover="ngbPopover" (shown)="onPopoverShown()" (hidden)="onPopoverHidden()" #popover="ngbPopover" (shown)="onPopoverShown()" (hidden)="onPopoverHidden()"

2
server/tests/peertube-runner/live-transcoding.ts
View File

@ -76,7 +76,7 @@ describe('Test Live transcoding in peertube-runner program', function () {
}) })
it('Should save a replay', async function () { it('Should save a replay', async function () {
this.timeout(120000) this.timeout(240000)
const { video } = await servers[0].live.quickCreate({ permanentLive: true, saveReplay: true }) const { video } = await servers[0].live.quickCreate({ permanentLive: true, saveReplay: true })