merge with master

This commit is contained in:
rahul shukla 2018-11-29 13:11:48 +05:30
parent 30ade42635
commit bdfe3005b8
1 changed files with 93 additions and 586 deletions

View File

@ -148,7 +148,7 @@ input {
//components
.bold {
font-weight: bold;
color: $bold-color;
color: #3A3A3A;
}
/* The container */
@ -178,7 +178,7 @@ input {
height: 16px;
width: 16px;
background-color: white;
border: 2px solid $disc-price;
border: 2px solid #FF6472;
border-radius: 50%;
}
/* Create the indicator (the dot/circle - hidden when not checked) */
@ -194,10 +194,19 @@ input {
width: 8px;
height: 8px;
border-radius: 50%;
background: $disc-price;
background: #FF6472;
}
}
/* Verify Email */
.verify-account {
width: 100%;
height: 30px;
background-color: $border-color;
line-height: 30px;
text-align: center;
}
/* Show the indicator (dot/circle) when checked */
.radio-container input:checked ~ .checkmark:after {
display: block;
@ -224,13 +233,13 @@ input {
}
.regular-price {
color: $font-color-light;
color: #A5A5A5;
text-decoration: line-through;
margin-right: 10px;
}
.special-price {
color: $disc-price;
color: #FF6472;
}
}
@ -365,7 +374,7 @@ input {
max-height: 350px;
max-width: 280px;
margin-bottom: 10px;
background: $background-color;
background: #F2F2F2;
img {
display: block;
@ -426,15 +435,15 @@ input {
text-transform: uppercase;
padding: 4px 13px;
font-size: 14px;
color: $btn-background-color;
color: #fff;
box-shadow: 1px 1px 1px #cccccc;
&.sale {
background: $disc-price;
background: #FF6472;
}
&.new {
background: $sticker-color;
background: #2ED04C;
}
}
}
@ -591,6 +600,13 @@ input {
}
}
@media only screen and (max-width: 530px) {
.main-container-wrapper {
padding-left: 0px;
padding-right: 0px;
}
}
//slider styles
section.slider-block {
display: block;
@ -757,7 +773,7 @@ section.slider-block {
border-bottom-right-radius: 3px;
button {
background: $btn-background-color;
background: #fff;
border: 0;
padding: 3px 5px;
}
@ -911,7 +927,7 @@ section.slider-block {
}
.dropdown-content .item-details{
height: 75px;
max-height: 125px;
}
.item-details .item-name {
@ -920,6 +936,12 @@ section.slider-block {
margin-bottom: 8px;
}
.item-details .item-options {
font-size: 16px;
font-weight: bold;
margin-bottom: 8px;
}
.item-details .item-price {
margin-bottom: 8px;
}
@ -959,7 +981,7 @@ section.slider-block {
}
li:last-child {
margin-right: -2px;
margin-right: 0px;
}
ul {
@ -1124,6 +1146,7 @@ section.slider-block {
@media all and (max-width: 720px) {
.header {
.currency-switcher {
display: none !important;
}
@ -1223,7 +1246,7 @@ section.slider-block {
padding-top: 25px;
a {
color: $font-color;
color: #242424;
}
li {
@ -1297,16 +1320,12 @@ section.slider-block {
width: 100%;
height: 120px;
font-size: 16px;
color: $font-color-light;
color: #A5A5A5;
letter-spacing: -0.26px;
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
p {
padding: 0px 15px;
}
}
//category page
@ -1335,7 +1354,7 @@ section.slider-block {
.filter-attributes-title {
padding: 10px 40px 0 10px;
color: $other-font-color;
color: #5E5E5E;
cursor: pointer;
position: relative;
@ -1366,7 +1385,7 @@ section.slider-block {
li.item {
padding: 8px 0;
color: $other-font-color;
color: #5E5E5E;
.checkbox {
margin: 0;
@ -1408,7 +1427,6 @@ section.slider-block {
width: 100%;
float: none;
padding-right: 0px;
margin-top: -25px !important;
}
.category-block {
@ -1640,6 +1658,7 @@ section.product-detail {
width: 100%;
max-height: 480px;
height: 100%;
box-shadow: 1px 1px 2px $border-color;
img {
width: 100%;
@ -1677,17 +1696,12 @@ section.product-detail {
display: none;
flex-direction: row;
margin-top: 10px;
width: 100%;
justify-content: flex-end;
width: 79.5%;
float: right;
justify-content: space-between;
.wrap {
display: flex;
justify-content: space-between;
width: 80%;
}
.addtocart {
border-radius: 0px;
width: 49%;
background: black;
white-space: nowrap;
@ -1695,9 +1709,7 @@ section.product-detail {
}
.buynow {
border-radius: 0px;
width: 49%;
float:right;
white-space: nowrap;
text-transform: uppercase;
}
@ -1743,10 +1755,10 @@ section.product-detail {
.stock-status {
margin-bottom: 15px;
font-weight: 600;
color: $rating-color;
color: #FC6868;
&.active {
color: $stock-color;
color: #4CAF50;
}
}
@ -1801,7 +1813,7 @@ section.product-detail {
// product pages responsive css start here
@media only screen and (max-width: 720px) {
section.product-detail div.layouter .form-container {
section.product-detail div.layouter form {
flex-direction: column;
div.product-image-group {
@ -1845,11 +1857,6 @@ section.product-detail {
width: 480px;
}
}
.wrap {
flex-direction: row;
width: 100% !important;
}
}
}
@ -1861,7 +1868,7 @@ section.product-detail {
}
@media only screen and (max-width: 510px) {
section.product-detail div.layouter .form-container {
section.product-detail div.layouter form {
div.product-image-group {
.product-hero-image img {
width: 100% !important;
@ -1870,15 +1877,11 @@ section.product-detail {
}
}
@media only screen and (max-width: 480px) {
section.product-detail div.layouter .form-container .details {
margin-top: 0px;
}
}
@media only screen and (max-width: 360px) {
section.product-detail div.layouter .form-container .details {
margin-top: -120px;
@media only screen and (max-width: 510px) {
section.product-detail div.layouter form {
.details {
margin-top: -90px;
}
}
}
@ -2519,7 +2522,7 @@ section.review {
}
.product-name a {
color: $font-color;
color: #242424;
}
.product-price {
@ -2545,7 +2548,7 @@ section.review {
width: 49%;
.heading {
color: $font-color;
color: #242424;
font-weight: 600;
.right {
@ -2555,19 +2558,18 @@ section.review {
}
.rating {
color: $bold-color;
font-size: 15px;
color: $font-color-light;
.rating-title::after {
content: "*";
color: $rating-color;
color: #FC6868;
font-weight: 700;
display: inline-block;
}
label.star {
font-size: 25px;
color: $star-color;
color: #d4d4d4;
transition: all .2s;
}
@ -2577,16 +2579,36 @@ section.review {
}
.control-group {
label {
color: $font-color-light;
font-size: 16px;
}
.control {
width: 90%;
color: $font-color-light;
}
}
.control-error {
color: $error-color;
color: #ff5656;
font-size: 14px;
}
.write-review {
label {
color: $font-color-light;
font-size: 16px;
}
textarea {
margin-top: 5px;
border: 2px solid $border-color;
color: $font-color-light;
border-radius: 3px;
width: 90%;
height: 120px;
}
}
.review-detail{
height: 150px;
border: 1px solid firebrick;
@ -2668,10 +2690,10 @@ section.review {
width: calc(100% - 100px);
margin-right: 5px;
margin-left: 5px;
background: $line-bar-color;
background: #D8D8D8;
.line-value {
background-color: $brand-color;
background-color: #0031F0;
}
}
}
@ -2703,12 +2725,8 @@ section.review {
width: 100%;
margin-left: 0px;
.heading {
margin-bottom: 70px;
.right {
margin-top: 50px;
}
.heading .right {
margin-top: 50px;
}
.ratings-reviews {
@ -2733,6 +2751,7 @@ section.review {
}
}
}
//review responsive css end here
@ -2760,7 +2779,7 @@ section.review {
border: 1px solid $border-color;
flex-direction: column;
max-width: 500px;
min-width: 320px;
min-width: 380px;
padding: 25px;
.login-text {
@ -2826,7 +2845,7 @@ section.review {
text-align: center;
a {
color: $other-font-color;
color: #5E5E5E;
}
.icon {
@ -3077,13 +3096,13 @@ section.review {
}
.sale-container {
color: $other-font-color;
color: #5E5E5E;
.sale-section {
.secton-title {
font-size: 18px;
color: $title-color;
color: #8E8E8E;
padding: 15px 0;
border-bottom: 1px solid $border-color;
}
@ -3091,7 +3110,7 @@ section.review {
.section-content {
display: block;
padding: 20px 0;
border-bottom: 1px solid $address-card-border-color;
border-bottom: 1px solid #E8E8E8;
.row {
display: block;
@ -3120,11 +3139,11 @@ section.review {
.box-title {
padding: 10px 0;
font-size: 18px;
color: $title-color;
color: #8E8E8E;
}
.box-content {
color: $bold-color;
color: #3A3A3A;
}
}
}
@ -3143,7 +3162,7 @@ section.review {
padding-top: 20px;
display: inline-block;
width: 100%;
border-top: solid 1px $address-card-border-color;
border-top: solid 1px #E8E8E8;
.sale-summary {
height: 130px;
@ -3155,7 +3174,7 @@ section.review {
td {
padding: 5px 8px;
width: auto;
color: $bold-color;
color: #3A3A3A;
}
&.bold {
@ -3235,20 +3254,6 @@ section.review {
}
}
//verify account
.verify-account {
text-align: center;
background: $info-color;
width: 200px;
margin-right: auto;
margin-left: auto;
border-radius: 4px;
a {
color: $btn-background-color !important;
}
}
// css for loader
.cp-spinner {
position: absolute;
@ -3263,502 +3268,4 @@ section.review {
top: 50%;
margin-top: -24px;
}
}
//css for responsive error pages
@media only screen and (max-width: 720px) {
.error-container .wrapper {
flex-direction: column-reverse !important;
margin: 10px 0px 20px 0px !important;
align-items: start !important;
height: 100% !important;
}
}
/// rtl css start here
.rtl {
direction: rtl;
//header css start here
.header {
.header-top {
div.left-content {
ul.logo-container {
margin-right: 0px;
margin-left: 12px;
}
ul.search-container li.search-group {
.search-field {
border-left: none;
border-right: 2px solid $border-color;
padding-right: 12px;
padding-left: 0px;
}
.search-icon-wrapper {
border: 2px solid $border-color;
}
}
}
div.right-content {
.currency-switcher .dropdown-list {
left: 0px;
right: auto;
}
ul.cart-dropdown-container {
float: left;
margin-left: 0px;
li.cart-dropdown {
.cart-icon {
margin-right: 0px;
margin-left: 8px;
}
.dropdown-list {
left: 0px !important;
right: auto !important;
}
.dropdown-container .dropdown-content .item img {
margin-right: 0px;
}
}
}
}
}
.header-bottom {
.nav > li {
float: right;
margin-right: 0px;
margin-left: 1px;
}
.nav a {
padding: 0.8em 0.5em 0.8em 0.3em !important;
}
.nav li a > .icon {
transform: rotate(180deg);
}
.nav > li li:hover > ul {
left: unset !important;
right: 100% !important;
}
}
.search-responsive .search-content .right {
float: left;
}
}
.dropdown-list {
text-align: right;
&.bottom-right {
left: 0px;
right: auto;
}
}
@media only screen and (max-width: 720px) {
.header{
.header-top ul.right-responsive {
margin-left: 0px;
li {
margin: 0px;
&:last-child {
margin-right: 5px;
margin-left: -2px;
}
}
ul {
margin: 0px;
}
}
.header-bottom {
.nav > li {
float: none;
}
.nav li > .icon {
float: left;
transform: rotate(180deg);
}
.icon.icon-arrow-down {
margin-left: 5px;
}
}
}
}
// header css end here
// slider start
section.slider-block div.slider-content div.slider-control {
left: 2%;
right: auto;
}
@media only screen and (max-width: 720px) {
section.slider-block div.slider-content div.slider-control {
left: 0%;
}
}
//slider end
// product card
.main-container-wrapper .product-card .sticker {
left: auto;
right: 10px;
}
.main-container-wrapper .product-card .cart-wish-wrap .addtocart {
margin-right: 0px;
margin-left: 10px;
}
// product card end
// product page start here
section.product-detail div.layouter .form-container {
div.product-image-group {
margin-right: 0px;
margin-left: 30px;
}
div .thumb-list {
margin-left: 4px;
margin-right: 0px;
}
.details .product-ratings .total-reviews {
margin-left: 0px;
margin-right: 15px;
}
}
@media only screen and (max-width: 720px) {
section.product-detail div.layouter .form-container div.product-image-group {
margin-right: 0px;
margin-left: 0px;
}
}
// product page end here
//category page start here
.main .category-container .layered-filter-wrapper, .main .category-container .responsive-layred-filter {
padding-right: 0px;
padding-left: 20px;
}
.main .top-toolbar {
.pager {
float: left;
.view-mode {
margin-right: 0px;
margin-left: 20px;
}
.sorter {
margin-right: 0px;
margin-left: 10px;
}
label {
margin-right: 0px;
margin-left: 5px;
}
}
.page-info {
float: right;
}
}
//category page end here
//product review page
section.review .review-layouter .review-form {
margin-left: 0px;
margin-right: 20px;
.heading .right {
float: left;
}
.ratings-reviews .right-side .rater {
.star-name {
margin-right: 0px;
margin-left: 5px;
}
}
}
@media only screen and (max-width: 770px) {
section.review .review-layouter .review-form {
margin-right: 0px;
}
}
//product review page end here
//add to cart start here
section.cart .cart-content {
.left-side {
width: 70%;
float: right;
.misc-controls a.link {
margin-left: 15px;
margin-right: 0px;
}
}
.right-side {
width: 30%;
padding-right: 40px;
padding-left: 0px;
}
}
.order-summary .item-detail, .payble-amount {
label.right {
float: left;
}
}
.item div {
margin-left: 15px;
margin-right: 0px !important;
}
.cart-item-list .item .item-details .misc {
div.qty-text {
margin-right: 0px;
margin-left: 10px;
}
input.box {
margin-right: 0px;
margin-left: 30px;
}
.remove {
margin-left: 30px;
margin-right: 0px;
}
}
@media only screen and (max-width: 770px) {
section.cart .cart-content {
.left-side {
width: 100%;
float: none;
}
.right-side {
width: 100%;
padding-right: 0px;
}
}
}
//add to cart page end here
//checkout process page start here
.checkout-process {
.col-right {
padding-left: 0px;
padding-right: 40px;
}
.col-main {
padding-left: 40px;
padding-right: 0px;
ul.checkout-steps li span {
margin-right: 7px;
margin-left: 0px;
}
.step-content {
.form-header {
h1 {
float: right;
}
.btn {
float: left;
}
}
.payment-methods .control-info {
margin-right: 28px;
margin-left: 0px;
}
.order-description, .address {
.pull-left, .billing-address {
float: right !important;
}
.pull-right, .shipping-address {
float: left !important;
}
}
}
}
}
.checkbox {
margin: 10px 0px 5px 5px;
}
.radio {
margin: 10px 0px 5px 5px;
.radio-view {
margin-left: 5px;
margin-right: 0px;
}
input {
right: 0;
left: auto;
}
}
@media only screen and (max-width: 770px) {
.checkout-process .col-main {
padding-left: 0px;
}
}
//checkout process page end here
//customer page start here
.account-content {
.account-layout {
margin-left: 0px;
margin-right: 40px;
}
.account-side-menu li {
margin-right: 5%;
margin-left: 0%;
.icon {
left: 12px;
right: auto;
transform: rotate(180deg);
}
}
}
.account-head .account-action {
float: left;
}
.account-item-card {
.media-info .info {
margin-right: 20px;
margin-left: 0px;
}
.operations a span {
float: left;
}
}
.table table {
text-align: right;
}
.sale-container {
.totals .sale-summary {
float: left;
}
.sale-section .section-content .order-box-container {
display: flex;
}
}
@media only screen and (max-width: 770px) {
.account-content {
.account-layout {
margin-right: 0px;
.account-head {
.account-action {
margin-right: 15px;
margin-left: 0px;
}
.back-icon {
transform: rotate(180deg);
margin-bottom: 10px;
}
}
}
.responsive-side-menu .right {
float: left;
}
.account-side-menu li {
margin-right: 0%;
}
}
}
//customer page end here
// footer start
.footer .footer-content .footer-list-container .list-container .list-group li span.icon {
margin-left: 5px;
margin-right: 0px;
}
@media all and (max-width: 720px) {
.footer {
padding-right: 15px;
padding-left: 10%;
.footer-list-container {
padding-right: 0px !important;
}
}
}
// footer end
// css for loader
.cp-spinner {
position: absolute;
left: auto;
right: 26%;
margin-top: calc(20% - 80px);
}
@media only screen and (max-width: 720px) {
.cp-spinner {
right: 50%;
margin-right: -24px;
left: auto;
}
}
}
/// rtl css end here
}