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

Merge branch 'master' into issue-4147 

Merged With Master
This commit is contained in:
devansh bawari 2020-10-23 12:41:03 +05:30
parent 83ccfcdf35 64020bda55
commit 0586457259
7 changed files with 70 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=c4dfdb6d0482241432f9",
"/css/shop.css": "/css/shop.css?id=11adc18bed8ace91c828"
"/css/shop.css": "/css/shop.css?id=45a1e46876af32f30871"
}

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

@ -251,6 +251,28 @@ input {
.special-price {
color: $disc-price;
}
/*
To Do: Start adjusting if equal height needed in default theme as well.
*/
.price-from {
.bundle-regular-price {
color: $font-light;
text-decoration: line-through;
margin-right: 10px;
}
.bundle-special-price {
color: $disc-price;
}
.bundle-to {
display: block;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
}
}
}
//horizontal rule

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=497d255676e26e428e3c",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=4322502d80a0e4a0affd",
"/css/velocity.css": "/css/velocity.css?id=40d4466ccaba8ba4a23d"
"/css/velocity.css": "/css/velocity.css?id=f3471c09369c572c9a1b"
}

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

@ -2335,6 +2335,27 @@
.recetly-viewed-products-wrapper {
padding: 2px;
.price-from {
.bundle-regular-price {
display: none;
}
.bundle-special-price {
font-size: 15px !important;
font-weight: 600;
}
.bundle-to {
text-align: center;
font-size: 15px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
margin: 0 2px;
display: unset;
}
}
}
.category-page-wrapper {

25
packages/Webkul/Velocity/src/Resources/assets/sass/components/product-view.scss vendored
View File

@ -166,8 +166,29 @@
}
.product-price {
.sticker {
display: none;
height: unset;
.price-from {
.bundle-regular-price {
font-size: 20px !important;
font-weight: 500;
margin-right: 10px;
text-decoration: line-through;
}
.bundle-special-price {
font-size: 20px !important;
font-weight: 600;
}
.bundle-to {
text-align: unset;
font-size: 20px !important;
font-weight: 500;
margin-top: 1px;
margin-bottom: 1px;
display: block;
}
}
}