diff --git a/src/app/cart/cart.page.scss b/src/app/cart/cart.page.scss index 484286d..5d01eeb 100644 --- a/src/app/cart/cart.page.scss +++ b/src/app/cart/cart.page.scss @@ -8,6 +8,8 @@ background-repeat: no-repeat; background-size: cover; .nav_header { + position: static; + background-color: transparent; .nav_title { h4 { color: #FFF; diff --git a/src/app/changepass/changepass.page.html b/src/app/changepass/changepass.page.html index ce60bad..498ded0 100644 --- a/src/app/changepass/changepass.page.html +++ b/src/app/changepass/changepass.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -6,7 +6,7 @@ <h4>CHANGE PASSWORD</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="verification_div"> <div class="form_div"> diff --git a/src/app/forgot/forgot.page.html b/src/app/forgot/forgot.page.html index 72261df..84f3952 100644 --- a/src/app/forgot/forgot.page.html +++ b/src/app/forgot/forgot.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -6,7 +6,7 @@ <h4>FORGOT PASSWORD</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="verification_div"> <div class="form_div"> diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index f3e6995..c43eb1c 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,4 +1,4 @@ -<ion-header> +<!-- <ion-header> <button class="nav_btn nav_menu floatLeft"> <img src="../../assets/Group 22_2.png"> </button> @@ -7,8 +7,19 @@ <button class="nav_btn nav_search floatRight"> </button> <div class="clear"></div> -</ion-header> +</ion-header> --> +<div class="nav_header"> + <button class="nav_btn nav_menu floatLeft"> + <img src="../../assets/Group 22_2.png"> + </button> + <div class="nav_title floatLeft"> + <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."> </div> + <button class="nav_btn nav_search floatRight"> + </button> + <div class="clear"></div> +</div> <ion-content> + <div class="home_wrapper"> <div class="home_banner"> <div class="home_banner_title"> diff --git a/src/app/login/login.page.html b/src/app/login/login.page.html index 5bff3db..862a988 100644 --- a/src/app/login/login.page.html +++ b/src/app/login/login.page.html @@ -1,11 +1,13 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn floatLeft"> - </button> + </button> <div class="nav_title floatLeft"> <h4>LOGIN</h4> </div> <div class="clear"></div> -</ion-header> +</div> + + <ion-content> <div class="login_wrapper"> <div class="logo_wrapper"> diff --git a/src/app/myorder/myorder.page.html b/src/app/myorder/myorder.page.html index 1dea02f..da70bbb 100644 --- a/src/app/myorder/myorder.page.html +++ b/src/app/myorder/myorder.page.html @@ -1,11 +1,11 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> </button> <div class="nav_title floatLeft"> <h4>MY ORDERS</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="myorder_wrapper"> <ul> diff --git a/src/app/ordercancelled/ordercancelled.page.scss b/src/app/ordercancelled/ordercancelled.page.scss index 0827ca9..8cbc669 100644 --- a/src/app/ordercancelled/ordercancelled.page.scss +++ b/src/app/ordercancelled/ordercancelled.page.scss @@ -9,6 +9,8 @@ background-repeat: no-repeat; background-size: cover; .nav_header { + position: static; + background-color: transparent; .nav_title { h4 { color: #FFF; diff --git a/src/app/orderplaced/orderplaced.page.scss b/src/app/orderplaced/orderplaced.page.scss index 57db7e6..34800f1 100644 --- a/src/app/orderplaced/orderplaced.page.scss +++ b/src/app/orderplaced/orderplaced.page.scss @@ -9,6 +9,8 @@ background-repeat: no-repeat; background-size: cover; .nav_header { + position: static; + background-color: transparent; .nav_title { h4 { color: #FFF; diff --git a/src/app/productdetail/productdetail.page.html b/src/app/productdetail/productdetail.page.html index 97116c1..136ef33 100644 --- a/src/app/productdetail/productdetail.page.html +++ b/src/app/productdetail/productdetail.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -7,7 +7,7 @@ <button class="nav_btn floatRight"> </button> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="product_detail_wrapper"> <div class="product_banner"> diff --git a/src/app/productlist/productlist.page.html b/src/app/productlist/productlist.page.html index 0174d74..35da354 100644 --- a/src/app/productlist/productlist.page.html +++ b/src/app/productlist/productlist.page.html @@ -1,15 +1,16 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> - </button> + </button> <div class="nav_title floatLeft"> <input class="search_bar" placeholder="Search here.. eg:shirts, retailers etc..."> </div> <button class="nav_btn nav_search floatRight"> <img src="../../assets/search_2.png"> - </button> + </button> <div class="clear"></div> -</ion-header> +</div> <ion-content> + <div class="product_list"> <div class="product_taskbar"> <div class="filter floatLeft" (click)="istoggle()"> diff --git a/src/app/reviewlist/reviewlist.page.html b/src/app/reviewlist/reviewlist.page.html index ab2f79b..e6f33aa 100644 --- a/src/app/reviewlist/reviewlist.page.html +++ b/src/app/reviewlist/reviewlist.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -6,7 +6,7 @@ <h4>REVIEWS</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="nearby_shop_list"> <ul> diff --git a/src/app/signup/signup.page.html b/src/app/signup/signup.page.html index 935073c..7bc99df 100644 --- a/src/app/signup/signup.page.html +++ b/src/app/signup/signup.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -6,7 +6,7 @@ <h4>SIGN UP</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="login_wrapper"> <div class="logo_wrapper"> diff --git a/src/app/trackorder/trackorder.page.html b/src/app/trackorder/trackorder.page.html index 1e9f215..55d24eb 100644 --- a/src/app/trackorder/trackorder.page.html +++ b/src/app/trackorder/trackorder.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -6,7 +6,7 @@ <h4>ORDER TRACKING</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="trackorder_div"> <agm-map [zoom]="18" [latitude]=" lat " [longitude]="lng " [backgroundColor]="444397"> diff --git a/src/app/verification/verification.page.html b/src/app/verification/verification.page.html index 5255bc2..e350104 100644 --- a/src/app/verification/verification.page.html +++ b/src/app/verification/verification.page.html @@ -1,4 +1,4 @@ -<ion-header> +<div class="nav_header"> <button class="nav_btn nav_back floatLeft" (click)="goBack()"> <img src="../../assets/Group17_2.png"> </button> @@ -6,7 +6,7 @@ <h4>VERIFICATION</h4> </div> <div class="clear"></div> -</ion-header> +</div> <ion-content> <div class="verification_div"> <div class="form_div"> diff --git a/src/global.scss b/src/global.scss index 350ab33..f4b4cd5 100644 --- a/src/global.scss +++ b/src/global.scss @@ -366,6 +366,38 @@ button { text-align: center !important; } +.ion-page { + padding-top: 50px; +} + +app-landing { + padding: 0px !important; +} + +app-cart { + padding: 0px !important; +} + +app-orderplaced { + padding: 0px !important; +} + +app-ordercancelled { + padding: 0px !important; +} + +.nav_header { + position: fixed; + top: 0px; + left: 0px; + right: 0px; + z-index: 9999; + background-color: #fff; + -webkit-box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.2); + -moz-box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.2); + box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.2); +} + .nav_btn { width: 50px; height: 50px; @@ -380,7 +412,7 @@ button { .nav_title { width: calc(100% - 100px); color: rgba(59, 57, 77, 1); - padding: 15px; + padding: 12px; padding-left: 5px; padding-right: 5px; font-weight: 400;