Browse Source

add theme css

update
jqh 5 years ago
parent
commit
5e5f33b67f

+ 3 - 0
resources/assets/dcat/js/dcat-app.js

@@ -57,8 +57,11 @@ function extend (Dcat) {
 // 初始化
 function listen(Dcat) {
     Dcat.booting(function () {
+        // 菜单点击选中效果
         new Menu(Dcat);
+        // 返回顶部按钮
         new Footer(Dcat);
+        // pjax初始化功能
         new Pjax(Dcat);
 
         // layer弹窗设置

+ 5 - 2
resources/dist/dcat/js/app.js

@@ -461,8 +461,11 @@ function extend(Dcat) {
 
 function listen(Dcat) {
   Dcat.booting(function () {
-    new _bootstrappers_Menu__WEBPACK_IMPORTED_MODULE_10__["default"](Dcat);
-    new _bootstrappers_Footer__WEBPACK_IMPORTED_MODULE_11__["default"](Dcat);
+    // 菜单点击选中效果
+    new _bootstrappers_Menu__WEBPACK_IMPORTED_MODULE_10__["default"](Dcat); // 返回顶部按钮
+
+    new _bootstrappers_Footer__WEBPACK_IMPORTED_MODULE_11__["default"](Dcat); // pjax初始化功能
+
     new _bootstrappers_Pjax__WEBPACK_IMPORTED_MODULE_12__["default"](Dcat); // layer弹窗设置
 
     layer.config({

+ 0 - 2
resources/views/layouts/vertical.blade.php

@@ -10,8 +10,6 @@
         console.log(123, Dcat)
         $(function () {
 
-            console.log($('form').ajaxSubmit);
-            console.log($.fn.ajaxSubmit);
         })
     </script>
 

+ 15 - 1
src/Layout/Assets.php

@@ -78,6 +78,14 @@ class Assets
      */
     protected $usingFullPage = false;
 
+    /**
+     * @var array
+     */
+    protected $themeCssMap = [
+        'dark' => 'dark-layout',
+        'semi-dark' => 'semi-dark-layout',
+    ];
+
     /**
      * Assets constructor.
      */
@@ -171,7 +179,13 @@ class Assets
             return;
         }
 
-        $this->baseCss[] = "dcat-admin/css/themes/{$theme}.css";
+        $css = $this->themeCssMap[$theme] ?? $theme;
+
+        if ($css === 'light') {
+            return;
+        }
+
+        $this->baseCss[] = "dcat-admin/css/themes/{$css}.css";
     }
 
     protected function addFontCss()

+ 1 - 1
src/Layout/Content.php

@@ -133,7 +133,7 @@ class Content implements Renderable
     /**
      * Set breadcrumb of content.
      *
-     * exp:
+     * @example
      *     $this->breadcrumb('Menu', 'auth/menu', 'fa fa-align-justify');
      *     $this->breadcrumb([
      *         ['text' => 'Menu', 'url' => 'auth/menu', 'icon' => 'fa fa-align-justify']