Attempted manual merge to avoid conflicts

This commit is contained in:
M.Ravi 2017-06-07 03:05:21 +05:30
commit cd524350d8
7 changed files with 328 additions and 121 deletions

View file

@ -289,6 +289,10 @@ h6 {
align-items: center;
position: relative;
}
.intro-pricing.success-pricing{
height: 100vh;
max-height: 100vh;
}
.intro-pricing::before{
content: "";
position: absolute;
@ -296,7 +300,7 @@ h6 {
bottom: 0;
left: 0;
right: 0;
background: rgba(90, 116, 175, 0.8);
background: rgba(90, 116, 175, 0.7);
}
.intro-pricing .intro-message .section-heading{
font-size: 45px;
@ -578,8 +582,8 @@ h6 {
}
.price-calc-section .text .section-heading{
font-family: 'Montserrat-Bold';
font-size: 48px;
line-height: 48px;
font-size: 50px;
line-height: 50px;
padding-bottom: 25px;
color: #3a3a3a;
letter-spacing: 1px;
@ -636,24 +640,22 @@ h6 {
border-bottom: 1px solid rgba(128, 128, 128, 0.3);
position: relative;
display: flex;
justify-content: center;
justify-content: space-around;
align-items: center;
}
.price-calc-section .card .description span{
font-size: 20px;
.price-calc-section .card .description span {
font-size: 16px;
margin-left: 4px;
margin-left: 0px;
/* justify-self: start; */
width: 30%;
text-align: left;
}
.price-calc-section .card .description input{
font-size: 20px;
text-align: center;
width: 70px;
}
.price-calc-section .card .description #coreValue{
width: 50px;
}
.price-calc-section .card .description #ramValue{
width: 50px;
width: 60px;
}
.price-calc-section .card .description i{
color: #29427A;
@ -684,12 +686,32 @@ h6 {
height: 40px;
width: 200px;
text-align: center;
font-size: 18px;
font-size: 16px;
margin-left: 10px;
}
.price-calc-section .card .check-ip{
font-size: 18px;
}
.price-calc-section .card .description.input{
justify-content: center;
}
.price-calc-section .card .description.input label{
font-size: 15px;
font-weight: 800;
font-family: 'Montserrat-Regular';
margin-bottom: 0;
width: 40px;
}
.price-calc-section .card .description.input input{
width: 200px;
font-size: 14px;
text-align: left;
padding: 5px 10px;
border-radius: 4px;
border: 1px solid #d0d0d0;
background: #fff;
margin-left: 10px;
}
.price-calc-section .card .check-ip input[type=checkbox]{
font-size: 17px;
margin: 0 8px;
@ -814,6 +836,10 @@ h6 {
transform: translate(-50%, 0);
}
.intro-pricing .intro-message .section-heading {
font-size: 30px;
}
.price-calc-section{
flex-direction: column;
padding: 60px 10px !important;
@ -842,6 +868,14 @@ h6 {
font-size: 18px;
text-align: center;
}
.price-calc-section .card .description input {
font-size: 17px;
text-align: center;
width: 60px;
}
}
@media(max-width:540px) {
@ -858,13 +892,13 @@ h6 {
.intro-message > h1 {
font-size: 2em;
}
.price-calc-section .text .section-heading {
.price-calc-section .text .section-heading {
font-size: 24px;
line-height: 25px;
}
.price-calc-section .card .description span {
font-size: 17px;
margin-left: 4px;
font-size: 15px;
margin-left: 0px;
}
}
@ -960,3 +994,7 @@ a#forgotpassword {
.form-300{
width: 300px;
}
.error-message-box{
margin-top: 20px;
}