Skip to content

M
Moments
Commit ed460b12 by aksa
Options

Merge branch 'aksa' into 'master'

Aksa See merge request !16
parents 70822a27 ad62e43a
Showing with 40 additions and 30 deletions
src/app/body/join/join.component.html
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<div class="txt-join"><p>By clicking "Sign Up" you agree to Moments's Terms of Use</p></div> <div class="txt-join"><p>By clicking "Sign Up" you agree to Moments's Terms of Use</p></div>
<div class="btn-m-join"> <div class="btn-m-join ">
<button class="btn-signup">signup</button> <button class="btn-signup shadow p3">signup</button>
</div> </div>
<div class="links"> <div class="links">
<div class="row"> <div class="row">
......
src/app/body/join/join.component.scss
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.m-join{ .m-join{
padding-top: 135px; padding-top: 100px;
.row{ .row{
width: 100%; width: 100%;
margin-right: 0px; margin-right: 0px;
......
src/app/body/login/login.component.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<a (click)="goto('login')"> <button class="sig-btn">Login</button></a> <a (click)="goto('login')"> <button class="sig-btn">Login</button></a>
</div> </div>
<div class="col"> <div class="col">
<a href="join"><button class="siup-btn">Signup</button></a> <a (click)="goToPage('join')"><button class="siup-btn">Signup</button></a>
</div> </div>
</div> </div>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<input type="email" placeholder="Email ID"> <input type="email" placeholder="Email ID">
<input type="password" placeholder="Password"> <input type="password" placeholder="Password">
<div class="btn-m-login"> <div class="btn-m-login">
<button class="btn-login" (click)="goToPage('loginaccount')">Login</button> <button class="btn-login shadow p3 " (click)="goToPage('loginaccount')">Login</button>
</div> </div>
<div class="links"> <div class="links">
<div class="row"> <div class="row">
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<p> <a (click)="goto('login')">Already a Member?</a> LOG IN</p> <p> <a (click)="goto('login')">Already a Member?</a> LOG IN</p>
</div> </div>
<div class="col"> <div class="col">
<a href="loginvendors"> ARE YOU A VENDOR?</a> <a (click)="goToPage('loginvendors')"> ARE YOU A VENDOR?</a>
</div> </div>
</div> </div>
......
src/app/body/login/login.component.scss
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.m-login { .m-login {
padding-top: 135px; padding-top: 100px;
.row{ .row{
width: 100%; width: 100%;
margin-right: 0px; margin-right: 0px;
......
src/app/body/loginvendors/loginvendors.component.html
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<a (click)="goto('login')"> <button class="sig-btn">Login</button></a> <a (click)="goto('login')"> <button class="sig-btn">Login</button></a>
</div> </div>
<div class="col"> <div class="col">
<a (click)="goto('join')"><button class="siup-btn">Signup</button></a> <a (click)="goToPage('join')"><button class="siup-btn">Signup</button></a>
</div> </div>
</div> </div>
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
<div class="m-login-conent"> <div class="m-login-conent">
<input type="email" placeholder="Email ID"> <input type="email" placeholder="Email ID">
<input type="password" placeholder="Password"> <input type="password" placeholder="Password">
<div class="btn-m-login"> <div class="btn-m-login ">
<button class="btn-login">Login</button> <button class="btn-login shadow p3">Login</button>
</div> </div>
<div class="links"> <div class="links">
<div class="row"> <div class="row">
......
src/app/body/loginvendors/loginvendors.component.scss
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.m-login { .m-login {
padding-top: 135px; padding-top: 100px;
.row{ .row{
width: 100%; width: 100%;
margin-right: 0px; margin-right: 0px;
......
src/app/body/payment/payment.component.html
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
<h5>PLANS & PRICING</h5> <h5>PLANS & PRICING</h5>
<p>Rates based on your selections</p> <p>Rates based on your selections</p>
</div> </div>
<table class="table "> <table class="table table-responsive ">
<thead> <thead>
<tr > <tr >
<th class="m_table_color-head">LITE</th> <th class="m_table_color-head">LITE</th>
<th class="m_table_color-head">PROFESSIONAL</th> <th class="m_table_color-head">PROFESSIONAL</th>
<th class="m_table_color-head"> FEATURED AD</th> <th class="m_table_color-head"> FEATURED AD</th>
<th class="m_table_color-head">SPOTLIGHT AD</th> <th class="m_table_color-head">SPOTLIGHT AD</th>
...@@ -31,7 +32,7 @@ ...@@ -31,7 +32,7 @@
</thead> </thead>
<tbody> <tbody>
<tr > <tr >
<td ><div class="fst-colm">0</div> <button class="btn-pay-select">Select</button></td> <td ><div class="fst-colm">0</div> <button class="btn-pay-select">Select</button></td>
<td ><div class="fst-colm">2000</div> <button class="btn-pay-select">Select</button></td> <td ><div class="fst-colm">2000</div> <button class="btn-pay-select">Select</button></td>
<td><div class="fst-colm">3000</div> <button class="btn-pay-select">Select</button></td> <td><div class="fst-colm">3000</div> <button class="btn-pay-select">Select</button></td>
<td ><div class="fst-colm">4000</div> <button class="btn-pay-select">Select</button></td> <td ><div class="fst-colm">4000</div> <button class="btn-pay-select">Select</button></td>
...@@ -141,6 +142,7 @@ ...@@ -141,6 +142,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
......
src/app/body/payment/payment.component.scss
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.m-payment{ .m-payment{
padding-top: 135px; padding-top: 100px;
.m-payment_note{ .m-payment_note{
background: #fdfdea; background: #fdfdea;
.container{ .container{
......
src/app/body/payment/payment.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { Router, ActivatedRoute } from '@angular/router';
@Component({ @Component({
selector: 'app-payment', selector: 'app-payment',
templateUrl: './payment.component.html', templateUrl: './payment.component.html',
...@@ -7,9 +7,12 @@ import { Component, OnInit } from '@angular/core'; ...@@ -7,9 +7,12 @@ import { Component, OnInit } from '@angular/core';
}) })
export class PaymentComponent implements OnInit { export class PaymentComponent implements OnInit {
constructor() { } constructor(private route: ActivatedRoute, private router: Router) { }
ngOnInit() { ngOnInit() {
} }
goto(path,data=null){
this.router.navigateByUrl(path,{queryParams:data});
}
} }
src/app/header/header.component.html
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
<span class="navbar-toggler-icon"><i class="fa fa-bars"></i></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="collapsibleNavbar"> <div class="collapse navbar-collapse" id="collapsibleNavbar">
...@@ -14,28 +14,29 @@ ...@@ -14,28 +14,29 @@
<a class="Text-Style1 nav-link" href="#">WRITE A REVIEW</a> <a class="Text-Style1 nav-link" href="#">WRITE A REVIEW</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="Text-Style nav-link brd " (click)=" plansfunc()" >PLANNING TOOLS</a> <a class="Text-Style nav-link brd " (click)=" plansfunc()" >PLANNING TOOLS</a>
<div class="planning_tools_header" *ngIf=" plansShow "> <div class="planning_tools_header" *ngIf=" plansShow ">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="planning_tools_header_item"> <div class="planning_tools_header_item">
<a>Checklist</a> <a (click)="goto('login')">Checklist</a>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="planning_tools_header_item"> <div class="planning_tools_header_item">
<a>Guest List</a> <a (click)="goto('login')">Guest List</a>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="planning_tools_header_item"> <div class="planning_tools_header_item">
<a>Budget</a> <a (click)="goto('login')">Budget</a>
</div> </div>
</div> </div>
<div class="col"> <div class="col">
<div class="planning_tools_header_item"> <div class="planning_tools_header_item">
<a>Vendors Manager</a> <a (click)="goto('login')">Vendors Manager</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -97,7 +98,7 @@ ...@@ -97,7 +98,7 @@
<div class="clear"></div>
</li> </li>
<li class="nav-item "> <li class="nav-item ">
......
src/app/header/header.component.scss
...@@ -19,6 +19,7 @@ height:100px ; ...@@ -19,6 +19,7 @@ height:100px ;
background-size: 100%; background-size: 100%;
width: 39px; width: 39px;
height: 45px; height: 45px;
} }
} }
.navbar-collapse{ .navbar-collapse{
...@@ -174,5 +175,8 @@ height:100px ; ...@@ -174,5 +175,8 @@ height:100px ;
} }
} }
button{
outline:none;
}
} }
src/assets/responsive.scss
...@@ -436,7 +436,7 @@ margin-top: 10px !important; ...@@ -436,7 +436,7 @@ margin-top: 10px !important;
width: 170px !important; width: 170px !important;
font-size: 14px !important; font-size: 14px !important;
margin-left: -89px !important; margin-left: -54x !important;
} }
} }
} }
...@@ -464,7 +464,7 @@ margin-top: 10px !important; ...@@ -464,7 +464,7 @@ margin-top: 10px !important;
width: 170px !important; width: 170px !important;
margin-left: -76px !important; margin-left: -54px !important;
} }
} }
...@@ -618,14 +618,14 @@ margin-top: 10px !important; ...@@ -618,14 +618,14 @@ margin-top: 10px !important;
} }
.Text-Style { .Text-Style {
color:blue !important; // color:blue !important;
margin-right: 25px; margin-right: 25px;
padding: 10px 2px; padding: 10px 2px;
} }
.Text-Style1 { .Text-Style1 {
color:blue !important; //color:blue !important;
//border: none !important; //border: none !important;
width: 100% !important; width: 100% !important;
...@@ -637,7 +637,7 @@ margin-top: 10px !important; ...@@ -637,7 +637,7 @@ margin-top: 10px !important;
} }
} }
.join{ .join{
color:blue !important; // color:blue !important;
// border: none !important; // border: none !important;
margin-left: -22px !important; margin-left: -22px !important;
// width: 4px !important; // width: 4px !important;
...@@ -652,7 +652,7 @@ margin-top: 10px !important; ...@@ -652,7 +652,7 @@ margin-top: 10px !important;
.login{ .login{
margin-left: -9px !important; margin-left: -9px !important;
color:blue !important; // color:blue !important;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment