jqh 4 年之前
父节点
当前提交
fa5782f185
共有 3 个文件被更改,包括 5 次插入7 次删除
  1. 3 3
      resources/views/form/file.blade.php
  2. 1 3
      src/AdminServiceProvider.php
  3. 1 1
      src/Console/stubs/extension/view.stub

+ 3 - 3
resources/views/form/file.blade.php

@@ -1,15 +1,15 @@
 <style>
     .webuploader-pick {
-        background-color: {!! admin_color()->primary() !!};
+        background-color: @primary;
     }
 
     .web-uploader .placeholder .flashTip a {
-        color: {!! admin_color()->primary(-10) !!};
+        color: @primary(-10);
     }
 
     .web-uploader .statusBar .upload-progress span.percentage,
     .web-uploader .filelist li p.upload-progress span {
-        background: {!! admin_color()->primary(-8) !!};
+        background: @primary(-8);
     }
 </style>
 

+ 1 - 3
src/AdminServiceProvider.php

@@ -247,10 +247,8 @@ class AdminServiceProvider extends ServiceProvider
     protected function registerBladeDirective()
     {
         Blade::directive('primary', function ($amt = 0) {
-            $color = $amt ? admin_color()->darken('primary', $amt) : admin_color('primary');
-
             return <<<PHP
-<?php echo "{$color}";?>
+<?php echo admin_color()->primary($amt); ?>
 PHP;
         });
     }

+ 1 - 1
src/Console/stubs/extension/view.stub

@@ -4,7 +4,7 @@
 
 <style>
 	.extension-demo {
-		color: {!! admin_color()->primary() !!};
+		color: @primary;
 	}
 </style>