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

Merge pull request #958 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-05-29 11:48:55 +05:30 committed by GitHub
parent eee546da6a d1199a6f26
commit 3cec2d1935
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/src/Http/Controllers/ConfigurationController.php
View File

@ -134,7 +134,7 @@ class ConfigurationController extends Controller
*/
public function store()
{
Event::fire('core.configuration.save.after');
Event::fire('core.configuration.save.before');
$this->coreConfig->create(request()->all());

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=71f03d05d9690fe24784",
"/css/shop.css": "/css/shop.css?id=5f540e896d70e1d6cc49"
"/css/shop.css": "/css/shop.css?id=6fb34a8fdfa91e44fe57"
}

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

@ -443,8 +443,6 @@ input {
max-width: 280px;
margin-bottom: 10px;
background: $background-color;
min-height: 300px;
min-width: 250px;
img {
display: block;
@ -1629,6 +1627,7 @@ section.slider-block {
.page-info {
border-bottom: 1px solid $border-color;
line-height: 15px;
margin-top: 10px;
span {
display: inline;
@ -2315,7 +2314,7 @@ section.cart {
width: 100%;
padding-left: 0px;
position: relative;
top: -40px;
top: -20px;
}
}
}
@ -2327,14 +2326,17 @@ section.cart {
.left-side {
.cart-item-list {
.item {
.item-image {
height: 120px;
width: 120px;
}
.item-details .misc {
display: flex;
flex-wrap: wrap;
line-height: 40px;
display: flex;
flex-direction: column;
.item-details {
margin-top: 10px;
.misc {
display: flex;
flex-wrap: wrap;
line-height: 40px;
}
}
}
}
@ -2367,28 +2369,12 @@ section.cart {
}
.right-side {
top: -120px;
top: -100px;
}
}
}
}
@media only screen and (max-width: 400px) {
section.cart {
.cart-content {
.left-side {
.cart-item-list {
.item {
.item-image {
height: 85px;
width: 85px;
}
}
}
}
}
}
}
//cart pages responsive css end
.checkout-method-group {
.line-one {