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 159 additions and 122 deletions
src/app/body/login/login.component.scss
......@@ -156,66 +156,72 @@
}
/*******************************************frg *modal*/
.modal-dialog{
max-width: 700px;
/*modal*/
.modal-dialog{
max-width: 600px;
}
.modal-header{
}
.modal-content{
padding: 16px;
border-radius: 3px;
}
.modal-header{
border:none;
padding-left: 0%;
margin-top: 10px;
h4{
color: #535353;
font-weight: 600;
font-size: 18px;
margin: 0;
}
hr {
margin-top: 5px;
margin-bottom: 5px;
border: 1px solid rgb(255, 0,255);
width: 20px;
margin-left: 0px;
border-radius: 12px;
}
}
.modal-bodyy{
.m-login-modal-input{
input{
border:none;
h4{
color: #535353;
font-weight: 600;
font-size: 18px;
margin: 0;
}
hr {
margin-top: 5px;
margin-bottom: 5px;
border: 1px solid rgb(255, 0,255);
width: 20px;
margin-left: 0px;
border-radius: 12px;
}
}
.modal-bodyy{
.m-login-modal-input{
input{
border:none;
color: black;
border-bottom: 1px solid #d7d7d7 ;
font-size: 15px;
width: 550px;
outline: none;
background-color: transparent;
&::placeholder{
color:#636c72;
}
}
}
.m-login-modal-btn{
text-align:center;
margin-top: 20px;
.btn-send{
background: #ff9c00;
padding: 7px 30px;
border: 1px solid #ff9c00;
color: #fff;
font-size: 17px;
border-radius: 30px;
outline: none;
}
}
}
.modal-footer{
border: none;
padding: 2rem;
color: black;
border-bottom: 1px solid #d7d7d7 ;
font-size: 15px;
width: 550px;
outline: none;
background-color: transparent;
margin-top: 10px;
&::placeholder{
color:#636c72;
}
}
}
.m-login-modal-btn{
text-align:center;
margin-top: 50px;
.btn-send{
background: #ff9c00;
padding: 7px 30px;
border: 1px solid #ff9c00;
color: #fff;
font-size: 17px;
border-radius: 30px;
outline: none;
}
}
}
.modal-footer{
border: none;
padding: 2rem;
}
\ No newline at end of file
src/app/body/loginvendors/loginvendors.component.scss
......@@ -246,6 +246,7 @@
.modal-header{
border:none;
padding-left: 0%;
margin-top: 10px;
h4{
color: #535353;
font-weight: 600;
......
src/app/body/payment/payment.component.scss
......@@ -7,7 +7,7 @@
.m-payment{
padding-top: 100px;
padding-top: 130px;
.m-payment_note{
background: #fdfdea;
.container{
......@@ -95,6 +95,9 @@
margin: 0 0 20px 0;
}
}
.table-responsive{
display: table;
}
.table{
thead{
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="logo" ><a href="#"><img src="../../assets/img/Moments__logo.png"></a></div>
......@@ -16,7 +16,7 @@
</li>
<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="row">
<div class="col">
......@@ -46,13 +46,13 @@
<a class="brd">|</a>
</li>
<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 class="nav-item linec">
<a class="brd" >|</a>
</li>
<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="row">
<div class="col">
......
src/assets/responsive.scss
......@@ -508,7 +508,12 @@ margin-top: 10px !important;
}
}
}
}
}
.m-payment_table{
.table-responsive{
display: block !important;
}
}
}
}
......@@ -597,71 +602,52 @@ margin-top: 10px !important;
}
//scss for nav
nav{
.container{
max-width:740px !important ;
}
.logo{
img{
max-width: 160px !important;
}
}
.navbar-collapse{
.navbar-collapse{
margin-left: 5px !important;
ul{
width: 300px;
margin-left: 0px !important;
li{
.planning_tools_header{
width: 60% !important;
left: 161px !important;
}
.vendors_drop{
left: 197px !important;
}
margin: 0px !important;
.Text-Style{
margin-right: 10px !important;
}
.Text-Style1{
width: 95% !important;
height: 95% !important;
border-radius: 25px !important;
}
.brd{
display: none !important;
}
.login{
margin-left: 0px !important;
}
.join{
padding: 5px 12px !important;
border-radius: 25px !important;
width: 70px !important;
margin-top: 4px !important;
height: 32px !important;
.linec{
display: none;
}
li{
width: 75px !important;
.nav-link{
// width: 100% !important;
}
.Text-Style {
// color:blue !important;
margin-right: 25px;
padding: 10px 2px;
}
.Text-Style1 {
//color:blue !important;
//border: none !important;
width: 100% !important;
&:hover{
// background:none !important;
} color:#ffff;
}
}
.join{
// color:blue !important;
// border: none !important;
margin-left: -22px !important;
// width: 4px !important;
width: 59px !important;
height: 44px !important;
padding: 9px 10px !important;
&:hover{
// background:none !important;
}
}
.login{
margin-left: -9px !important;
// color:blue !important;
}
}
}
}
}}
}
/******************************* scss for login ********************************************/
.m-login{
.col-md-6{
......@@ -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) ----------- */
......
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