:construction: wip

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

@@ -3,8 +3,29 @@
   height: 34px;
   line-height: 1.2;
   border-radius: 0.2rem;
-  box-shadow: $btn-shadow;
   cursor: pointer;
+  box-shadow: $default-btn-shadow;
+}
+
+.btn.btn-trans {
+  box-shadow: none;
+}
+
+.btn-trans.btn-primary {
+  background-color: lighten($primary, 40%);
+  border-color: lighten($primary, 40%);
+  color: $primary;
+}
+
+.btn-shadow.btn,
+.btn:hover,
+.btn:focus {
+  box-shadow: $btn-shadow;
+}
+
+.btn-shadow.btn:hover,
+.btn-shadow.btn:focus {
+  box-shadow: $btn-shadow-hover;
 }
 
 .btn-group-sm>.btn, .btn-sm, .btn-lg {
@@ -56,7 +77,6 @@ a.btn-sm, .btn-group-sm > a.btn {
 }
 
 .btn-group {
-
   .btn:not(.btn-white):hover {
     box-shadow: $shadow-100;
   }
@@ -64,6 +84,10 @@ a.btn-sm, .btn-group-sm > a.btn {
     box-shadow: none!important;
   }
 
+  box-shadow: $default-btn-shadow;
+}
+
+.btn-group.btn-shadow {
   box-shadow: $btn-group-btn-shadow;
 }
 
@@ -85,12 +109,18 @@ a.btn-sm, .btn-group-sm > a.btn {
 
 .btn.btn-white, .btn.btn-default {
   color: $font-color;
-  box-shadow: $btn-white-shadow;
+  box-shadow: none;
+  background: darken(#f2f2f3, 1%);
 }
+
+//.btn.btn-white.btn-shadow, .btn.btn-default.btn-shadow {
+//  box-shadow: none;
+//}
+
 .btn.btn-white.btn-primary, .btn.btn-white.btn-primary:hover, .btn.btn-white.btn-primary:focus {
   color: $white !important;
 }
-.btn-white:hover,.btn-white:focus,.btn-white.active {
+.btn-white:hover, .btn-white:focus, .btn-white.active {
   box-shadow: $btn-shadow-hover !important;
 }
 
@@ -176,4 +206,3 @@ a.btn-sm, .btn-group-sm > a.btn {
     border-top-left-radius: 0;
   }
 }
-

resources/assets/dcat/sass/components/_custom-data-table.scss

@@ -57,7 +57,7 @@ $table-border-radius: .3rem;
   padding: 1.25rem 2.8rem !important;
   border-radius: 5rem;
   border: 0;
-  background: lighten(#f0f0f0, 1%);
+  background: darken(#f2f2f3, 0.5%);//lighten(#f0f0f0, 1%);
   font-size: .82rem;
 }
 /* #eef1f4; */

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

@@ -91,7 +91,7 @@ $font-color: #414750;
 // body背景颜色
 //$body-bg: #f9fafc;
 //$body-bg: lighten($dark40, 1.3%);
-$body-bg: darken(#f4f7fa, 1.4%);
+$body-bg: #eff1f7;//darken(#f4f7fa, 1.4%);
 //$body-bg: lighten(#edf1f3, 0.4%);
 
 // 深色主题

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

@@ -2,6 +2,6 @@
 
 //$primary: $indigo;
 //$primary: #4e9876; // green
-//$primary: #5686d4; // blue
+//$primary: #6d8be6; // blue
 //$primary: #62a8ea; //blue-light
 $primary: #586cb1;

resources/assets/dcat/sass/variables/_variables.scss

@@ -23,6 +23,7 @@ $shadow-200: 0 3px 1px -2px rgba(0,0,0,.1), 0 2px 2px 0 rgba(0,0,0,.1), 0 1px 5p
 
 // 按钮阴影颜色
 $btn-white-shadow: 0 3px 1px -2px rgba(0,0,0,.1), 0 2px 2px 0 rgba(0,0,0,.1), 0 1px 5px 0 rgba(0,0,0,.08);
+$default-btn-shadow: 0 2px 4px 0 rgba(0,0,0,.06);
 $btn-shadow: $shadow-100;
 $btn-shadow-hover: $shadow-200;
 $btn-group-btn-shadow: $btn-shadow;

src/Color.php

@@ -85,9 +85,9 @@ class Color
         ],
         'blue' => [
             'colors' => [
-                'primary'        => '#5686d4',
-                'primary-darker' => '#4277cf',
-                'link'           => '#4277cf',
+                'primary'        => '#6d8be6',
+                'primary-darker' => '#6d8be6',
+                'link'           => '#6d8be6',
             ],
         ],
         'green' => [

src/Layout/SectionManager.php

@@ -195,8 +195,6 @@ class SectionManager
             $options->previous = $result;
         }
 
-//        $this->sections[$name] = [['value' => &$result]];
-
         return $result;
     }