Fix margins/widths with top-menu and main-col on small screens
This commit is contained in:
parent
baab47ca81
commit
c4741804bc
|
@ -15,8 +15,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
& > div {
|
& > div {
|
||||||
|
padding: 10px;
|
||||||
width: 350px;
|
width: 350px;
|
||||||
|
|
||||||
|
&:nth-child(2) {
|
||||||
|
max-width: 60px !important;
|
||||||
|
}
|
||||||
|
|
||||||
@media screen and (max-width: $small-view) {
|
@media screen and (max-width: $small-view) {
|
||||||
width: auto;
|
width: auto;
|
||||||
|
|
||||||
|
@ -25,9 +30,4 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
& > div {
|
|
||||||
padding: 10px
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@ input[type=submit] {
|
||||||
|
|
||||||
textarea {
|
textarea {
|
||||||
@include peertube-textarea(500px, 150px);
|
@include peertube-textarea(500px, 150px);
|
||||||
|
max-width: 100%;
|
||||||
|
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,4 +16,5 @@
|
||||||
|
|
||||||
.progress {
|
.progress {
|
||||||
width: 500px;
|
width: 500px;
|
||||||
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,10 @@
|
||||||
|
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
& > my-top-menu-dropdown:nth-child(1) {
|
||||||
|
flex-grow: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<div class="actor-img-edit-container">
|
<div class="actor-img-edit-container">
|
||||||
<div class="actor-img-edit-button" [ngbTooltip]="'(extensions: '+ avatarExtensions +', max size: 100KB)'" placement="right" container="body">
|
<div class="actor-img-edit-button" [ngbTooltip]="'(extensions: '+ avatarExtensions +', max size: 100KB)'" placement="right" container="body">
|
||||||
<my-global-icon iconName="edit"></my-global-icon>
|
<my-global-icon iconName="edit"></my-global-icon>
|
||||||
<input #avatarfileInput type="file" name="avatarfile" id="avatarfile" [accept]="avatarExtensions" (change)="onAvatarChange()"/>
|
<input #avatarfileInput type="file" title=" " name="avatarfile" id="avatarfile" [accept]="avatarExtensions" (change)="onAvatarChange()"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
<div class="sub-header-container">
|
<div class="sub-header-container">
|
||||||
<my-menu *ngIf="menu.isMenuDisplayed"></my-menu>
|
<my-menu *ngIf="menu.isMenuDisplayed"></my-menu>
|
||||||
|
|
||||||
<div id="content" tabindex="-1" class="main-col container-fluid" [ngClass]="{ expanded: menu.isMenuDisplayed === false }">
|
<div id="content" tabindex="-1" class="main-col" [ngClass]="{ expanded: menu.isMenuDisplayed === false }">
|
||||||
|
|
||||||
<div class="main-row">
|
<div class="main-row">
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
|
|
|
@ -8,6 +8,7 @@
|
||||||
.sub-header-container {
|
.sub-header-container {
|
||||||
margin-top: $header-height;
|
margin-top: $header-height;
|
||||||
background-color: var(--mainBackgroundColor);
|
background-color: var(--mainBackgroundColor);
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
|
|
|
@ -106,9 +106,13 @@ label {
|
||||||
color: black;
|
color: black;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.main-col {
|
.main-col {
|
||||||
margin-left: $menu-width;
|
margin-left: $menu-width;
|
||||||
width: auto;
|
width: calc(100% - #{$menu-width});
|
||||||
|
|
||||||
.margin-content {
|
.margin-content {
|
||||||
margin-left: $not-expanded-horizontal-margins;
|
margin-left: $not-expanded-horizontal-margins;
|
||||||
|
@ -130,6 +134,7 @@ label {
|
||||||
// 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)
|
||||||
&.expanded {
|
&.expanded {
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
.margin-content {
|
.margin-content {
|
||||||
margin-left: $expanded-horizontal-margins;
|
margin-left: $expanded-horizontal-margins;
|
||||||
|
|
Loading…
Reference in New Issue