Merge branch 'alen' into 'master'

src/app/app.scss

@@ -7,5 +7,21 @@
 @import "../assets/css/theme.scss";
 
 //Essentail SCSS//
-
-@import "../assets/css/essential.scss";
+.cab_sidemenu_bg{background:#4d4d4d;background-size: cover !important;background-position: center !important;}
+.cab_sidemenu_wrapper{width:100%;height:100%;}
+.cab_profile_banner{width:100%;padding-top:80px;}
+.cab_profile_picture{width:100px;height:100px;margin:0 auto;border:2px solid #f7941e;background-size: 25px !important;border-radius:50%;background: url("../assets/img/avatar.png");background-position: center;background-repeat: no-repeat;}
+.cab_profile_banner h6{color:#fff;margin:0px;font-size:16px;font-weight: 400;padding-bottom: 7px;padding-top: 15px;padding-left:10px;padding-right:10px;text-align: center;}
+.cab_profile_banner p{color:#fff;margin:0px;font-size:20px;font-weight:300;padding-left:10px;padding-right:10px;text-align: center;}
+.cab_profile_picture img{width:100%;height:100%;border-radius:50%;}
+.cab_sidemenu_list{width:100%;padding-left: 30px;padding-top: 30px;}
+.cab_sidemenu_list ul{width:100%;padding:0px;margin:0px;}
+.cab_sidemenu_list ul li{list-style: none;color: #fff;font-size:16px;font-weight:300;padding-top:15px;padding-bottom:15px;background-position: left !important;background-repeat: no-repeat !important;padding-left: 35px;background-size:23px !important;}
+.cab_sidemenu_list ul .book{background: url("../assets/img/book.png");}
+.cab_sidemenu_list ul .trip{background: url("../assets/img/trip.png");}
+.cab_sidemenu_list ul .rate{background: url("../assets/img/rate.png");}
+.cab_sidemenu_list ul .payment{background: url("../assets/img/payment.png");}
+.cab_sidemenu_list ul .offer{background: url("../assets/img/offer.png");}
+.cab_sidemenu_list ul .settings{background: url("../assets/img/settings.png");}
+.cab_sidemenu_list ul .logout{background: url("../assets/img/logout.png");}
+// @import "../assets/css/essential.scss";

src/pages/forgot/forgot.ts

@@ -15,7 +15,8 @@ export class ForgotPage {
   constructor(public navCtrl: NavController, public navParams: NavParams, private formbuilder: FormBuilder, private myservice: Myservice) {
 
     this.forgotForm = this.formbuilder.group({
-      email: ['', Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}")])]
+      email: ['', Validators.compose([Validators.required, Validators.pattern("[a-zA-Z0-9.-_]{1,}@[a-zA-Z.-]{2,}[.]{1}[a-zA-Z]{2,}")])],
+      from:['user']
     })
   }
 

src/pages/home/home.scss

@@ -12,6 +12,6 @@ page-home {
   .cab_location_input:-ms-input-placeholder {color:#fff;}
   .cab_location_input:-moz-placeholder {color:#fff;}
   .cab_footer_btn_bay{width:100%;}
-  .cab_footer_btn{width:50%;height:50px;font-weight: 300;letter-spacing: 2px;border-radius:0px !important;background: #4d4d4d;color:#FFF;text-align: center;font-size: 16px;margin:0px;text-transform: capitalize !important;}
+  .cab_footer_btn{width:100%;height:50px;font-weight: 300;letter-spacing: 2px;border-radius:0px !important;background: #4d4d4d;color:#FFF;text-align: center;font-size: 16px;margin:0px;text-transform: capitalize !important;}
   .cab_button_search{width:60px;height:60px;border-radius:50%;color:#fff;position: fixed;top:75px;right:0px;font-size: 20px;border-top-right-radius: 0px;border-bottom-right-radius: 0px;}
 }

src/pages/landing/landing.scss

@@ -11,7 +11,7 @@ page-landing {
   .cab_logo img{width:200px;}
   .cab_footer{width:100%;text-align: center;}
   .cab_footer p{color: #3d3a3b;font-weight: 500;font-size: 18px;}
-  .cab_footer li{list-style: none;display: inline-block;color: #3d3a3b;font-size: 35px;margin:10px;}
+  .cab_footer li{list-style: none;display: inline-block;color: #3d3a3b;font-size: 30px;margin:10px;}
   .cab_sign_btn{height:45px;width:100%;background:#ff9c00;color: #fff;text-transform: capitalize !important;font-size: 18px;font-weight: 300;}
   .cab_sign_btn1{height:45px;width:100%;border:1px solid #ff9c00;color: #ff9c00;background:transparent;text-transform: capitalize !important;font-size: 18px;font-weight: 300;}
   .cab_form p{color: #3d3a3b;font-weight: 500;font-size: 18px;}

src/pages/profile/profile.scss

@@ -8,4 +8,24 @@ page-profile {
   .edit_circle{width:30px;height:30px;position:absolute;top:0px;right:0px;background-color:#f7941e;color:#fff;text-align:center;border-radius: 50%;padding:7px;}
 .edit_circle input{width: 100%;opacity: 0;z-index: 99;position: absolute;right: 0px;}
 .edit_circle ion-icon{position: absolute;top: 6px;right: 8px;}
+.picker-wrapper{background: #ff9000 !important;}
+.picker-toolbar{background: #ff9000 !important;}
+.single_btn{width: 100% !important}
+.txt_cntr{text-align: center}
+.clr_wht{color: #fff}
+.rate_est{font-size: 15px;padding-top: 5px}
+.estim_li{padding-top: 5px !important;}
+.button-md:hover:not(.disable-hover) {
+    background: #f7941e;
+}
+
+.cab_phone_number{width:100%;height:50px;border-bottom:2px solid #ff9c00;}
+.cab_phone_code{width:50px;height:100%;-webkit-appearance: none;-moz-appearance: none;background: transparent !important;text-align: center;border:none;padding-left: 10px;color: #3d3a3b;font-size: 18px;}
+.cab_phone_code option{text-align: center;}
+.cab_phone_input{width:calc(100% - 50px);height:100%;border:none;color:#3d3a3b;font-size: 18px;padding-left: 10px;padding-right: 20px;}
+.cab_phone_input::-webkit-input-placeholder {color:#3d3a3b;}
+.cab_phone_input::-moz-placeholder {color:#3d3a3b;}
+.cab_phone_input:-ms-input-placeholder {color:#3d3a3b;}
+.cab_phone_input:-moz-placeholder {color:#3d3a3b;}
+.cab_footer_btn{width:50%;height:50px;font-weight: 300;letter-spacing: 2px;border-radius:0px !important;background: #4d4d4d;color:#FFF;text-align: center;font-size: 16px;margin:0px;text-transform: capitalize !important;}
 }