wip

resources/assets/dcat/extra/upload.scss

@@ -74,7 +74,6 @@
   /*padding-top: 85px;*/
   /*background: url(./image.png) center 15px no-repeat;*/
   border: 3px dashed #e6e6e6;
-  padding-top: 5px;
   text-align: center;
   color: #ccc;
   font-size: 16px;
@@ -82,13 +81,13 @@
 }
 
 .web-uploader .placeholder .webuploader-pick {
-  background: lighten($primary, 2%);
+  background: lighten($primary, 1%);
   border-radius: 3px;
   line-height: 34px;
   padding: 0 25px;
   color: #fff;
   display: inline-block;
-  margin: 0 auto 20px;
+  margin: 0 auto 15px;
   cursor: pointer
 }
 
@@ -96,7 +95,7 @@
   opacity: .9
 }
 .web-uploader .placeholder p {
-  margin: 0 0 20px;
+  margin: 0 0 15px;
 }
 .web-uploader .placeholder .flashTip {
   color: #666;
@@ -108,7 +107,7 @@
 }
 
 .web-uploader .placeholder .flashTip a {
-  color: lighten($primary, 2%);
+  color: lighten($primary, 1%);
   text-decoration: none
 }
 
@@ -457,7 +456,7 @@
 
 .web-uploader .placeholder:before {
   font-family: feather;
-  font-size: 70px;
+  font-size: 58px;
   content: "\e8e3";
 }
 .red-dark {

resources/assets/dcat/sass/components/_form.scss

@@ -46,7 +46,7 @@ select.form-control:not([multiple=multiple]) {
 }
 
 .control-label {
-  padding-top: 7px;
+  padding-top: 10px;
   padding-right: 5px;
   margin-bottom: 0;
   font-size: 1rem;

resources/assets/dcat/sass/components/_table.scss

@@ -151,6 +151,11 @@ table.table-bordered.dataTable.complex-headers {
 
   td {
     border-top: 1px solid #f0f4f8!important;
+    border-radius: 0!important;
+  }
+
+  thead th {
+    border-bottom: 2px solid #f0f4f8!important;
   }
 }
 

resources/assets/dcat/sass/theme/_colors.scss

@@ -90,9 +90,9 @@ $font-color: #414750;
 
 // body背景颜色
 //$body-bg: #f9fafc;
-$body-bg: lighten($dark40, 1.3%);
-//$body-bg: darken(#f4f7fa, 1.2%);
-//$body-bg: #edf1f3;
+//$body-bg: lighten($dark40, 1.3%);
+$body-bg: darken(#f4f7fa, 1.3%);
+//$body-bg: lighten(#edf1f3, 1.5%);
 
 // 灰背景色
 $gray-bg: #f1f1f1;

resources/views/grid/quick-create/form.blade.php

@@ -1,6 +1,6 @@
 <thead>
 <tr class="{{ $elementClass }} quick-create" style="cursor: pointer">
-    <td colspan="{{ $columnCount }}" style="background: {{ Admin::color()->darken('#ededed', 4) }}">
+    <td colspan="{{ $columnCount }}" style="background: {{ Admin::color()->darken('#ededed', 1) }}">
         <span class="create cursor-pointer" style="display: block;">
              <i class="feather icon-plus"></i>&nbsp;{{ __('admin.quick_create') }}
         </span>

src/Grid/Displayers/Expand.php

@@ -3,7 +3,7 @@
 namespace Dcat\Admin\Grid\Displayers;
 
 use Dcat\Admin\Admin;
-use Dcat\Admin\Support\RemoteRenderable;
+use Dcat\Admin\Support\LazyRenderable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Support\Str;
 
@@ -21,7 +21,7 @@ class Expand extends AbstractDisplayer
         $this->button = $button;
     }
 
-    protected function setUpRemoteRenderable(RemoteRenderable $renderable)
+    protected function setUpLazyRenderable(LazyRenderable $renderable)
     {
         $renderable::collectAssets();
     }
@@ -40,16 +40,16 @@ class Expand extends AbstractDisplayer
             }
         } elseif ($callbackOrButton && is_string($callbackOrButton)) {
             $this->button = $callbackOrButton;
-        } elseif ($callbackOrButton instanceof RemoteRenderable) {
+        } elseif ($callbackOrButton instanceof LazyRenderable) {
             $html = '<div style="min-height: 150px"></div>';
 
-            $this->setUpRemoteRenderable($callbackOrButton);
+            $this->setUpLazyRenderable($callbackOrButton);
 
             $remoteUrl = $callbackOrButton->getUrl();
-        } elseif (is_string($callbackOrButton) && is_subclass_of($callbackOrButton, RemoteRenderable::class)) {
+        } elseif (is_string($callbackOrButton) && is_subclass_of($callbackOrButton, LazyRenderable::class)) {
             $html = '<div style="min-height: 150px"></div>';
 
-            $this->setUpRemoteRenderable($renderable = $callbackOrButton::make());
+            $this->setUpLazyRenderable($renderable = $callbackOrButton::make());
 
             $remoteUrl = $renderable->getUrl();
         }

src/Grid/Displayers/Modal.php

@@ -4,7 +4,7 @@ namespace Dcat\Admin\Grid\Displayers;
 
 use Dcat\Admin\Admin;
 use Dcat\Admin\Support\Helper;
-use Dcat\Admin\Support\RemoteRenderable;
+use Dcat\Admin\Support\LazyRenderable;
 use Illuminate\Support\Str;
 
 class Modal extends AbstractDisplayer
@@ -25,7 +25,7 @@ class Modal extends AbstractDisplayer
         return 'grid-modal-'.$this->grid->getName().$key;
     }
 
-    protected function addRenderableModalScript(string $modalId, string $url)
+    protected function addRenderableScript(string $modalId, string $url)
     {
         $script = <<<JS
 (function () {
@@ -46,11 +46,11 @@ JS;
         Admin::script($script);
     }
 
-    protected function setUpRemoteRenderable(string $modalId, RemoteRenderable $renderable)
+    protected function setUpLazyRenderable(string $modalId, LazyRenderable $renderable)
     {
         $renderable->with('key', $this->getKey());
 
-        $this->addRenderableModalScript($modalId, $renderable->getUrl());
+        $this->addRenderableScript($modalId, $renderable->getUrl());
 
         $renderable::collectAssets();
     }
@@ -69,14 +69,14 @@ JS;
             $html = Helper::render(
                 $callback->call($this->row, $this)
             );
-        } elseif (is_string($callback) && is_subclass_of($callback, RemoteRenderable::class)) {
+        } elseif (is_string($callback) && is_subclass_of($callback, LazyRenderable::class)) {
             $html = '';
 
-            $this->setUpRemoteRenderable($id, $callback::make());
-        } elseif ($callback instanceof RemoteRenderable) {
+            $this->setUpLazyRenderable($id, $callback::make());
+        } elseif ($callback instanceof LazyRenderable) {
             $html = '';
 
-            $this->setUpRemoteRenderable($id, $callback);
+            $this->setUpLazyRenderable($id, $callback);
         }
 
         $title = $this->title ?: $title;

src/Support/RemoteRenderable.php → src/Support/LazyRenderable.php

@@ -5,7 +5,7 @@ namespace Dcat\Admin\Support;
 use Dcat\Admin\Admin;
 use Illuminate\Contracts\Support\Renderable;
 
-abstract class RemoteRenderable implements Renderable
+abstract class LazyRenderable implements Renderable
 {
     protected static $js = [];