Skip to content
This repository was archived by the owner on Nov 4, 2022. It is now read-only.

fix: modal opacity #132

Open
xj-zhang-aelf wants to merge 1 commit into
base: 2020-new-dev
Choose a base branch
from
Open

fix: modal opacity #132

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
41 changes: 41 additions & 0 deletions src/app/modules/header/header.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
.modal-content {
position: relative;
top: 200px;

margin: 0 auto;
height: 210px;
background-color: #fff;
Expand All @@ -30,6 +31,13 @@
flex-direction: column;
}

.width-448 {
width: 448px;
}
.width-370 {
width: 370px;
}

.main-title, .ass-title {
font-family: "PingFangSC-Regular", "PingFang SC";
}
Expand Down Expand Up @@ -87,3 +95,36 @@
.popup-jump-modal-hidden {
display: none;
}

@media (max-width: 767px) {
.modal-content {
padding: 26px 20px;
}
.main-title {
font-size: 18px;
line-height: 25px;
}
.ass-title {
font-size: 12px;
line-height: 17px;
margin-top: 12px;
}
.btn-wrapper {
display: flex;
flex-direction: column-reverse;
}
.cancel-btn, .jump-btn {
height: 34px;
padding: 9px 18px;
font-size: 12px;
font-weight: 400;
line-height: 17px;
}
.cancel-btn {
margin-right: 0;
margin-top: 12px;
}
.width-448, .width-370 {
width: 290px;
}
}
20 changes: 10 additions & 10 deletions src/app/modules/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ <h1 class="logo pt20">
<i class="fa fa-navicon color-white fs-18"></i>
</div>
</header>
<div [ngClass]="jumpModal ? 'popup-jump-modal' : 'popup-jump-modal-hidden'">
<div class="modal-mask"></div>
<div class="modal-wrapper">
<div class="modal-content" [ngStyle]="{width: currentLanguage === 'English' ? '448px': '370px'}">
<h1 class="main-title">{{"new-website-upgrade" | translate}}</h1>
<em class="ass-title">{{"experiencing-the-brand-new-aelf" | translate}}</em>
<div class="btn-wrapper">
<button class="cancel-btn" (click)="hiddenPopupJump()">{{"remind-me-next-time" | translate}}</button>
<a class="jump-btn" target="_blank" [href]="jumpLink" (click)="hiddenPopupJump()">{{"jumping-into-now" | translate}} ({{timer}})</a>
</div>
</div>
<div [ngClass]="jumpModal ? 'popup-jump-modal' : 'popup-jump-modal-hidden'">
<div class="modal-mask"></div>
<div class="modal-wrapper">
<div [class]="currentLanguage === 'English'? 'modal-content width-448': 'modal-content width-370'">
<h1 class="main-title">{{"new-website-upgrade" | translate}}</h1>
<em class="ass-title">{{"experiencing-the-brand-new-aelf" | translate}}</em>
<div class="btn-wrapper">
<button class="cancel-btn" (click)="hiddenPopupJump()">{{"remind-me-next-time" | translate}}</button>
<a class="jump-btn" target="_blank" [href]="jumpLink" (click)="hiddenPopupJump()">{{"jumping-into-now" | translate}} ({{timer}})</a>
</div>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion src/app/modules/header/header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ export class HeaderComponent implements OnInit, OnDestroy {
countDown() {
if (this.timer > 0) {
this.counter = setTimeout(() => {
console.log("counter")
this.timer--;
this.countDown();
}, 1000);
Expand Down
2 changes: 1 addition & 1 deletion src/app/wallet/wallet.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3 class="fs-36 mb20 ta-l"><strong>{{"aelf Wallet APP" | translate}}</strong></
<div class="group_bt sm-hidden pic-txt-list-22">
<div class="col12-lg-3 col12-md-4 col12-sm-6 ta-c color-white skrollable skrollable-between mb30 mt20">
<div class="meenu brow-f">
<a target="_blank" href="http://d.alphaqr.com/aelfwalletandroid"><span class="fs-14 brow"><img
<a target="_blank" href="https://aelf.io/app/wallet-app-1.1.0.apk"><span class="fs-14 brow"><img
src="assets/images/andiro.svg" alt="">{{"Android Wallet " | translate}}</span></a>
</div>
</div>
Expand Down