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

Merge pull request #3571 from akhtarkhan1/locale_broken_image 

Fixed Getting broken image link for locales in mobile view #3393
This commit is contained in:
Jitendra Singh 2020-07-28 18:12:05 +05:30 committed by GitHub
parent 216029210c 906496b7b1
commit 03f13b82b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 6 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=d64fdfe9e3fe3e4b9ee4",
"/css/shop.css": "/css/shop.css?id=d5a7b8d843e219c2fa28"
"/css/shop.css": "/css/shop.css?id=72d87fe2508fdcd9f397"
}

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

@ -3308,6 +3308,10 @@ section.review {
margin-top: 5.5%;
margin-bottom: 5.5%;
a.btn.btn-lg.btn-primary {
float: right;
}
.sidebar {
display: flex;
flex-direction: column;
@ -3564,6 +3568,7 @@ section.review {
}
}
.account-items-list , .edit-form {
margin-top: 20px;
@ -3648,6 +3653,8 @@ section.review {
height: 130px;
float: right;
border-collapse: collapse;
left: 3px;
position: relative;
tr {
@ -4331,6 +4338,10 @@ section.review {
float: left;
}
a.btn.btn-lg.btn-primary {
float: left;
}
.account-item-card {
.media-info .info {
margin-right: 20px;
@ -4584,7 +4595,7 @@ body {
td {
padding: 15px;
min-width: 250px;
min-width: 25px;
max-width: 250px;
line-height: 30px;
vertical-align: top;

15
packages/Webkul/Velocity/src/Resources/views/shop/UI/header.blade.php
View File

@ -251,11 +251,20 @@
href="?locale={{ $locale->code }}"
@endif>
<div class="category-logo">
<img
@if( $locale->code == 'en')
<div class="category-logo">
<img
class="category-icon"
src="{{ asset('/themes/velocity/assets/images/flags/en.png') }}" />
</div>
@else
<div class="category-logo">
<img
class="category-icon"
src="{{ asset('/storage/' . $locale->locale_image) }}" />
</div>
</div>
@endif
<span>
{{ isset($serachQuery) ? $locale->title : $locale->name }}