mirror of https://github.com/Chocobozzz/PeerTube
Fix dropdown-user placement and menu-left scroll on touchscreens (#2706)
parent
d1261d9a3c
commit
ca4b1594a7
|
@ -11,7 +11,7 @@
|
||||||
<div class="logged-in-username">{{ user.username }}</div>
|
<div class="logged-in-username">{{ user.username }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="logged-in-more" ngbDropdown placement="right-top auto" container="body" autoClose="outside">
|
<div class="logged-in-more" ngbDropdown [placement]="placement" container="body" autoClose="outside">
|
||||||
<my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
|
<my-global-icon iconName="more-vertical" ngbDropdownToggle role="button"></my-global-icon>
|
||||||
|
|
||||||
<div ngbDropdownMenu>
|
<div ngbDropdownMenu>
|
||||||
|
|
|
@ -27,6 +27,10 @@ menu {
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media not all and (hover: hover) and (pointer: fine) {
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
||||||
&.logged-in {
|
&.logged-in {
|
||||||
.panel-block {
|
.panel-block {
|
||||||
margin-bottom: 20px;
|
margin-bottom: 20px;
|
||||||
|
|
|
@ -8,6 +8,7 @@ import { HotkeysService } from 'angular2-hotkeys'
|
||||||
import { ServerConfig, VideoConstant } from '@shared/models'
|
import { ServerConfig, VideoConstant } from '@shared/models'
|
||||||
import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
|
import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
|
||||||
import { I18n } from '@ngx-translate/i18n-polyfill'
|
import { I18n } from '@ngx-translate/i18n-polyfill'
|
||||||
|
import { ScreenService } from '@app/shared/misc/screen.service'
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'my-menu',
|
selector: 'my-menu',
|
||||||
|
@ -43,8 +44,21 @@ export class MenuComponent implements OnInit {
|
||||||
private serverService: ServerService,
|
private serverService: ServerService,
|
||||||
private redirectService: RedirectService,
|
private redirectService: RedirectService,
|
||||||
private hotkeysService: HotkeysService,
|
private hotkeysService: HotkeysService,
|
||||||
|
private screenService: ScreenService,
|
||||||
private i18n: I18n
|
private i18n: I18n
|
||||||
) {}
|
) { }
|
||||||
|
|
||||||
|
get isInMobileView () {
|
||||||
|
return this.screenService.isInMobileView()
|
||||||
|
}
|
||||||
|
|
||||||
|
get placement () {
|
||||||
|
if (this.isInMobileView) {
|
||||||
|
return 'left-top auto'
|
||||||
|
} else {
|
||||||
|
return 'right-top auto'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit () {
|
ngOnInit () {
|
||||||
this.serverConfig = this.serverService.getTmpConfig()
|
this.serverConfig = this.serverService.getTmpConfig()
|
||||||
|
|
Loading…
Reference in New Issue