Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hotfix/horizontal-scroll-blank-spaces #2093

Merged
merged 1 commit into from
May 4, 2023
Merged

hotfix/horizontal-scroll-blank-spaces #2093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/app/app.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ body {
@media (max-width: 810px) {

.app {
/* fallback */
width: 100%;
height: 100vh;
/* apply the --vh variable as the height */
height: calc(var(--vh, 1vh) * 100);
Expand Down
8 changes: 5 additions & 3 deletions frontend/src/app/components/retire-token-dialog/retire-token-dialog.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,13 @@
display: none !important;
}

.g-dialog-content {
height: calc(100% - 87px);
}

.g-dialog-body {
width: 90%;
max-height: 48vh;
max-height: calc(100% - 90px);
margin: 0 auto !important;
padding: 0;
}
Expand Down Expand Up @@ -197,8 +201,6 @@
padding: 20px 0;
position: fixed;
bottom: 0;
left: 50%;
transform: translateX(-50%);
}

.lack-input {
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/app/modules/common/token-dialog/token-dialog.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,14 @@
margin-right: 0 !important;
}

.g-dialog-content {
height: calc(100% - 87px);
}

.g-dialog-body {
width: 90%;
margin: 0 auto !important;
max-height: calc(var(--vh, 1vh) * 100 - var(--header-height) - 90px - 107px - 55px);
max-height: calc(100% - 90px);
padding: 0;
}

Expand Down
2 changes: 0 additions & 2 deletions frontend/src/app/modules/schema-engine/schema-form/schema-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<form *ngIf="options" [formGroup]="options">
<ng-container *ngFor="let item of fields; let i = index">
<!--PARECE QUE O PROBLEMA E QUE OS DIVS QUE ESTAO A SER GERADOS POR ESTE NGIF QUANDO SAO VERDADEIROS SAO NOVOS E NAO OS MESMOS-->
<div *ngIf="!item.hide" class="form-field-container" [id]="buttonOnceRaised ? '' : i" [ngStyle]="{'display': (innerWidth <= 810 ? (isShown[i] || showChildSchemaForm) : true) ? 'flex' : 'none'}">
<!--<div *ngIf="!item.hide && (innerWidth <= 810 ? (isShown[i] || showChildSchemaForm) : true)" class="form-field-container" [id]="buttonOnceRaised ? '' : i">-->
<div *ngIf="!item.isArray && !item.isRef" class="form-field">
<div class="invalid-field-label"
*ngIf="options.controls[item.name] && !options.controls[item.name].valid && !options.controls[item.name].disabled">
Expand Down
213 changes: 0 additions & 213 deletions frontend/src/app/views/header/header.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,219 +450,6 @@ a[hidden="true"] {
}


/* Menu Footer */

.footer {
display: none;
position: fixed;
left: 0;
bottom: 0;
width: 90%;

color: #fff;
z-index: 5000;
transition: 0.8s;
}

.logout {
margin: 8px 8px 40px 32px;
color: #222222;
line-height: 23px;
font-weight: normal;
text-decoration: none;
font-size: 20px;
display: block;
transition: 0.2s;
text-align: left;
}

.logout .material-icons {
position: relative;
bottom: -5px;
left: 100px;
}

.user-info {
padding: 8px 8px 15px 32px;
font-size: 14px;
border-top: 2px solid var(--primary-color);
width: 100%;
transition: max-height 0.2s ease-in-out;
}

.name {
display: flex;
align-items: center;
width: 100%;
position: relative;
margin-top: -25px;
}

.name .user-name {
display: inline-block;
color: var(--primary-color);
padding: 0 8px;
margin-bottom: 10px;
margin-left: -8px;
background-color: white;
font-size: 20px;
transition: 0.8s;
}

.profile-item {
color: #aaaaaa;
display: grid;
grid-template-columns: 80px auto;
column-gap: 5px;
}

.profile-item .profile-item-name {
display: inline;
}

.profile-item .profile-item-value {
display: inline;
}

}

.mobile-menu-button {
display: none;
flex-direction: column;
justify-content: space-between;
width: 30px;
height: 20px;
}

.mobile-menu-button .bar {
height: 3px;
width: 100%;
background-color: white;
border-radius: 10px;
}

#menu-backdrop {
display: none;
}

@media (max-width: 810px) {

/*
.content {
position: fixed;
top: 0;
width: 100vw;
}
*/

.mobile-header {
width: 100%;
height: 100%;
display: flex;
}

.mobile-menu-button {
display: flex;
margin: 29px 0 23px 32px;
}

.user-content-info {
display: flex;
margin-left: 22px;
margin-right: 22px;
flex: auto;
gap: 22px;
}

.user-balance {
border-radius: 5px;
height: 38px;
font-size: 15px;
line-height: 1.2;
text-align: center;
white-space: normal;
display: flex;
align-items: center;
justify-content: center;
}


/* Hamburguer Menu */

.nav-list {
padding-top: 20px;
}

.nav-items {
height: 100%;
width: 0;
position: fixed;
z-index: 5000;
top: 0;
left: 0;
background-color: white;
overflow-x: hidden;
transition: 0.2s;
}

.nav-items .nav-list-item {
padding: 8px 8px 8px 32px;
text-decoration: none;
font-size: 25px;
color: #222222;
display: block;
transition: 0.05s;
text-align: left;
}

.nav-items .nav-list-item:hover {
color: #818181;
}

.nav-list-item[active="true"] {
color: var(--primary-color) !important;
transition: 0.05s;
}

.nav-items .material-icons {
margin: 23px auto 23px 32px;
font-size: 36px;
color: #222222;
}

#menu-backdrop {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100vh;
z-index: 1;
background-color: rgba(0, 0, 0, 0.75);
}

.subnav-list {
border-left: 3px #e3e3e3 solid;
max-height: 0;
overflow: hidden;
transition: max-height 0.2s ease-in-out;
}

.nav-list-item[active="true"] .subnav-list {
overflow: visible;
}

.subnav-list .nav-list-item {
font-size: 20px;
padding: 8px 20px;
height: auto;
}

.subnav-list .nav-list-item[active="true"] {
margin-left: -3.5px;
border-left: 4px var(--primary-color) solid;
}


/* Menu Footer */

.footer {
Expand Down
11 changes: 1 addition & 10 deletions frontend/src/app/views/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,7 @@





<!--
<span *ngIf="innerWidth <= 810 && !isLogin" class="btn-home" #btnHome (click)="onHome()">
<div class="btn-home-name">
Guardian
</div>
</span>
-->

<!-- MOBILE -->
<div *ngIf="innerWidth <= 810" class="mobile-header">
<a *ngIf="isLogin" class="mobile-menu-button" (click)="openNav()">
<span class="bar"></span>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/views/token-config/token-config.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ a {
@media (max-width: 810px) {

.actions {
width: 100vw;
width: 100%;
grid-template-columns: 1fr 1fr;
grid-column-gap: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ button.mat-button {
body {
overflow-x: hidden;
overscroll-behavior: none;
width: 100vw;
width: 100%;
height: calc(var(--vh, 1vh) * 100);
}

Expand Down