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

Merge pull request #6031 from jitendra-webkul/master 

Velocity ui issues fixed
This commit is contained in:
Jitendra Singh 2022-03-15 18:46:14 +05:30 committed by GitHub
parent 34fee4cc60 0e4cc72d0a
commit e5eaa313cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/components.js vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

6
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,10 +1,10 @@
{
"/js/jquery-ez-plus.js": "/js/jquery-ez-plus.js?id=ba3c7cada62de152fd8fce211d0b1b70",
"/js/velocity-core.js": "/js/velocity-core.js?id=73cc7c3501570ebe9151c72d954bd97d",
"/js/velocity.js": "/js/velocity.js?id=ac985a4662e87e724291df2a253941e3",
"/js/velocity.js": "/js/velocity.js?id=3c7caee18e6565ee2fe03b1fca202d68",
"/js/manifest.js": "/js/manifest.js?id=3cded37ef514b0fb89b10e7109801248",
"/js/components.js": "/js/components.js?id=f68dd472b8f0ef2f0199f62f49ba9d91",
"/css/velocity.css": "/css/velocity.css?id=f501da750ba83f562e952cc61e241517",
"/js/components.js": "/js/components.js?id=47d1db552c7f30cc83c51659e7cc6d32",
"/css/velocity.css": "/css/velocity.css?id=dd54920b55c885352d707e95d9e96d46",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/icon-calendar.svg": "/images/icon-calendar.svg?id=870d0f733a58377422766f3152e15486",
"/images/icon-camera.svg": "/images/icon-camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",

2
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/product-card.vue
View File

@ -67,7 +67,7 @@
{{ product.new }}
</div>
<div class="product-price fs16" v-html="product.priceHTML"></div>
<div v-html="product.priceHTML"></div>
<div
class="product-rating col-12 no-padding"

1
packages/Webkul/Velocity/src/Resources/assets/sass/app.scss vendored
View File

@ -278,6 +278,7 @@ label {
padding-left: 5px;
position: relative;
padding-right: 15px;
text-align: left;
}
.dropdown {

15
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -283,13 +283,14 @@
.product-name,
.product-rating {
width: 15rem;
margin-bottom: 2px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.product-price {
height: 72px;
margin-bottom: 15px;
}
}
@ -1561,15 +1562,23 @@
}
.product-price {
display: inline-block;
.price-label {
margin-right: 6px;
}
.regular-price {
font-size: 14px;
font-weight: 500;
margin-right: 10px;
text-decoration: line-through;
display: block;
display: inline-block;
}
.special-price {
display: inline-block;
margin-right: 10px;
float: left;
}
/*

4
packages/Webkul/Velocity/src/Resources/assets/sass/components/datagrid.scss vendored
View File

@ -271,10 +271,6 @@
list-style-type: none;
li {
&:last-child {
margin-bottom: 5px;
}
a {
padding: 8px 12px;
font-size: 16px;

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -934,7 +934,7 @@ button[disabled] {
width: 100%;
height: 100%;
position: fixed;
background: rgba(256, 256, 256, 0.9);
background: rgba(0, 0, 0, 0.7);
z-index: 125;
}