feat: 同步 layui v2.9.21

Sight-wcg · Feb 2, 2025 · dd6635c · dd6635c
1 parent cebcde0
commit dd6635c
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 5 deletions.
diff --git a/app.js b/app.js
@@ -1,4 +1,4 @@
-const VERSION = '2.9.21-rc';
+const VERSION = '2.9.21';
 const layuicss = `https://unpkg.com/layui@${VERSION}/dist/css/layui.css`;
 const layuijs = `https://unpkg.com/layui@${VERSION}/dist/layui.js`;
 // const layuicss=`https://cdn.jsdelivr.net/gh/layui/layui@${VERSION}/dist/css/layui.css`;
@@ -34,12 +34,11 @@ loadScript(layuijs, function () {
       initialValue: 'dark',
       modes: {
         light: '',
-        dark: `${rootPath}dist/layui-theme-dark-selector.css`,
+        dark: `${rootPath}dist/layui-theme-dark.css`,
       },
       storageKey: APPERANCE_KEY,
       onChanged(mode, defaultHandler) {
-        const isAppearanceTransition =
-          document.startViewTransition && !window.matchMedia(`(prefers-reduced-motion: reduce)`).matches;
+        const isAppearanceTransition = document.startViewTransition && !window.matchMedia(`(prefers-reduced-motion: reduce)`).matches;
         const isDark = mode === 'dark';
 
         $('#change-theme').attr('class', `layui-icon layui-icon-${isDark ? 'moon' : 'light'}`);

diff --git a/dist/layui-theme-dark-legacy.css b/dist/layui-theme-dark-legacy.css
@@ -695,6 +695,7 @@ body .layui-util-face .layui-layer-content{background-color: #373739;color:rgba(
 .layui-layer-win10 .layui-layer-btn{background-color: #232324;border-color: #484849}
 .layui-layer-win10.layui-layer-dialog .layui-layer-content{color: #1379D2}
 .layui-layer-win10 .layui-layer-btn .layui-layer-btn0{border-color: #043A79;background-color: #373739;color: rgba(255,255,255,.9)}
+.layui-layer-win10 .layui-layer-btn .layui-layer-btn1{border-color: #484849;background-color: #373739;color: rgba(255,255,255,.9)}
 .layui-layer-win10 .layui-layer-btn a:hover{background-color: #00214D;border-color: #0A58A6}
 .layui-layer-prompt .layui-layer-input{border:1px solid #484849;color: rgba(255,255,255,.7)}
 .layui-layer-tab{box-shadow:0 16px 24px rgba(0, 0, 0, 14%), 0 6px 30px rgba(0, 0, 0, 12%), 0 8px 10px rgba(0, 0, 0, 20%)}

diff --git a/dist/layui-theme-dark-selector.css b/dist/layui-theme-dark-selector.css
@@ -1829,6 +1829,11 @@
   background-color: var(--lay-color-bg-5);
   color: var(--lay-color-text-1);
 }
+.dark .layui-layer-win10 .layui-layer-btn .layui-layer-btn1 {
+  border-color: var(--lay-color-border-2);
+  background-color: var(--lay-color-bg-5);
+  color: var(--lay-color-text-1);
+}
 .dark .layui-layer-win10 .layui-layer-btn a:hover {
   background-color: var(--lay-color-blue-10);
   border-color: var(--lay-color-blue-8);

diff --git a/dist/layui-theme-dark.css b/dist/layui-theme-dark.css
@@ -684,6 +684,7 @@ body .layui-util-face .layui-layer-content{background-color: var(--lay-color-bg-
 .layui-layer-win10 .layui-layer-btn{background-color: var(--lay-color-bg-2);border-color: var(--lay-color-border-2)}
 .layui-layer-win10.layui-layer-dialog .layui-layer-content{color: var(--lay-color-blue-7)}
 .layui-layer-win10 .layui-layer-btn .layui-layer-btn0{border-color: var(--lay-color-blue-9);background-color: var(--lay-color-bg-5);color: var(--lay-color-text-1)}
+.layui-layer-win10 .layui-layer-btn .layui-layer-btn1{border-color: var(--lay-color-border-2);background-color: var(--lay-color-bg-5);color: var(--lay-color-text-1)}
 .layui-layer-win10 .layui-layer-btn a:hover{background-color: var(--lay-color-blue-10);border-color: var(--lay-color-blue-8)}
 .layui-layer-prompt .layui-layer-input{border:1px solid var(--lay-color-border-2);color: var(--lay-color-text-2)}
 .layui-layer-tab{box-shadow:var(--lay-shadow-3)}

diff --git a/docs/view/layer.html b/docs/view/layer.html
@@ -17,6 +17,7 @@
   <button class="layui-btn" lay-on="test8">Tab</button>
   <button class="layui-btn" lay-on="test9">Photo</button>
   <button class="layui-btn" lay-on="testTime">自动关闭</button>
+  <button class="layui-btn" lay-on="fluent">fluent</button>
   <a href="https://layui.dev/docs/2/layer/" target="_blank" class="layui-btn">更多例子</a>
 </div>
 
@@ -86,6 +87,13 @@
 
   // 触发事件
   util.on('lay-on', {
+    fluent: function(){
+      layer.alert('Windows 10 风格主题', {
+        skin: 'layui-layer-win10', // 2.8+
+        shade: 0.01,
+        btn: ['确定', '取消']
+      })
+    },
     test: function(){
       var icon = -1;
       (function changeIcon(){

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "layui-theme-dark",
-  "version": "2.9.20",
+  "version": "2.9.21",
   "description": "layui 深色主题",
   "type": "module",
   "scripts": {

diff --git a/src/override.css b/src/override.css
@@ -482,6 +482,7 @@ body .layui-util-face .layui-layer-content{background-color: var(--lay-color-bg-
 .layui-layer-win10 .layui-layer-btn{background-color: var(--lay-color-bg-2);border-color: var(--lay-color-border-2)}
 .layui-layer-win10.layui-layer-dialog .layui-layer-content{color: var(--lay-color-blue-7)}
 .layui-layer-win10 .layui-layer-btn .layui-layer-btn0{border-color: var(--lay-color-blue-9);background-color: var(--lay-color-bg-5);color: var(--lay-color-text-1)}
+.layui-layer-win10 .layui-layer-btn .layui-layer-btn1{border-color: var(--lay-color-border-2);background-color: var(--lay-color-bg-5);color: var(--lay-color-text-1)}
 .layui-layer-win10 .layui-layer-btn a:hover{background-color: var(--lay-color-blue-10);border-color: var(--lay-color-blue-8)}
 .layui-layer-prompt .layui-layer-input{border:1px solid var(--lay-color-border-2);color: var(--lay-color-text-2)}
 .layui-layer-tab{box-shadow:var(--lay-shadow-3)}