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

Conflicts resolved

This commit is contained in:
jitendra 2022-03-30 13:11:08 +05:30
parent e9f18a9cf6 becb805e73
commit 434ad2dd79
4 changed files with 8 additions and 3 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/mix-manifest.json
View File

@ -4,7 +4,7 @@
"/js/velocity.js": "/js/velocity.js?id=f655ac65cbd1aa549cba57f77b9a4344",
"/js/manifest.js": "/js/manifest.js?id=e069a8f952a02ea0f290bcca8fab930e",
"/js/components.js": "/js/components.js?id=13ebf112e40292178d2386143e9d75cd",
"/css/velocity.css": "/css/velocity.css?id=80277f74ae36cac393da39af5a65e798",
"/css/velocity.css": "/css/velocity.css?id=8708e2bfc1c0ae05a91ef66d81132116",
"/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",

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

@ -33,6 +33,11 @@
padding: 12px 10px;
background: #f8f9fa;
color: $font-color;
border-right: 1px solid #ccc !important;
&:last-child {
border-right: none;
}
}
tbody td {

2
packages/Webkul/Velocity/src/Resources/views/shop/guest/compare/compare-products.blade.php
View File

@ -45,7 +45,7 @@
@foreach ($comparableAttributes as $attribute)
<tr>
<td class="header">
<span class="fs16">{{ isset($attribute['name']) ? $attribute['name'] : $attribute['admin_name'] }}</span>
<span class="fs16 font-weight-bold">{{ isset($attribute['name']) ? $attribute['name'] : $attribute['admin_name'] }}</span>
</td>
<td :key="`title-${index}`" v-for="(product, index) in products">