+ >
-
-
-
-
- {{ t("nav.material") }} - - -
@@ -52,7 +47,6 @@ size="15px" type="layui-icon-theme" style=" - color: rgba(255, 255, 255, 0.7); padding-left: 30px; padding-right: 30px; " @@ -143,11 +137,6 @@ >
- -
-
-
- - -
.layui-layout > .layui-side { @@ -321,13 +310,7 @@ export default { margin-top: 60px; z-index: 99; height: calc(100% - 60px); - box-shadow: 2px 0 8px 0 rgb(29 35 41 / 5%); -} - -.layui-layout-document .layui-body, -.layui-layout-document .layui-menu, -.layui-layout-document .lay-aside { - background-color: var(--global-back-color); + border-right: 1px solid #EEEEEE; } .layui-layout-document > .layui-layout > .layui-body { @@ -338,11 +321,20 @@ export default { height: calc(100% - 60px); } +.layui-layout-document .layui-header .layui-form-switch { + border: 1px solid rgba(60, 60, 60, .29); + background-color: #f1f1f1!important; +} + +.layui-layout-document .layui-nav .layui-nav-item > a, +.layui-layout-document .layui-nav .layui-nav-item > a:hover { + color: rgba(0, 0, 0, 0.8); +} + .layui-logo img { - height: 31px; - width: 82px; + height: 45px; left: 15px; - top: 16px; + top: 0px; } .layui-header > .layui-nav { @@ -352,13 +344,6 @@ export default { .layui-header .layui-local-badge { font-size: 12.4px; background: transparent; - color: rgba(255, 255, 255, 0.7); - border-color: rgba(255, 255, 255, 0.7); -} - -.layui-header > .layui-local:hover { - color: white; - border-color: white; } .layui-menu-docs { diff --git a/example/src/main.ts b/example/src/main.ts index 095f7aa9..399ea9c2 100644 --- a/example/src/main.ts +++ b/example/src/main.ts @@ -6,7 +6,6 @@ import layui from '../../src/index' import LayCode from './components/LayCode.vue' import LaySearch from './components/LaySearch.vue' import LayTableBox from './components/LayTableBox.vue' -import LayComment from './components/LayComment.vue' import LayAnchor from './components/LayAnchor.vue' import './assets/css/index.css' @@ -24,7 +23,6 @@ export function createApp(): { .component('LayCode', LayCode) .component('LaySearch', LaySearch) .component('LayTableBox', LayTableBox) - .component('LayComment', LayComment) .component('LayAnchor',LayAnchor) return { app, router } diff --git a/example/src/plugin/common-plugins.ts b/example/src/plugin/common-plugins.ts index 8fbae2c4..5ceb222d 100644 --- a/example/src/plugin/common-plugins.ts +++ b/example/src/plugin/common-plugins.ts @@ -8,7 +8,6 @@ import createTitle from "./create-title"; import createQuote from "./create-quote"; import createDescribe from "./create-describe"; import createTable from "./create-table"; -import createComment from "./create-comment"; import createAnchor from "./create-anchor"; import preWrapper from "./pre-wrapper"; import previousNext from "./previous-next"; @@ -32,7 +31,6 @@ const plugins = [ .use(...createQuote("quote", "")) .use(...createTitle("title", "")) .use(...createDescribe("describe", "")) - .use(...createComment("comment", "")) .use(...createAnchor("anchor", "")) .use(...previousNext("previousNext", "")); }, diff --git a/example/src/plugin/create-comment.ts b/example/src/plugin/create-comment.ts deleted file mode 100644 index 995e2eaa..00000000 --- a/example/src/plugin/create-comment.ts +++ /dev/null @@ -1,27 +0,0 @@ -import container from 'markdown-it-container' -import type Token from 'markdown-it/lib/token' - -type ContainerArgs = [ - typeof container, string, - { render(tokens: Token[], idx: number): string } -] - -export default function createContainer( - klass: string, - defaultTitle: string -): ContainerArgs { - return [ - container, - klass, - { - render(tokens, idx) { - const token = tokens[idx] - if (token.nesting === 1) { - return ` ` - } else { - return ' \n' - } - }, - }, - ] -} \ No newline at end of file diff --git a/example/src/plugin/previous-next.ts b/example/src/plugin/previous-next.ts index 56990caa..af30628e 100644 --- a/example/src/plugin/previous-next.ts +++ b/example/src/plugin/previous-next.ts @@ -30,7 +30,7 @@ export default function createContainer( } }); if (token.nesting === 1) { - return `+ return `diff --git a/src/provider/index.vue b/src/provider/index.vue index 9b57ae5e..6999c4c3 100644 --- a/src/provider/index.vue +++ b/src/provider/index.vue @@ -40,20 +40,26 @@ const changeLocales = (lang: string, locales: any, merge: boolean) => { const changeTheme = (theme: string) => { if (theme === "dark") { - enableDarkMode({ - mode: 1, - brightness: 100, - contrast: 90, - sepia: 0, - // darkSchemeTextColor: 'rgba(255, 255, 255, 0.9)', - // darkSchemeBackgroundColor: '#22272E' - }, { + enableDarkMode( + { + mode: 1, + brightness: 100, + contrast: 90, + sepia: 0, + // darkSchemeTextColor: 'rgba(255, 255, 255, 0.9)', + // darkSchemeBackgroundColor: '#22272E' + }, + { invert: [], css: ``, - ignoreInlineStyle: ['.layui-colorpicker-trigger-span','div.layui-color-picker *'], + ignoreInlineStyle: [ + ".layui-colorpicker-trigger-span", + "div.layui-color-picker *", + ], ignoreImageAnalysis: [], disableStyleSheetsProxy: false, - }); + } + ); } else { disableDarkMode(); } From f2145945cbb146a31ed4815b91ce3acdf5dc23dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com> Date: Wed, 30 Mar 2022 18:38:47 +0800 Subject: [PATCH 09/13] =?UTF-8?q?docs:=20=E6=96=87=E6=A1=A3=20dark=20?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/src/view/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/src/view/index.vue b/example/src/view/index.vue index 04e89c51..616a5c28 100644 --- a/example/src/view/index.vue +++ b/example/src/view/index.vue @@ -203,7 +203,7 @@ body { color: #fff; color: #213547; font-size: 52px; - opacity: 0.9; + opacity: 0.82; } .web-font-desc { font-size: 76px; From 020a260279497eb0da6f01ba16aa1d3917ab604a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com> Date: Wed, 30 Mar 2022 21:16:15 +0800 Subject: [PATCH 10/13] =?UTF-8?q?docs:=20=E4=BC=98=E5=8C=96=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/docs/zh-CN/guide/dark.md | 17 ++++++ example/src/layouts/Layout.vue | 2 +- example/src/router/zh-CN.ts | 5 ++ example/src/view/guide.vue | 5 ++ example/src/view/index.vue | 90 +++++++++++++++++++------------- 5 files changed, 83 insertions(+), 36 deletions(-) diff --git a/example/docs/zh-CN/guide/dark.md b/example/docs/zh-CN/guide/dark.md index e69de29b..d5d73128 100644 --- a/example/docs/zh-CN/guide/dark.md +++ b/example/docs/zh-CN/guide/dark.md @@ -0,0 +1,17 @@ +::: title 夜间模式 +::: + +::: describe 默认情况下, 网站主题为日间模式。若需启用深夜模式, 使用 config-provider 组件。 +::: + +``` + +@@ -121,18 +114,27 @@ export default { } diff --git a/src/component/checkbox/index.vue b/src/component/checkbox/index.vue index 2b114f0b..40472e9e 100644 --- a/src/component/checkbox/index.vue +++ b/src/component/checkbox/index.vue @@ -105,7 +105,7 @@ const handleClick = function () { :lay-skin="skin" >@@ -20,14 +20,7 @@ >
- {{ t('home.version') }}：v0.4.4 -{{ t('home.changelog') }} + {{ t('home.version') }}：0.4.4 {{ t('home.download') }}：5463- + + + + + +``` \ No newline at end of file diff --git a/example/src/layouts/Layout.vue b/example/src/layouts/Layout.vue index 7eae218b..760f578d 100644 --- a/example/src/layouts/Layout.vue +++ b/example/src/layouts/Layout.vue @@ -8,7 +8,7 @@+ - layui - vue
+ layui - vue
- import("../../docs/zh-CN/guide/locale.md"),
meta: { title: "语言" },
},
+ {
+ path: "/zh-CN/guide/dark",
+ component: () => import("../../docs/zh-CN/guide/dark.md"),
+ meta: { title: "夜间" },
+ },
],
},
{
diff --git a/example/src/view/guide.vue b/example/src/view/guide.vue
index 2a91b837..f38094fd 100644
--- a/example/src/view/guide.vue
+++ b/example/src/view/guide.vue
@@ -91,6 +91,11 @@ export default {
title: '主题',
subTitle: 'theme',
path: '/zh-CN/guide/theme',
+ },{
+ id: 3,
+ title: '夜间',
+ subTitle: 'dark',
+ path: '/zh-CN/guide/dark',
},
{
id: 3,
diff --git a/example/src/view/index.vue b/example/src/view/index.vue
index 616a5c28..e13bb70a 100644
--- a/example/src/view/index.vue
+++ b/example/src/view/index.vue
@@ -10,18 +10,27 @@
- @@ -91,28 +100,24 @@
layui - vue
- {{ t('home.description') }} + {{ t("home.description") }}-Get Started ++ Get Started + ++ Switch Dark + - {{ t('home.version') }}：1.0.0 - {{ t('home.download') }}：5463 + {{ t("home.version") }}：1.0.0 + {{ t("home.download") }}：5463-+