静态资源打包优化

resources/assets/dcat/extra/step.scss

@@ -114,15 +114,6 @@
 
 .active .dcat-step-icons {
   background-color: #fff;
-  border-color: $primary
-}
-
-.active .dcat-step-icons > .dcat-step-icon {
-  color: $primary
-}
-
-.active .dcat-step-icons > .dcat-step-icon .dcat-step-icon-dot {
-  background: $primary
 }
 
 .active > .dcat-step-item-container > .dcat-step-content > .dcat-step-title {
@@ -141,10 +132,6 @@
   background-color: #e8e8e8
 }
 
-.active .dcat-step-icons {
-  background: $primary
-}
-
 .active .dcat-step-icons > .dcat-step-icon {
   color: #fff
 }
@@ -155,33 +142,16 @@
 
 .done .dcat-step-icons {
   background-color: #fff;
-  border-color: $primary
-}
-
-.done .dcat-step-icons > .dcat-step-icon {
-  color: $primary
-}
-
-.done .dcat-step-icons > .dcat-step-icon .dcat-step-icon-dot {
-  background: $primary
 }
 
 .done > .dcat-step-item-container > .dcat-step-content > .dcat-step-title {
   color: rgba(0, 0, 0, .65)
 }
 
-.done > .dcat-step-item-container > .dcat-step-content > .dcat-step-title:after {
-  background-color: $primary
-}
-
 .done > .dcat-step-item-container > .dcat-step-content > .dcat-step-desc {
   color: rgba(0, 0, 0, .45)
 }
 
-.done > .dcat-step-item-container > .dcat-step-line:after {
-  background-color: $primary
-}
-
 .danger .dcat-step-icons {
   background-color: #fff;
   border-color: $red-darker
@@ -223,18 +193,6 @@
   transition: color .3s
 }
 
-.dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-desc .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-title {
-  color: $primary
-}
-
-.dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-icons {
-  border-color: $primary
-}
-
-.dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-icons .dcat-step-icon {
-  color: $primary
-}
-
 .dcat-step-horizontal:not(.dcat-step-label-vertical) .dcat-step-item {
   margin-right: 16px;
   white-space: nowrap

resources/assets/dcat/extra/upload.scss

@@ -42,7 +42,6 @@
   user-select: none;
   background-image: none;
   color: #fff;
-  background-color: lighten($primary, 2%)
 }
 
 .webuploader-pick-hover {
@@ -89,7 +88,6 @@
 }
 
 .web-uploader .placeholder .webuploader-pick {
-  background: lighten($primary, 1%);
   border-radius: 3px;
   line-height: 34px;
   padding: 0 25px;
@@ -115,7 +113,6 @@
 }
 
 .web-uploader .placeholder .flashTip a {
-  color: lighten($primary, 1%);
   text-decoration: none
 }
 
@@ -242,8 +239,6 @@
   overflow: hidden;
   width: 0;
   height: 100%;
-  background: lighten($primary, 2%);
-  //background: lighten($primary, 2%) url(./progress.png) repeat-x;
   -webit-transition: width 200ms linear;
   -moz-transition: width 200ms linear;
   -o-transition: width 200ms linear;
@@ -431,7 +426,6 @@
   height: 100%;
   left: 0;
   top: 0;
-  background: lighten($primary, 2%);
   position: absolute
 }
 

resources/views/form/file.blade.php

@@ -1,3 +1,24 @@
+<style>
+    @php($primary = admin_color()->primary())
+
+    .webuploader-pick {
+        background-color: {!! $primary !!}
+    }
+
+    .web-uploader .placeholder .webuploader-pick {
+        background: {!! admin_color()->lighten('primary', 12) !!};
+    }
+
+    .web-uploader .placeholder .flashTip a {
+        color: {!! admin_color()->lighten('primary', 12) !!};
+    }
+
+    .web-uploader .statusBar .upload-progress span.percentage,
+    .web-uploader .filelist li p.upload-progress span {
+        background: {!! admin_color()->lighten('primary', 10) !!};
+    }
+</style>
+
 <div id="{{ $id }}-container" class="{{$viewClass['form-group']}}">
 
     <label for="{{$column}}" class="{{$viewClass['label']}} control-label">{!! $label !!}</label>

resources/views/form/steps.blade.php

@@ -1,3 +1,28 @@
+<style>
+    @php($primary = admin_color()->primary())
+
+    .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-icons,
+    .done > .dcat-step-item-container > .dcat-step-line:after,
+    .done .dcat-step-icons,
+    .active .dcat-step-icons {
+        border-color: {!! $primary !!}
+    }
+
+    .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-icons .dcat-step-icon,
+    .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-desc .dcat-step .dcat-step-item:not(.active) > .dcat-step-item-container[role=button]:hover .dcat-step-title,
+    .done .dcat-step-icons > .dcat-step-icon,
+    .active .dcat-step-icons > .dcat-step-icon {
+        color: {!! $primary !!}
+    }
+
+    .done > .dcat-step-item-container > .dcat-step-content > .dcat-step-title:after,
+    .done .dcat-step-icons > .dcat-step-icon .dcat-step-icon-dot,
+    .active .dcat-step-icons,
+    .active .dcat-step-icons > .dcat-step-icon .dcat-step-icon-dot {
+        background-color: {!! $primary !!}
+    }
+</style>
+
 @if($showHeader)
     <div class="box-header with-border">
         <h3 class="box-title" style="line-height:30px">{!! $form->title() !!}</h3>

src/Layout/Asset.php

@@ -293,8 +293,6 @@ class Asset
         $alias = [
             '@adminlte',
             '@dcat',
-            '@webuploader',
-            '@smart-wizard',
         ];
 
         foreach ($alias as $n) {

webpack.mix.js

@@ -61,19 +61,4 @@ mix.sass(dcatPath('sass/dcat-app.scss'), themeCss('dcat/css/dcat-app')).sourceMa
 
 // 打包所有 extra 里面的所有js和css
 mixAssetsDir('dcat/extra/*.js', (src, dest) => mix.js(src, dest));
-mixAssetsDir('dcat/extra/*.scss', (src, dest) => {
-  if (theme) {
-    return mix.sass(src, dest.replace('\.scss', '-'+theme+'.css'))
-  }
-
-  return mix.sass(src, dest.replace('scss', 'css'))
-});
-
-// 皮肤
-// mixAssetsDir('dcat/sass/skins/*.scss', (src, dest) => {
-//   if (theme) {
-//     return mix.sass(src, dest.replace('\.scss', '-'+theme+'.css').replace(/sass/g, 'css'))
-//   }
-//
-//   return mix.sass(src, dest.replace(/sass/g, 'css').replace('scss', 'css'))
-// });
+mixAssetsDir('dcat/extra/*.scss', (src, dest) => mix.sass(src, dest.replace('scss', 'css')));