diff --git a/CHANGELOG.md b/CHANGELOG.md index e927f30a..0c2406cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # 更新日志 +## v4.2.0 + +- 功能优化:优化聊天页面 Notice 组件样式,采用 Vuepress 文档样式 +- Bug 修复:修复主题切换的组件显示异常问题 + ## v4.1.9 - 功能优化:优化系统配置,移除已废弃的配置项 diff --git a/web/.env.development b/web/.env.development index 847a0947..1ca03b6f 100644 --- a/web/.env.development +++ b/web/.env.development @@ -6,7 +6,7 @@ VUE_APP_ADMIN_USER=admin VUE_APP_ADMIN_PASS=admin123 VUE_APP_KEY_PREFIX=GeekAI_DEV_ VUE_APP_TITLE="Geek-AI 创作系统" -VUE_APP_VERSION=v4.1.9 +VUE_APP_VERSION=v4.2.0 VUE_APP_DOCS_URL=https://docs.geekai.me VUE_APP_GITHUB_URL=https://github.com/yangjian102621/geekai VUE_APP_GITEE_URL=https://gitee.com/blackfox/geekai diff --git a/web/.env.production b/web/.env.production index fe27ab9d..2e7b1ed9 100644 --- a/web/.env.production +++ b/web/.env.production @@ -1,7 +1,7 @@ VUE_APP_API_HOST= VUE_APP_WS_HOST= VUE_APP_KEY_PREFIX=GeekAI_ -VUE_APP_VERSION=v4.1.9 +VUE_APP_VERSION=v4.2.0 VUE_APP_DOCS_URL=https://docs.geekai.me VUE_APP_GITHUB_URL=https://github.com/yangjian102621/geekai VUE_APP_GITEE_URL=https://gitee.com/blackfox/geekai diff --git a/web/src/assets/css/home.styl b/web/src/assets/css/home.styl index 0aa0e27f..533e2e5e 100644 --- a/web/src/assets/css/home.styl +++ b/web/src/assets/css/home.styl @@ -132,11 +132,6 @@ overflow: hidden; border-radius: 50%; font-size: 20px; - // img{ - // width: 24px; - // height: 24px; - // } - } &.active { @@ -183,19 +178,6 @@ } } -::v-deep(.theme-box) { - position: relative !important; - right: initial; - bottom: initial; - width: 20px; - height: 20px; - line-height: 18px; - - .iconfont { - font-size: 15px !important; - } -} - .right-main { height: 100%; // background: #f5f7fd; @@ -246,18 +228,18 @@ } &:hover { - background: rgba(79, 89, 102, 0.1); + background: rgba(183, 176, 255, 0.5); } } li.active { - background: rgba(79, 89, 102, 0.1); + background: rgba(183, 176, 255, 0.5); } } .setting-menus { .title { - color: #222226; + color: var(--text-theme-color); } .el-icon, @@ -265,7 +247,7 @@ font-size: 18px margin-right: 6px } - color: #222226; + color: var(--text-theme-color); } .username { diff --git a/web/src/assets/css/markdown/vue.css b/web/src/assets/css/markdown/vue.css index 862aaadf..e49bb334 100644 --- a/web/src/assets/css/markdown/vue.css +++ b/web/src/assets/css/markdown/vue.css @@ -1,238 +1,239 @@ -.chat-line { - ol, ul { - margin: 0.8em 0; - list-style: normal; - } - a { - - color :var(--a-link-color); - text-decoration: underline; - - padding: 0 2px; - } +.chat-line, +.notice-dialog { + ol, + ul { + margin: 0.8em 0; + list-style: normal; + } + a { + color: var(--a-link-color); + text-decoration: underline; - h1, - h2, - h3, - h4, - h5, - h6 { - position: relative; - margin-top: 1rem; - margin-bottom: 1rem; - font-weight: bold; - line-height: 1.4; - cursor: text; - } + padding: 0 2px; + } - h1:hover a.anchor, - h2:hover a.anchor, - h3:hover a.anchor, - h4:hover a.anchor, - h5:hover a.anchor, - h6:hover a.anchor { - text-decoration: none; - } + h1, + h2, + h3, + h4, + h5, + h6 { + position: relative; + margin-top: 1rem; + margin-bottom: 1rem; + font-weight: bold; + line-height: 1.4; + cursor: text; + } - h1 tt, - h1 code { - font-size: inherit !important; - } + h1:hover a.anchor, + h2:hover a.anchor, + h3:hover a.anchor, + h4:hover a.anchor, + h5:hover a.anchor, + h6:hover a.anchor { + text-decoration: none; + } - h2 tt, - h2 code { - font-size: inherit !important; - } + h1 tt, + h1 code { + font-size: inherit !important; + } - h3 tt, - h3 code { - font-size: inherit !important; - } + h2 tt, + h2 code { + font-size: inherit !important; + } - h4 tt, - h4 code { - font-size: inherit !important; - } + h3 tt, + h3 code { + font-size: inherit !important; + } - h5 tt, - h5 code { - font-size: inherit !important; - } + h4 tt, + h4 code { + font-size: inherit !important; + } - h6 tt, - h6 code { - font-size: inherit !important; - } + h5 tt, + h5 code { + font-size: inherit !important; + } - h2 a, - h3 a { - color: #34495e; - } + h6 tt, + h6 code { + font-size: inherit !important; + } - h1 { - padding-bottom: .4rem; - font-size: 2.2rem; - line-height: 1.3; - } + h2 a, + h3 a { + color: #34495e; + } - h2 { - font-size: 1.75rem; - line-height: 1.225; - margin: 35px 0 15px; - padding-bottom: 0.5em; - border-bottom: 1px solid #ddd; - } + h1 { + padding-bottom: 0.4rem; + font-size: 2.2rem; + line-height: 1.3; + } - h3 { - font-size: 1.4rem; - line-height: 1.43; - margin: 20px 0 7px; - } + h2 { + font-size: 1.75rem; + line-height: 1.225; + margin: 35px 0 15px; + padding-bottom: 0.5em; + border-bottom: 1px solid #ddd; + } - h4 { - font-size: 1.2rem; - } + h3 { + font-size: 1.4rem; + line-height: 1.43; + margin: 20px 0 7px; + } - h5 { - font-size: 1rem; - } + h4 { + font-size: 1.2rem; + } - h6 { - font-size: 1rem; - color: #777; - } + h5 { + font-size: 1rem; + } - p, - blockquote, - ul, - ol, - dl, - table { - margin: 0.8em 0; - } + h6 { + font-size: 1rem; + color: #777; + } - li > ol, - li > ul { - margin: 0 0; - } + p, + blockquote, + ul, + ol, + dl, + table { + margin: 0.8em 0; + } - hr { - height: 2px; - padding: 0; - margin: 16px 0; - background-color: #e7e7e7; - border: 0 none; - overflow: hidden; - box-sizing: content-box; - } + li > ol, + li > ul { + margin: 0 0; + } - body > h2:first-child { - margin-top: 0; - padding-top: 0; - } + hr { + height: 2px; + padding: 0; + margin: 16px 0; + background-color: #e7e7e7; + border: 0 none; + overflow: hidden; + box-sizing: content-box; + } - body > h1:first-child { - margin-top: 0; - padding-top: 0; - } + body > h2:first-child { + margin-top: 0; + padding-top: 0; + } - body > h1:first-child + h2 { - margin-top: 0; - padding-top: 0; - } + body > h1:first-child { + margin-top: 0; + padding-top: 0; + } - body > h3:first-child, - body > h4:first-child, - body > h5:first-child, - body > h6:first-child { - margin-top: 0; - padding-top: 0; - } + body > h1:first-child + h2 { + margin-top: 0; + padding-top: 0; + } - a:first-child h1, - a:first-child h2, - a:first-child h3, - a:first-child h4, - a:first-child h5, - a:first-child h6 { - margin-top: 0; - padding-top: 0; - } + body > h3:first-child, + body > h4:first-child, + body > h5:first-child, + body > h6:first-child { + margin-top: 0; + padding-top: 0; + } - h1 p, - h2 p, - h3 p, - h4 p, - h5 p, - h6 p { - margin-top: 0; - } + a:first-child h1, + a:first-child h2, + a:first-child h3, + a:first-child h4, + a:first-child h5, + a:first-child h6 { + margin-top: 0; + padding-top: 0; + } - li p.first { - display: inline-block; - } + h1 p, + h2 p, + h3 p, + h4 p, + h5 p, + h6 p { + margin-top: 0; + } - ul, - ol { - padding-left: 30px; - } + li p.first { + display: inline-block; + } - ul:first-child, - ol:first-child { - margin-top: 0; - } + ul, + ol { + padding-left: 30px; + } - ul:last-child, - ol:last-child { - margin-bottom: 0; - } + ul:first-child, + ol:first-child { + margin-top: 0; + } - blockquote { - border-left: 4px solid #42b983; - padding: 10px 15px; - color: #777; - background-color: rgba(66, 185, 131, .1); - } + ul:last-child, + ol:last-child { + margin-bottom: 0; + } - table { - padding: 0; - word-break: initial; - } + blockquote { + border-left: 4px solid #42b983; + padding: 10px 15px; + color: #777; + background-color: rgba(66, 185, 131, 0.1); + } - table tr { - border-top: 1px solid #dfe2e5; - margin: 0; - padding: 0; - } + table { + padding: 0; + word-break: initial; + } - table tr:nth-child(2n), - thead { - background-color: #fafafa; - } + table tr { + border-top: 1px solid #dfe2e5; + margin: 0; + padding: 0; + } - table tr th { - font-weight: bold; - border: 1px solid #dfe2e5; - border-bottom: 0; - text-align: left; - margin: 0; - padding: 6px 13px; - } + table tr:nth-child(2n), + thead { + background-color: #fafafa; + } - table tr td { - border: 1px solid #dfe2e5; - text-align: left; - margin: 0; - padding: 6px 13px; - } + table tr th { + font-weight: bold; + border: 1px solid #dfe2e5; + border-bottom: 0; + text-align: left; + margin: 0; + padding: 6px 13px; + } - table tr th:first-child, - table tr td:first-child { - margin-top: 0; - } + table tr td { + border: 1px solid #dfe2e5; + text-align: left; + margin: 0; + padding: 6px 13px; + } - table tr th:last-child, - table tr td:last-child { - margin-bottom: 0; - } + table tr th:first-child, + table tr td:first-child { + margin-top: 0; + } + + table tr th:last-child, + table tr td:last-child { + margin-bottom: 0; + } } diff --git a/web/src/assets/css/theme-dark.styl b/web/src/assets/css/theme-dark.styl index c8304f95..42d26a76 100644 --- a/web/src/assets/css/theme-dark.styl +++ b/web/src/assets/css/theme-dark.styl @@ -55,7 +55,7 @@ //filter: invert(100%); } .more-menus span.title{ - color:#000; + color: var(--text-theme-color); } // 操作按钮 @@ -89,4 +89,7 @@ // 引用快样式 --quote-bg-color: #1F243F; --quote-text-color: #fff; + + // el-dialog 阴影 + --el-box-shadow: 0 0 15px rgba(107, 80, 225, 0.8); } diff --git a/web/src/components/ThemeChange.vue b/web/src/components/ThemeChange.vue index 417340e8..fb1da4d1 100644 --- a/web/src/components/ThemeChange.vue +++ b/web/src/components/ThemeChange.vue @@ -1,12 +1,19 @@ diff --git a/web/src/components/UserInfoDialog.vue b/web/src/components/UserInfoDialog.vue index bc5896f5..558f6064 100644 --- a/web/src/components/UserInfoDialog.vue +++ b/web/src/components/UserInfoDialog.vue @@ -1,6 +1,6 @@