add css file for template html

DTStack · Jun 3, 2021 · 8d49b21 · 8d49b21
1 parent f1a7cec
commit 8d49b21
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 6 deletions.
diff --git a/bisheng.config.js b/bisheng.config.js
@@ -53,7 +53,7 @@ module.exports = {
                         priority: 3
                     },
                     common: {
-                        test: /[\\/]dt-theme[\\/]common[\\/]index.less/,
+                        test: /[\\/]dt-theme[\\/]dt-common[\\/]index.less/,
                         priority: 3
                     }
                 }

diff --git a/theme/dt-theme/dark/resetDark.less b/theme/dt-theme/dark/resetDark.less
@@ -1,4 +1,4 @@
-@import '~antd/dist/antd.less';
+@import '../dt-common/reset.less';
 
 @theme: dark;
 // color palettes

diff --git a/theme/dt-theme/default/reset.less b/theme/dt-theme/default/reset.less
@@ -1,4 +1,4 @@
-@import '~antd/dist/antd.less';
+@import '../dt-common/reset.less';
 
 // 覆盖antd变量
 @primary-color: #3F87FF;

diff --git a/theme/dt-theme/common/alert.less → theme/dt-theme/dt-common/alert.less b/theme/dt-theme/common/alert.less → theme/dt-theme/dt-common/alert.less
diff --git a/theme/dt-theme/common/button.less → theme/dt-theme/dt-common/button.less b/theme/dt-theme/common/button.less → theme/dt-theme/dt-common/button.less
diff --git a/theme/dt-theme/common/card.less → theme/dt-theme/dt-common/card.less b/theme/dt-theme/common/card.less → theme/dt-theme/dt-common/card.less
diff --git a/theme/dt-theme/common/comm.less → theme/dt-theme/dt-common/comm.less b/theme/dt-theme/common/comm.less → theme/dt-theme/dt-common/comm.less
diff --git a/theme/dt-theme/common/descriptions.less → theme/dt-theme/dt-common/descriptions.less b/theme/dt-theme/common/descriptions.less → theme/dt-theme/dt-common/descriptions.less
diff --git a/theme/dt-theme/common/form.less → theme/dt-theme/dt-common/form.less b/theme/dt-theme/common/form.less → theme/dt-theme/dt-common/form.less
diff --git a/theme/dt-theme/common/index.less → theme/dt-theme/dt-common/index.less b/theme/dt-theme/common/index.less → theme/dt-theme/dt-common/index.less
@@ -9,6 +9,7 @@
 @import './form.less';
 @import './card.less';
 @import './notice.less';
+// @import './reset.less';
 
 * {
     margin: 0;

diff --git a/theme/dt-theme/common/layout.less → theme/dt-theme/dt-common/layout.less b/theme/dt-theme/common/layout.less → theme/dt-theme/dt-common/layout.less
diff --git a/theme/dt-theme/common/modal.less → theme/dt-theme/dt-common/modal.less b/theme/dt-theme/common/modal.less → theme/dt-theme/dt-common/modal.less
diff --git a/theme/dt-theme/common/notice.less → theme/dt-theme/dt-common/notice.less b/theme/dt-theme/common/notice.less → theme/dt-theme/dt-common/notice.less
diff --git a/theme/dt-theme/dt-common/reset.less b/theme/dt-theme/dt-common/reset.less
@@ -0,0 +1 @@
+@import '~antd/dist/antd.less';
diff --git a/theme/dt-theme/common/tab.less → theme/dt-theme/dt-common/tab.less b/theme/dt-theme/common/tab.less → theme/dt-theme/dt-common/tab.less
diff --git a/theme/dt-theme/common/table.less → theme/dt-theme/dt-common/table.less b/theme/dt-theme/common/table.less → theme/dt-theme/dt-common/table.less
diff --git a/theme/static/template.html b/theme/static/template.html
@@ -12,9 +12,9 @@
       href="https://gw.alipayobjects.com/zos/rmsportal/rlpTLlbMzTNYuZGGCVYM.png"
       type="image/x-icon"
     />
-    {% for cssFile in manifest["css"] %}
+    {% for cssFile in manifest["css"] %}{% if not cssFile.includes('dark') and not cssFile.includes('default')%}
     <link rel="stylesheet" type="text/css" href="{{ root }}{{ cssFile }}"/>
-    {% endfor %}
+    {% endif %}{% endfor %}
     <script src="https://gw.alipayobjects.com/os/lib/es6-shim/0.35.5/??es6-sham.min.js,es6-shim.min.js"></script>
     <!--[if lte IE 10]>
     <script src="https://as.alipayobjects.com/g/component/??console-polyfill/0.2.2/index.js,media-match/2.0.2/media.match.min.js"></script>
@@ -29,5 +29,8 @@
 {% for jsFile in manifest["js"] %}
 <script src="{{ root }}{{ jsFile }}"></script>
 {% endfor %}
+{% for cssFile in manifest["css"]%}{% if cssFile.includes('dark') or cssFile.includes('default') %}
+<link rel="stylesheet" type="text/css" href="{{ root }}{{ cssFile }}"/>
+{% endif %}{% endfor %}
 </body>
 </html>
diff --git a/theme/template/Layout/index.jsx b/theme/template/Layout/index.jsx
@@ -16,7 +16,7 @@ import '../../static/iconfont/iconfont.css';
 
 import '../../dt-theme/default/index.less';
 import '../../dt-theme/dark/index.less';
-import '../../dt-theme/common/index.less';
+import '../../dt-theme/dt-common/index.less';
 
 if (typeof window !== 'undefined' && navigator.serviceWorker) {
     navigator.serviceWorker.getRegistrations().then(registrations => {