Skip to content

Commit

Permalink
Merge pull request #2411 from bharathravi-in/show-info-maintanence
Browse files Browse the repository at this point in the history
changes in css
  • Loading branch information
Haritest authored Aug 16, 2024
2 parents b24e7ef + 1d25259 commit 5ecde2a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 17 deletions.
23 changes: 12 additions & 11 deletions src/app/component/app-nav-bar/app-nav-bar.component.html
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<div class="info-block" *ngIf="infoBlockEnable">
<div class="flex container-balanced items-center justify-between info-wrapper">
<div class="flex items-center">
<span class="material-icons mat-icon text-white margin-right">warning</span>
<span class="info-txt text-white">Dear Karmayogi, our portal will be undergoing a technology upgrade from 10 PM today till 18th August, 10 PM to improve your learning experience.</span>
</div>
<div>
<a (click)="infoBlockActionMethod()" class="ok-btn text-white">OK</a>
</div>
</div>
</div>

<ng-container *ngIf="fullMenuDispaly">
<div class="info-block" *ngIf="infoBlockEnable && mode == 'top'">
<div class="flex container-balanced items-center justify-between info-wrapper">
<div class="flex items-center">
<span class="material-icons mat-icon text-white margin-right">warning</span>
<span class="info-txt text-white">Dear Karmayogi, our portal will be undergoing a technology upgrade from 10 PM today till 18th August, 10 PM to improve your learning experience.</span>
</div>
<div>
<a (click)="infoBlockActionMethod()" class="ok-btn text-white">OK</a>
</div>
</div>
</div>
<mat-toolbar *ngIf="sShowAppNavBar && !needToHide && mode == 'top' && isHubEnable"
[color]="primaryNavbarBackground?.color" [ngStyle]="primaryNavbarBackground?.styles"
class="mat-elevation-z3 custom mobile-height" [ngClass]="{'mobile': isHubEnable}">
Expand Down
4 changes: 2 additions & 2 deletions src/app/component/app-nav-bar/app-nav-bar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ export class AppNavBarComponent implements OnInit, OnChanges {
}

checkInfoBlockStatus() {
let comperDate = 1723825800000 - new Date().getTime()
this.infoBlockEnable = comperDate > 0 ? true: false
const comperDate = 1723825800000 - new Date().getTime()
this.infoBlockEnable = comperDate > 0 ? true : false
}

displayLogo() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/header/header/header.component.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div [ngClass]="mobileTopHeaderVisibilityStatus ? 'mobile-download-app-top-header' : 'mobile-download-app-without-top-header'" *ngIf="mobileTopHeaderVisibilityStatus && !infoBlockEnable">
<div [ngClass]="mobileTopHeaderVisibilityStatus ? 'mobile-download-app-top-header' : 'mobile-download-app-without-top-header'" *ngIf="mobileTopHeaderVisibilityStatus">
<div class="cross-mobile-download-app" (click)="hideMobileTopHeader()">
<span>X</span>
</div>
Expand Down
14 changes: 11 additions & 3 deletions src/app/header/header/header.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@ ws-app-nav-bar {

}


.height-top-info {
margin-top: 112px !important;
}

@media (min-width : 360px) and (max-width : 360px){
.mobile-download-app-desc {
margin-left:8px;
Expand Down Expand Up @@ -327,7 +332,10 @@ ws-app-nav-bar {
}
}


.height-top-info {
margin-top: 112px !important;
@media only screen and (max-width: 768px) {
.height-top-info {
margin-top: 132px !important;
}
}


0 comments on commit 5ecde2a

Please sign in to comment.