From 5609fdd6f0a23a90c30ca3e1aa067842980c9da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Tue, 6 May 2025 20:17:05 +0800 Subject: [PATCH] =?UTF-8?q?style(core):=20=E4=BC=98=E5=8C=96nav=E5=92=8Cco?= =?UTF-8?q?ntextMenu=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/css/chrome-tabs.css | 2 +- common/css/jquery.contextMenu.css | 7 +++-- common/templates/html/nav/nav.html | 44 +++++++++--------------------- 3 files changed, 18 insertions(+), 35 deletions(-) diff --git a/common/css/chrome-tabs.css b/common/css/chrome-tabs.css index 577dddc6..1f0d80d1 100644 --- a/common/css/chrome-tabs.css +++ b/common/css/chrome-tabs.css @@ -1,7 +1,7 @@ .chrome-tabs { box-sizing: border-box; position: relative; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "Lato", "Noto Sans SC"; font-size: 12px; height: 46px; padding: 5px 0px 0px 0px; diff --git a/common/css/jquery.contextMenu.css b/common/css/jquery.contextMenu.css index 64778868..aba35cca 100644 --- a/common/css/jquery.contextMenu.css +++ b/common/css/jquery.contextMenu.css @@ -193,9 +193,10 @@ } .tippy-box > .tippy-content > .context-menu-list { - -webkit-box-shadow: unset; - box-shadow: unset; - border-radius: 0.25rem; + position: relative; + -webkit-box-shadow: unset; + box-shadow: unset; + border-radius: 0.25rem; } .context-menu-item { diff --git a/common/templates/html/nav/nav.html b/common/templates/html/nav/nav.html index da96e3ca..d6a8837a 100644 --- a/common/templates/html/nav/nav.html +++ b/common/templates/html/nav/nav.html @@ -12,10 +12,12 @@ } html[data-bs-theme=light] ul[m-id="{{d.mId}}"] { + background-color: var(--app-light-color) !important; border-bottom: 1px solid #c9c9c9; } html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] { + background-color: #3c3c3c !important; border-bottom: 1px solid rgba(128, 128, 128, 0.35); } @@ -27,9 +29,6 @@ flex-direction: row; align-items: center; justify-content: center; - } - - ul[m-id="{{d.mId}}"] button { border-color: transparent; color: #fff !important; } @@ -48,13 +47,11 @@ html[data-bs-theme=light] ul[m-id="{{d.mId}}"] button:hover { box-shadow: 2px 0px 5px #7b7171; - /*box-shadow: none;*/ border-color: #19897f; } html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] button:hover { box-shadow: 2px 0px 5px #303030; - /*box-shadow: none;*/ border-color: #434242; } @@ -75,14 +72,8 @@ max-height: calc(100vh - var(--nav-height) - 12px); line-height: 30px; overflow-y: auto; - } - - html[data-bs-theme=light] ul[m-id="{{d.mId}}"] { - background-color: var(--app-light-color) !important; - } - - html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] { - background-color: #3c3c3c !important; + top: var(--nav-height); + box-shadow: 0 2px 5px rgb(0 0 0 / 50%); } ul[m-id="{{d.mId}}"] .layui-nav-item { @@ -91,10 +82,6 @@ cursor: pointer; } - ul[m-id="{{d.mId}}"] .layui-nav-child { - top: var(--nav-height); - } - ul[m-id="{{d.mId}}"] dl { z-index: 1001; } @@ -150,8 +137,8 @@ } ul[m-id="{{d.mId}}"] .layui-nav-item dd > a { - font-size: 14px; - line-height: 14px; + font-size: 13px; + line-height: 13px; border-radius: 5px; box-sizing: content-box; padding: 5px 7px 4px 7px !important; @@ -159,16 +146,11 @@ border-radius: 5px; min-width: 100px; font-family: "Lato", "Noto Sans SC"; - } - - ul[m-id="{{d.mId}}"] .layui-nav-item dd > a { transition: none; -webkit-transition: none; } ul[m-id="{{d.mId}}"] .layui-nav-item dd > a:hover { - transition: none; - -webkit-transition: none; color: #fff; } @@ -272,33 +254,33 @@ -webkit-transition: all .3s; } - html[data-bs-theme=light] ul[m-id="{{d.mId}}"] select + .select2 > .selection > .select2-selection { + html[data-bs-theme=light] ul[m-id="{{d.mId}}"] .select2 > .selection > .select2-selection { background-color: #009f90; border-color: #009f90; } - html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] select + .select2 > .selection > .select2-selection { + html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] .select2 > .selection > .select2-selection { background-color: var(--lay-color-fill-2); border-color: var(--lay-color-border-1); } - html[data-bs-theme=light] ul[m-id="{{d.mId}}"] select + .select2 > .selection > .select2-selection:hover { + html[data-bs-theme=light] ul[m-id="{{d.mId}}"] .select2 > .selection > .select2-selection:hover { border-color: #037a6f; } - html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] select + .select2 > .selection > .select2-selection:hover { + html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] .select2 > .selection > .select2-selection:hover { border-color: #1f1f1f; } - ul[m-id="{{d.mId}}"] select + .select2 > .selection > .select2-selection > .select2-selection__rendered { + ul[m-id="{{d.mId}}"] .select2 > .selection > .select2-selection > .select2-selection__rendered { color: #fff; } - ul[m-id="{{d.mId}}"] select + .select2 > .selection > .select2-selection > .select2-selection__arrow b { + ul[m-id="{{d.mId}}"] .select2 > .selection > .select2-selection > .select2-selection__arrow b { border-color: #fff transparent transparent transparent; } - ul[m-id="{{d.mId}}"] select + .select2-container--open > .selection > .select2-selection > .select2-selection__arrow b { + ul[m-id="{{d.mId}}"] .select2-container--open > .selection > .select2-selection > .select2-selection__arrow b { border-color: transparent transparent #fff transparent; }