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

correct regressions on sub-menu for account and admin (#3004)

This commit is contained in:
Kim 2020-07-24 23:29:39 +02:00 committed by GitHub
parent 2e7f262724
commit a949f67636
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/shared/shared-main/misc/top-menu-dropdown.component.scss
View File

@ -1,12 +1,6 @@
@import '_variables'; @import '_variables';
@import '_mixins'; @import '_mixins';
:host {
display: block;
height: $sub-menu-height;
margin-bottom: $sub-menu-margin-bottom;
}
.parent-entry { .parent-entry {
span[role=button] { span[role=button] {
cursor: pointer; cursor: pointer;

10
client/src/sass/application.scss
View File

@ -136,6 +136,10 @@ label {
flex-grow: 1; flex-grow: 1;
} }
my-top-menu-dropdown + .margin-content {
padding-top: $sub-menu-height + $sub-menu-margin-bottom;
}
.sub-menu { .sub-menu {
background-color: pvar(--submenuColor); background-color: pvar(--submenuColor);
width: 100%; width: 100%;
@ -145,7 +149,11 @@ label {
padding-left: $not-expanded-horizontal-margins; padding-left: $not-expanded-horizontal-margins;
padding-right: $not-expanded-horizontal-margins; padding-right: $not-expanded-horizontal-margins;
position: fixed; position: fixed;
z-index: 1; z-index: #{z('header') - 1};
& + .margin-content {
margin-top: $sub-menu-margin-bottom;
}
} }
// Override some properties if the main content is expanded (no menu on the left) // Override some properties if the main content is expanded (no menu on the left)