marketplace responsive & installer

bagisto · Feb 12, 2019 · 8b9edf9 · 8b9edf9
1 parent 5879874
commit 8b9edf9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -21,25 +21,25 @@
 
                     @if (isset($column['wrapper']))
                         @if (isset($column['closure']) && $column['closure'] == true)
-                            <td>{!! $column['wrapper']($record) !!}</td>
+                            <td data-value="{{ $column['label'] }}">{!! $column['wrapper']($record) !!}</td>
                         @else
-                            <td>{{ $column['wrapper']($record) }}</td>
+                            <td data-value="{{ $column['label'] }}">{{ $column['wrapper']($record) }}</td>
                         @endif
                     @else
                         @if($column['type'] == 'price')
                             @if(isset($column['currencyCode']))
-                                <td>{{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }}</td>
+                                <td data-value="{{ $column['label'] }}">{{ core()->formatPrice($record->{$columnIndex}, $column['currencyCode']) }}</td>
                             @else
-                                <td>{{ core()->formatBasePrice($record->{$columnIndex}) }}</td>
+                                <td data-value="{{ $column['label'] }}">{{ core()->formatBasePrice($record->{$columnIndex}) }}</td>
                             @endif
                         @else
-                            <td>{{ $record->{$columnIndex} }}</td>
+                            <td data-value="{{ $column['label'] }}">{{ $record->{$columnIndex} }}</td>
                         @endif
                     @endif
                 @endforeach
 
                 @if ($enableActions)
-                    <td class="actions" style="width: 100px;">
+                    <td class="actions" style="width: 100px;" data-value=" {{ __('ui::app.datagrid.actions') }}">
                         <div>
                             @foreach ($actions as $action)
                                 <a href="{{ route($action['route'], $record->{$index}) }}">

diff --git a/public/installer/AdminConfig.php b/public/installer/AdminConfig.php
@@ -47,6 +47,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);

diff --git 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);