From 8b9edf9e7d17d1ecc93f53065e779da0d95a32bd Mon Sep 17 00:00:00 2001 From: rahul shukla Date: Tue, 12 Feb 2019 16:46:55 +0530 Subject: [PATCH] marketplace responsive & installer --- .../Webkul/Shop/src/Resources/assets/sass/app.scss | 1 + .../Webkul/Ui/src/Resources/assets/sass/app.scss | 9 +++++++++ .../Ui/src/Resources/views/datagrid/body.blade.php | 12 ++++++------ public/installer/AdminConfig.php | 1 + public/installer/index.php | 1 + 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss index df4a7f8c2..bda9f5495 100755 --- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss @@ -3052,6 +3052,7 @@ section.review { border-bottom: 1px solid $border-color; border-top: 1px solid $border-color; height: 50px; + margin-top: 10px; .account-action { margin-top: 12px; diff --git a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss index bb15928cc..1d6fb3974 100755 --- a/packages/Webkul/Ui/src/Resources/assets/sass/app.scss +++ b/packages/Webkul/Ui/src/Resources/assets/sass/app.scss @@ -812,6 +812,15 @@ modal { } } +// responsive css for model +@media only screen and (max-width: 770px){ + .modal-container { + max-width: 80%; + left: 10%; + margin-left: 0px; + } +} + .label { background: #E7E7E7; @include border-radius(2px); diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php index 8ac656dd2..1cd456ecd 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/body.blade.php @@ -21,25 +21,25 @@ @if (isset($column['wrapper'])) @if (isset($column['closure']) && $column['closure'] == true) - {!! $column['wrapper']($record) !!} + {!! $column['wrapper']($record) !!} @else - {{ $column['wrapper']($record) }} + {{ $column['wrapper']($record) }} @endif @else @if($column['type'] == 'price') @if(isset($column['currencyCode'])) - {{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }} + {{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }} @else - {{ core()->formatBasePrice($record->{$columnIndex}) }} + {{ core()->formatBasePrice($record->{$columnIndex}) }} @endif @else - {{ $record->{$columnIndex} }} + {{ $record->{$columnIndex} }} @endif @endif @endforeach @if ($enableActions) - +
@foreach ($actions as $action) diff --git a/public/installer/AdminConfig.php b/public/installer/AdminConfig.php index fc9769197..00c0dae82 100755 --- a/public/installer/AdminConfig.php +++ b/public/installer/AdminConfig.php @@ -47,6 +47,7 @@ $data = array(); $data = explode(PHP_EOL,$str); $databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION']; + $key = $value = []; if ($data) { foreach ($data as $line) { $rowValues = explode('=', $line); diff --git a/public/installer/index.php b/public/installer/index.php index 5530ea5c6..3d7dd418a 100755 --- a/public/installer/index.php +++ b/public/installer/index.php @@ -18,6 +18,7 @@ $data = explode(PHP_EOL,$str); $databaseArray = ['DB_HOST', 'DB_DATABASE', 'DB_USERNAME', 'DB_PASSWORD', 'DB_CONNECTION']; + $key = $value = []; if ($data) { foreach ($data as $line) { $rowValues = explode('=', $line);