Skip to content

M
Moments
Commit 33f61e60 by aksa
Options

Merge branch 'aksa' into 'master'

Aksa See merge request !17
parents ed460b12 3ae1e150
Showing with 104 additions and 69 deletions
src/app/body/login/login.component.scss
...@@ -157,14 +157,22 @@ ...@@ -157,14 +157,22 @@
}
/*******************************************frg *modal*/
/*modal*/ .modal-dialog{
.modal-dialog{ max-width: 700px;
max-width: 600px;
} }
.modal-header{ .modal-content{
padding: 16px;
border-radius: 3px;
}
.modal-header{
border:none; border:none;
padding-left: 0%;
margin-top: 10px;
h4{ h4{
color: #535353; color: #535353;
font-weight: 600; font-weight: 600;
...@@ -181,8 +189,8 @@ ...@@ -181,8 +189,8 @@
margin-left: 0px; margin-left: 0px;
border-radius: 12px; border-radius: 12px;
} }
} }
.modal-bodyy{ .modal-bodyy{
.m-login-modal-input{ .m-login-modal-input{
input{ input{
border:none; border:none;
...@@ -192,6 +200,7 @@ ...@@ -192,6 +200,7 @@
width: 550px; width: 550px;
outline: none; outline: none;
background-color: transparent; background-color: transparent;
margin-top: 10px;
&::placeholder{ &::placeholder{
color:#636c72; color:#636c72;
} }
...@@ -199,7 +208,7 @@ ...@@ -199,7 +208,7 @@
} }
.m-login-modal-btn{ .m-login-modal-btn{
text-align:center; text-align:center;
margin-top: 20px; margin-top: 50px;
.btn-send{ .btn-send{
background: #ff9c00; background: #ff9c00;
padding: 7px 30px; padding: 7px 30px;
...@@ -211,11 +220,8 @@ ...@@ -211,11 +220,8 @@
} }
} }
} }
.modal-footer{ .modal-footer{
border: none; border: none;
padding: 2rem; padding: 2rem;
}
} }
\ No newline at end of file
src/app/body/loginvendors/loginvendors.component.scss
...@@ -246,6 +246,7 @@ ...@@ -246,6 +246,7 @@
.modal-header{ .modal-header{
border:none; border:none;
padding-left: 0%; padding-left: 0%;
margin-top: 10px;
h4{ h4{
color: #535353; color: #535353;
font-weight: 600; font-weight: 600;
......
src/app/body/payment/payment.component.scss
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.m-payment{ .m-payment{
padding-top: 100px; padding-top: 130px;
.m-payment_note{ .m-payment_note{
background: #fdfdea; background: #fdfdea;
.container{ .container{
...@@ -95,6 +95,9 @@ ...@@ -95,6 +95,9 @@
margin: 0 0 20px 0; margin: 0 0 20px 0;
} }
} }
.table-responsive{
display: table;
}
.table{ .table{
thead{ thead{
text-align: center; text-align: center;
......
src/app/header/header.component.html
<nav class="navbar navbar-expand-sm "> <nav class="navbar navbar-expand-sm shadow p3 ">
<div class="container"> <div class="container">
<div class="logo" ><a href="#"><img src="../../assets/img/Moments__logo.png"></a></div> <div class="logo" ><a href="#"><img src="../../assets/img/Moments__logo.png"></a></div>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</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 " (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">
...@@ -46,13 +46,13 @@ ...@@ -46,13 +46,13 @@
<a class="brd">|</a> <a class="brd">|</a>
</li> </li>
<li class="nav-item "> <li class="nav-item ">
<a class="Text-Style nav-link brd" href="#">VENUES</a> <a class="Text-Style nav-link " href="#">VENUES</a>
</li> </li>
<li class="nav-item linec"> <li class="nav-item linec">
<a class="brd" >|</a> <a class="brd" >|</a>
</li> </li>
<li class="nav-item" > <li class="nav-item" >
<a class="Text-Style nav-link brd" (click)="showfunc()" >VENDORS</a> <a class="Text-Style nav-link " (click)="showfunc()" >VENDORS</a>
<div class="vendors_drop " *ngIf=" headerShow "> <div class="vendors_drop " *ngIf=" headerShow ">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
......
src/assets/responsive.scss
...@@ -509,6 +509,11 @@ margin-top: 10px !important; ...@@ -509,6 +509,11 @@ margin-top: 10px !important;
} }
} }
} }
.m-payment_table{
.table-responsive{
display: block !important;
}
}
} }
} }
...@@ -597,71 +602,52 @@ margin-top: 10px !important; ...@@ -597,71 +602,52 @@ margin-top: 10px !important;
} }
//scss for nav //scss for nav
nav{ nav{
.container{
.navbar-collapse{ max-width:740px !important ;
margin-left: 5px !important;
ul{
width: 300px;
.linec{
display: none;
} }
li{ .logo{
width: 75px !important; img{
.nav-link{ max-width: 160px !important;
// width: 100% !important;
} }
.Text-Style {
// color:blue !important;
margin-right: 25px;
padding: 10px 2px;
} }
.Text-Style1 { .navbar-collapse{
//color:blue !important;
//border: none !important;
width: 100% !important;
&:hover{ margin-left: 0px !important;
// background:none !important; li{
.planning_tools_header{
width: 60% !important;
} color:#ffff; left: 161px !important;
} }
.vendors_drop{
left: 197px !important;
} }
.join{ margin: 0px !important;
// color:blue !important; .Text-Style{
// border: none !important; margin-right: 10px !important;
margin-left: -22px !important;
// width: 4px !important;
width: 59px !important;
height: 44px !important;
padding: 9px 10px !important;
&:hover{
// background:none !important;
} }
.Text-Style1{
width: 95% !important;
height: 95% !important;
border-radius: 25px !important;
}
.brd{
display: none !important;
} }
.login{ .login{
margin-left: -9px !important; margin-left: 0px !important;
// color:blue !important;
} }
.join{
padding: 5px 12px !important;
border-radius: 25px !important;
width: 70px !important;
margin-top: 4px !important;
height: 32px !important;
} }
} }
}}
}
/******************************* scss for login ********************************************/ /******************************* scss for login ********************************************/
.m-login{ .m-login{
.col-md-6{ .col-md-6{
...@@ -861,6 +847,46 @@ margin-top: 10px !important; ...@@ -861,6 +847,46 @@ margin-top: 10px !important;
} }
} }
} }
/********************************** payment table*****************************/
.m-payment{
.m-payment_note{
.container{
padding-top: 20px !important;
.m-payment_note_search{
.row{
.col-md-6{
width: 50% !important;
padding-right: 0px !important;
padding-left: 8px !important;
margin-top: 5px !important;
.rht-bro {
margin-top: 0px !important;
}
}
.col-md-5{
width: 26% !important;
padding-right: 0px !important;
//padding-left: -13px !important;
}
.col-md-1{
width: 24% !important;
padding-right:0px !important;
padding-left: 0px !important;
}
}
}
}
}
}
} }
/* 05.0 iPads (landscape) ----------- */ /* 05.0 iPads (landscape) ----------- */
......
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