From 527679dc3bf0501fd6d2c4b401b887d3d72d4608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Sun, 27 Apr 2025 19:59:40 +0800 Subject: [PATCH] =?UTF-8?q?style(core):=20=E8=B0=83=E6=95=B4=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E7=BB=84=E4=BB=B6=E7=9A=84css=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/blockly.css | 6 +++--- common/css/dialog-ext.css | 10 +++++++--- common/css/jquery.contextMenu.css | 4 ++-- common/css/menu.css | 1 + common/css/select2-ext.css | 4 ++-- common/templates/html/nav/nav.html | 21 ++++++++++----------- 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/common/css/blockly.css b/common/css/blockly.css index fbbcd40f..ec9abe93 100644 --- a/common/css/blockly.css +++ b/common/css/blockly.css @@ -188,7 +188,7 @@ .dark-theme.geras-renderer .blocklyMenu > .blocklyMenuItem { background-color: #252525; color: #eee; - font-family: Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif; + font-family: "Lato", "Noto Sans SC"; } .dark-theme.zelos-renderer .blocklyMenu > .blocklyMenuItem { @@ -197,7 +197,7 @@ } .dark-theme .blocklyMenu > .blocklyMenuItem.blocklyMenuItemHighlight { - background-color: #2980b9; + background-color: var(--app-dark-color); } .blocklyDropDownDiv.dark-theme.zelos-renderer .blocklyMenu > .blocklyMenuItem.blocklyMenuItemHighlight { @@ -217,7 +217,7 @@ } .blocklyMenu > .blocklyMenuItem { - font-family: Lato, system-ui, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: "Lato", "Noto Sans SC"; margin: 0px 5px; border-radius: 5px; box-sizing: content-box; diff --git a/common/css/dialog-ext.css b/common/css/dialog-ext.css index 454ce8ca..946a0113 100644 --- a/common/css/dialog-ext.css +++ b/common/css/dialog-ext.css @@ -8,14 +8,18 @@ right: 7px !important; } +.ui-dialog-body > .ui-dialog-content { + padding: 0; +} + html[data-bs-theme=dark] .ui-dialog { - background-color: #2B2D30; - border: 1px solid #444444; + background-color: #252525; + border: 1px solid #454545; color: #eee; } html[data-bs-theme=dark] .ui-popup-focus .ui-dialog { - box-shadow: 0 0 8px rgba(0, 0, 0, 0.1); + box-shadow: 0 2px 5px rgb(0 0 0 / 50%); } html[data-bs-theme=dark] .ui-popup-modal .ui-dialog { diff --git a/common/css/jquery.contextMenu.css b/common/css/jquery.contextMenu.css index 217084d1..88972d86 100644 --- a/common/css/jquery.contextMenu.css +++ b/common/css/jquery.contextMenu.css @@ -182,7 +182,7 @@ max-width: 26em; padding: .25em 0; margin: .3em; - font-family: Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif; + font-family: "Lato", "Noto Sans SC"; font-size: 13px; list-style-type: none; background: #fff; @@ -329,7 +329,7 @@ html[data-bs-theme=dark] .context-menu-item.context-menu-disabled { } html[data-bs-theme=dark] .context-menu-item.context-menu-hover { - background-color: #2980b9 !important; + background-color: var(--app-dark-color) !important; } html[data-bs-theme=dark] .context-menu-separator { diff --git a/common/css/menu.css b/common/css/menu.css index 2a825b82..1cbef6ba 100644 --- a/common/css/menu.css +++ b/common/css/menu.css @@ -4,6 +4,7 @@ justify-content: space-between; align-items: center; white-space: nowrap; + font-family: "Lato", "Noto Sans SC"; } .menu-line > div { diff --git a/common/css/select2-ext.css b/common/css/select2-ext.css index 03bbd623..af05d7df 100644 --- a/common/css/select2-ext.css +++ b/common/css/select2-ext.css @@ -7,7 +7,7 @@ } .select2-results__options { - font-family: Lato, system-ui, -apple-system, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + font-family: "Lato", "Noto Sans SC"; margin: 5px 0px; } @@ -19,7 +19,7 @@ margin: 0px 5px; border-radius: 5px; box-sizing: content-box; - padding: 0.2em 0.5em; + padding: 0.28em 0.5em; font-size: 13px; } diff --git a/common/templates/html/nav/nav.html b/common/templates/html/nav/nav.html index 13f523d5..da96e3ca 100644 --- a/common/templates/html/nav/nav.html +++ b/common/templates/html/nav/nav.html @@ -86,22 +86,19 @@ } ul[m-id="{{d.mId}}"] .layui-nav-item { + font-family: "Lato", "Noto Sans SC"; line-height: var(--nav-height); cursor: pointer; } ul[m-id="{{d.mId}}"] .layui-nav-child { - top: calc(var(--nav-height) + 1px); + top: var(--nav-height); } ul[m-id="{{d.mId}}"] dl { z-index: 1001; } - .layui-nav .layui-nav-item a { - padding: 0 17px !important; - } - ul[m-id="{{d.mId}}"] > div { display: flex; flex-direction: row; @@ -114,6 +111,7 @@ } ul[m-id="{{d.mId}}"] .left-btn-container button { + font-family: "Lato", "Noto Sans SC"; height: var(--nav-left-btn-height); font-size: calc(var(--nav-left-btn-font-size) + 4px); margin: 2px; @@ -148,7 +146,7 @@ ul[m-id="{{d.mId}}"] .layui-nav-item dd { margin: 0; - font-family: Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif; + font-family: "Lato", "Noto Sans SC"; } ul[m-id="{{d.mId}}"] .layui-nav-item dd > a { @@ -156,11 +154,11 @@ line-height: 14px; border-radius: 5px; box-sizing: content-box; - padding: 5px 10px !important; + padding: 5px 7px 4px 7px !important; margin: 0px 5px; border-radius: 5px; - min-width: 60px; - font-family: Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif; + min-width: 100px; + font-family: "Lato", "Noto Sans SC"; } ul[m-id="{{d.mId}}"] .layui-nav-item dd > a { @@ -179,7 +177,7 @@ } html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] .layui-nav-item dd > a:hover { - background-color: #2980b9; + background-color: var(--app-dark-color); } html[data-bs-theme=light] ul[m-id="{{d.mId}}"] hr { @@ -204,7 +202,7 @@ } ul[m-id="{{d.mId}}"] > .editor-btn-container > .copyright { - font-family: "YaHei Consolas Hybrid", "Microsoft Yahei Light", "Arial"; + font-family: "Lato", "Noto Sans SC"; font-size: 12px; color: #fff !important; text-align: center; @@ -239,6 +237,7 @@ } ul[m-id="{{d.mId}}"] > .editor-btn-container .group > button { + font-family: "Lato", "Noto Sans SC"; border-radius: 4px; padding: 0 2px; margin: 0 4px;