merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5688 from deepaksinghgusain227/checkout-bilingaddress-issue 

Fixed ui issue of checkout biling addres
This commit is contained in:
Glenn Hermans 2022-01-25 09:57:41 +01:00 committed by GitHub
parent 0fe5b20bda 1aa67104cc
commit 38c661bde4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Shop/publishable/assets/css/shop.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=9d5b79be5419c0a5c1bc",
"/css/shop.css": "/css/shop.css?id=7540700482be9e937cf0"
"/css/shop.css": "/css/shop.css?id=ff2ffa89e3bbaf07953d"
}

127
packages/Webkul/Shop/src/Resources/assets/sass/app.scss vendored
View File

@ -152,14 +152,14 @@ input {
/**
* Show the indicator (dot/circle) when checked.
*/
.radio-container input:checked ~ .checkmark:after {
.radio-container input:checked~.checkmark:after {
display: block;
}
/**
* Show the indicator.
*/
.radio-container input:disabled ~ .checkmark {
.radio-container input:disabled~.checkmark {
display: block;
border: 2px solid $radio-button-disabled;
}
@ -223,7 +223,7 @@ input {
background-image: url('../images/checkbox.svg') !important;
}
input:checked + .checkbox-view {
input:checked+.checkbox-view {
background-image: url('../images/checkbox-checked.svg') !important;
}
}
@ -236,6 +236,7 @@ input {
.pull-left {
float: left !important;
}
/* if not very important use bootstrap 4 float-left and float-right class */
/**
@ -381,6 +382,7 @@ input {
a {
width: 100%;
span {
float: right;
}
@ -617,8 +619,8 @@ input {
.product-card {
font-size: 90%;
.product-information{
.default-wrap{
.product-information {
.default-wrap {
display: block;
height: 40px;
}
@ -636,11 +638,27 @@ input {
}
}
.btn-primary{
.btn-primary {
width: 100%;
}
.btn-lg{
.checkout-process {
.col-main {
.step-content {
.form-header {
display: block;
.checkout-step-heading{
margin-bottom: 10px;
}
.btn-primary{
text-align: center;
}
}
}
}
}
.btn-lg {
padding: 4px 12px;
margin-bottom: 10px;
}
@ -807,6 +825,7 @@ section.slider-block {
0% {
opacity: 0.1;
}
100% {
opacity: 1;
}
@ -976,7 +995,7 @@ section.slider-block {
div.right-content {
.right-content-menu {
> li {
>li {
display: inline-block;
border-right: 2px solid $border-color;
padding: 0 15px;
@ -1047,7 +1066,7 @@ section.slider-block {
margin-top: 5px;
}
ul > li {
ul>li {
padding: 5px 10px 5px 0px !important;
}
}
@ -1073,24 +1092,24 @@ section.slider-block {
color: $font-dark;
}
.dropdown-cart > .dropdown-header {
.dropdown-cart>.dropdown-header {
width: 100%;
padding: 8px 16px;
border-bottom: 1px solid $border-color;
}
.dropdown-cart > .dropdown-header p {
.dropdown-cart>.dropdown-header p {
display: inline;
line-height: 25px;
}
.dropdown-cart > .dropdown-header i {
.dropdown-cart>.dropdown-header i {
float: right;
height: 22px;
width: 22px;
}
.dropdown-cart > .dropdown-header p.heading {
.dropdown-cart>.dropdown-header p.heading {
font-weight: lighter;
}
@ -1201,7 +1220,7 @@ section.slider-block {
position: relative;
}
.nav li > .icon {
.nav li>.icon {
display: none;
}
@ -1214,17 +1233,17 @@ section.slider-block {
position: relative;
}
.nav > li {
.nav>li {
float: left;
margin-right: 1px;
height: 45px;
}
.nav > li > a {
.nav>li>a {
margin-bottom: 1px;
}
.nav > li > a .icon {
.nav>li>a .icon {
display: none;
}
@ -1256,34 +1275,34 @@ section.slider-block {
left: -99999em;
}
.nav > li:hover {
.nav>li:hover {
background-color: $background-color;
}
.nav > li:hover > ul {
.nav>li:hover>ul {
left: auto;
min-width: 100%;
}
.nav > li li:hover {
.nav>li li:hover {
background-color: $background-color;
}
.nav > li li:hover > ul {
.nav>li li:hover>ul {
left: 100%;
margin-left: 1px;
top: -2px;
}
.nav > li:hover > a:first-child:nth-last-child(2):before {
.nav>li:hover>a:first-child:nth-last-child(2):before {
margin-top: -5px;
}
.nav li li > a:first-child:nth-last-child(2):before {
.nav li li>a:first-child:nth-last-child(2):before {
margin-top: -5px;
}
.nav li li:hover > a:first-child:nth-last-child(2):before {
.nav li li:hover>a:first-child:nth-last-child(2):before {
right: 10px;
}
}
@ -1334,7 +1353,7 @@ section.slider-block {
}
.right-content-menu {
> li {
>li {
border-right: none;
padding: 0 2px;
@ -1374,11 +1393,11 @@ section.slider-block {
height: auto;
}
.nav > li {
.nav>li {
float: none;
}
.nav li > .icon {
.nav li>.icon {
float: right;
display: block;
}
@ -1392,7 +1411,7 @@ section.slider-block {
width: 16px;
}
.nav li a > .icon {
.nav li a>.icon {
display: none;
}
@ -1402,7 +1421,7 @@ section.slider-block {
box-shadow: none;
}
.nav > li li:hover > ul {
.nav>li li:hover>ul {
margin-left: 0px;
top: 0px;
}
@ -2308,8 +2327,8 @@ section.product-detail {
background: rgb(242, 242, 242);
}
input:checked + span,
input:checked + img {
input:checked+span,
input:checked+img {
border: 1px solid $font-dark;
}
@ -2334,6 +2353,7 @@ section.product-detail {
*/
.accordian,
accordian {
.accordian-header,
div[slot*='header'] {
font-size: 16px !important;
@ -3171,6 +3191,7 @@ section.cart {
.checkout-process {
.col-main {
.step-content {
.address,
.order-description {
display: flex;
@ -3528,7 +3549,7 @@ ol.breadcrumb {
li.breadcrumb-item {
display: inline-block;
& + .breadcrumb-item::before {
&+.breadcrumb-item::before {
display: inline-block;
padding-right: 5px;
padding-left: 5px;
@ -3752,7 +3773,7 @@ ol.breadcrumb {
border: 0;
display: none;
> li {
>li {
margin-left: 0;
width: 100%;
@ -3761,7 +3782,7 @@ ol.breadcrumb {
}
}
> li:last-child {
>li:last-child {
border-bottom: 1px solid $border-color;
}
}
@ -4116,7 +4137,7 @@ ol.breadcrumb {
div.right-content {
.right-content-menu {
> li {
>li {
border-right: 2px solid $border-color;
padding: 0 15px 0 15px;
@ -4158,7 +4179,7 @@ ol.breadcrumb {
}
.header-bottom {
.nav > li {
.nav>li {
float: right;
margin-right: 0px;
margin-left: 1px;
@ -4168,11 +4189,11 @@ ol.breadcrumb {
padding: 0.8em 0.5em 0.8em 0.3em !important;
}
.nav li a > .icon {
.nav li a>.icon {
transform: rotate(180deg);
}
.nav > li li:hover > ul {
.nav>li li:hover>ul {
left: unset !important;
right: 100% !important;
}
@ -4211,7 +4232,7 @@ ol.breadcrumb {
right: auto;
}
> li {
>li {
padding: 0;
border: 0;
}
@ -4223,13 +4244,15 @@ ol.breadcrumb {
}
.header-bottom {
.nav > li {
.nav>li {
float: none;
}
.nav li > .icon {
.nav li>.icon {
float: left;
transform: rotate(180deg);
}
.icon.icon-arrow-down {
margin-left: 5px;
}
@ -4326,10 +4349,7 @@ ol.breadcrumb {
}
@media only screen and (max-width: 720px) {
section.product-detail
div.layouter
.form-container
div.product-image-group {
section.product-detail div.layouter .form-container div.product-image-group {
margin-right: 0px;
margin-left: 0px;
}
@ -4503,6 +4523,7 @@ ol.breadcrumb {
.order-description,
.address {
.pull-left,
.billing-address {
float: right !important;
@ -4624,7 +4645,7 @@ ol.breadcrumb {
}
.menubar {
> li {
>li {
margin-right: 0%;
}
}
@ -4635,13 +4656,7 @@ ol.breadcrumb {
/**
* Footer start.
*/
.footer
.footer-content
.footer-list-container
.list-container
.list-group
li
span.icon {
.footer .footer-content .footer-list-container .list-container .list-group li span.icon {
margin-left: 5px;
margin-right: 0px;
}
@ -4849,11 +4864,11 @@ body {
margin-top: 0px;
}
.desc > p {
.desc>p {
margin-top: 0px;
}
.comparison-component > h1 {
.comparison-component>h1 {
display: inline-block;
}
@ -4864,7 +4879,7 @@ body {
background-color: black;
}
.action > div {
.action>div {
display: inline-block;
}