From 847ad05d2ac5ff344167bad2f3f5de39143a54ad Mon Sep 17 00:00:00 2001 From: fengli Date: Fri, 23 Feb 2024 10:21:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E4=BD=93=E8=B0=83=E6=95=B4=E3=80=81tooltip=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主页面字体调整、tooltip样式修改 Log: 主页面字体调整、tooltip样式修改 Bug: https://pms.uniontech.com/bug-view-241593.html https://pms.uniontech.com/bug-view-241597.html https://pms.uniontech.com/bug-view-243239.html --- src/web/toManual/js/App.js | 14 ++++++++------ src/web/toManual/sass/app.scss | 4 ++-- src/web/toManual/sass/index.scss | 1 + src/web_dist/toManual/index.css | 7 ++++--- src/web_dist/toManual/index.js | 14 ++++++++------ 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/web/toManual/js/App.js b/src/web/toManual/js/App.js index 2b93d959..898294c8 100755 --- a/src/web/toManual/js/App.js +++ b/src/web/toManual/js/App.js @@ -565,8 +565,8 @@ class App extends React.Component { document.documentElement.style.setProperty(`--body-color-white2black`, '#000000'); document.documentElement.style.setProperty(`--app-word-color`, '#C0C6D4'); document.documentElement.style.setProperty(`--nav-background-color`, '#282828'); - document.documentElement.style.setProperty(`--nav-h2-word-color`, '#C0C6D4'); - document.documentElement.style.setProperty(`--nav-h3-word-color`, '#C0C0C0'); + document.documentElement.style.setProperty(`--nav-h2-word-color`, 'rgba(255, 255, 255, 0.85)'); + document.documentElement.style.setProperty(`--nav-h3-word-color`, 'rgba(255, 255, 255, 0.7)'); document.documentElement.style.setProperty('--nav-hove-word-color', '#C0C6D4'); document.documentElement.style.setProperty('--nav-hove-border-color', 'rgba(0, 0, 0, 0.3)'); //document.documentElement.style.setProperty(`--nav-hash-word-color`, '#0059D2'); //btnlist 改这行 @@ -595,8 +595,9 @@ class App extends React.Component { document.documentElement.style.setProperty(`--search-WikiSearch-color`, '#6D7C88'); document.documentElement.style.setProperty(`--search-itemTitle-word-color`, '#C0C6D4'); document.documentElement.style.setProperty(`--search-context-word-color`, '#6D7C88'); - document.documentElement.style.setProperty(`--tips-background-color`, '#2A2A2A'); - document.documentElement.style.setProperty(`--tips-border-color`, 'rgba(0, 0, 0,0.3)'); + document.documentElement.style.setProperty(`--tips-background-color`, 'rgba(42, 42, 42, 0.8)'); + document.documentElement.style.setProperty(`--tips-border-color`, 'rgba(0, 0, 0, 0.3)'); + document.documentElement.style.setProperty('--tips-shadow-color', 'rgba(0, 0, 0, 0.2)'); } else if ("LightType" == themeType) { console.log('LightType'); document.documentElement.style.setProperty(`--nav-hover-color`, 'rgba(0,0,0,0.1)'); @@ -634,8 +635,9 @@ class App extends React.Component { document.documentElement.style.setProperty(`--search-WikiSearch-color`, '#7a7a7a'); document.documentElement.style.setProperty(`--search-itemTitle-word-color`, '#000000'); document.documentElement.style.setProperty(`--search-context-word-color`, '#000000'); - document.documentElement.style.setProperty(`--tips-background-color`, '#F7F7F7'); - document.documentElement.style.setProperty(`--tips-border-color`, 'rgba(0,0,0,0.05)'); + document.documentElement.style.setProperty(`--tips-background-color`, 'rgba(247, 247, 247, 0.6)'); + document.documentElement.style.setProperty(`--tips-border-color`, 'rgba(0, 0, 0, 0.05)'); + document.documentElement.style.setProperty('--tips-shadow-color', 'rgba(0, 0, 0, 0.2)'); } else { console.log('Null'); } diff --git a/src/web/toManual/sass/app.scss b/src/web/toManual/sass/app.scss index cc17300c..94df8179 100644 --- a/src/web/toManual/sass/app.scss +++ b/src/web/toManual/sass/app.scss @@ -122,9 +122,9 @@ div { max-width: 500px; padding: 2px 5px; border-radius: 8px; - border: 1px solid var(--nav-hove-border-color); + border: 1px solid var(--tips-border-color); font-family: var(--nav-world-font-family); - box-shadow: 0px 3px 20px rgba(247, 247, 247, 0.6); + box-shadow: 0px 3px 20px var(--tips-shadow-color); } .tooltip-wrapper.show { diff --git a/src/web/toManual/sass/index.scss b/src/web/toManual/sass/index.scss index b25374c7..68dbe90a 100644 --- a/src/web/toManual/sass/index.scss +++ b/src/web/toManual/sass/index.scss @@ -31,6 +31,7 @@ line-height: 4.5rem; margin: 0 0 0 0; border-top: 1px solid var(--index-h2-color); + color: var(--nav-h2-word-color); #righttext { color: var(--nav-hash-word-color); diff --git a/src/web_dist/toManual/index.css b/src/web_dist/toManual/index.css index 255dd9b1..759e1c7d 100644 --- a/src/web_dist/toManual/index.css +++ b/src/web_dist/toManual/index.css @@ -63,9 +63,9 @@ div { max-width: 500px; padding: 2px 5px; border-radius: 8px; - border: 1px solid var(--nav-hove-border-color); + border: 1px solid var(--tips-border-color); font-family: var(--nav-world-font-family); - box-shadow: 0px 3px 20px rgba(247, 247, 247, 0.6); } + box-shadow: 0px 3px 20px var(--tips-shadow-color); } div .support-div .tooltip-wrapper.show { visibility: visible; } @@ -299,7 +299,8 @@ div { font-size: 1.6rem; line-height: 4.5rem; margin: 0 0 0 0; - border-top: 1px solid var(--index-h2-color); } + border-top: 1px solid var(--index-h2-color); + color: var(--nav-h2-word-color); } #index h2 #righttext { color: var(--nav-hash-word-color); float: right; diff --git a/src/web_dist/toManual/index.js b/src/web_dist/toManual/index.js index 927afbc1..4da59f8b 100644 --- a/src/web_dist/toManual/index.js +++ b/src/web_dist/toManual/index.js @@ -645,8 +645,8 @@ var App = function (_React$Component) { document.documentElement.style.setProperty('--body-color-white2black', '#000000'); document.documentElement.style.setProperty('--app-word-color', '#C0C6D4'); document.documentElement.style.setProperty('--nav-background-color', '#282828'); - document.documentElement.style.setProperty('--nav-h2-word-color', '#C0C6D4'); - document.documentElement.style.setProperty('--nav-h3-word-color', '#C0C0C0'); + document.documentElement.style.setProperty('--nav-h2-word-color', 'rgba(255, 255, 255, 0.85)'); + document.documentElement.style.setProperty('--nav-h3-word-color', 'rgba(255, 255, 255, 0.7)'); document.documentElement.style.setProperty('--nav-hove-word-color', '#C0C6D4'); document.documentElement.style.setProperty('--nav-hove-border-color', 'rgba(0, 0, 0, 0.3)'); //document.documentElement.style.setProperty(`--nav-hash-word-color`, '#0059D2'); //btnlist 改这行 @@ -675,8 +675,9 @@ var App = function (_React$Component) { document.documentElement.style.setProperty('--search-WikiSearch-color', '#6D7C88'); document.documentElement.style.setProperty('--search-itemTitle-word-color', '#C0C6D4'); document.documentElement.style.setProperty('--search-context-word-color', '#6D7C88'); - document.documentElement.style.setProperty('--tips-background-color', '#2A2A2A'); - document.documentElement.style.setProperty('--tips-border-color', 'rgba(0, 0, 0,0.3)'); + document.documentElement.style.setProperty('--tips-background-color', 'rgba(42, 42, 42, 0.8)'); + document.documentElement.style.setProperty('--tips-border-color', 'rgba(0, 0, 0, 0.3)'); + document.documentElement.style.setProperty('--tips-shadow-color', 'rgba(0, 0, 0, 0.2)'); } else if ("LightType" == themeType) { console.log('LightType'); document.documentElement.style.setProperty('--nav-hover-color', 'rgba(0,0,0,0.1)'); @@ -714,8 +715,9 @@ var App = function (_React$Component) { document.documentElement.style.setProperty('--search-WikiSearch-color', '#7a7a7a'); document.documentElement.style.setProperty('--search-itemTitle-word-color', '#000000'); document.documentElement.style.setProperty('--search-context-word-color', '#000000'); - document.documentElement.style.setProperty('--tips-background-color', '#F7F7F7'); - document.documentElement.style.setProperty('--tips-border-color', 'rgba(0,0,0,0.05)'); + document.documentElement.style.setProperty('--tips-background-color', 'rgba(247, 247, 247, 0.6)'); + document.documentElement.style.setProperty('--tips-border-color', 'rgba(0, 0, 0, 0.05)'); + document.documentElement.style.setProperty('--tips-shadow-color', 'rgba(0, 0, 0, 0.2)'); } else { console.log('Null'); }