From 37dd3d859ff2acf008b2e7c0d66ceac92dafcd09 Mon Sep 17 00:00:00 2001 From: wangdan Date: Fri, 3 Feb 2023 12:50:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B4=E7=90=86=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/app-layout/footer/index.scss | 17 ---- .../components/app-layout/footer/index.vue | 31 +++++-- frontend/src/components/app-status/index.vue | 6 +- frontend/src/main.ts | 5 +- frontend/src/styles/common-dark.scss | 0 frontend/src/styles/common.scss | 93 +++++++++++-------- frontend/src/styles/element.scss | 13 +-- frontend/src/styles/index.scss | 22 +---- 8 files changed, 95 insertions(+), 92 deletions(-) delete mode 100644 frontend/src/components/app-layout/footer/index.scss create mode 100644 frontend/src/styles/common-dark.scss diff --git a/frontend/src/components/app-layout/footer/index.scss b/frontend/src/components/app-layout/footer/index.scss deleted file mode 100644 index 7c1790ce5..000000000 --- a/frontend/src/components/app-layout/footer/index.scss +++ /dev/null @@ -1,17 +0,0 @@ -.footer { - height: 45px; - background: #ffffff; - border-top: 1px solid #e4e7ed; - a { - font-size: 14px; - color: #858585; - text-decoration: none; - letter-spacing: 0.5px; - } - span { - font-size: 14px; - color: #858585; - text-decoration: none; - letter-spacing: 0.5px; - } -} diff --git a/frontend/src/components/app-layout/footer/index.vue b/frontend/src/components/app-layout/footer/index.vue index e0adf6890..e931d1f6b 100644 --- a/frontend/src/components/app-layout/footer/index.vue +++ b/frontend/src/components/app-layout/footer/index.vue @@ -13,14 +13,29 @@ diff --git a/frontend/src/components/app-status/index.vue b/frontend/src/components/app-status/index.vue index d371c5d31..74246da74 100644 --- a/frontend/src/components/app-status/index.vue +++ b/frontend/src/components/app-status/index.vue @@ -135,9 +135,9 @@ onMounted(() => { } } -body { - margin: 0; -} +// body { +// margin: 0; +// } .status-content { margin-left: 50px; diff --git a/frontend/src/main.ts b/frontend/src/main.ts index 0d972d4bb..01daf9a67 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -4,13 +4,12 @@ import App from './App.vue'; // import 'element-plus/theme-chalk/dark/css-vars.css'; import '@/styles/index.scss'; -import '@/styles/reset.scss'; +// import '@/styles/reset.scss'; +import '@/styles/common-dark.scss'; import '@/styles/common.scss'; import '@/assets/fonts/font.scss'; import '@/assets/iconfont/iconfont.css'; import '@/assets/iconfont/iconfont.js'; -import '@/styles/element-dark.scss'; -import '@/styles/element.scss'; import VMdPreview from '@kangc/v-md-editor/lib/preview'; import githubTheme from '@kangc/v-md-editor/lib/theme/github.js'; diff --git a/frontend/src/styles/common-dark.scss b/frontend/src/styles/common-dark.scss new file mode 100644 index 000000000..e69de29bb diff --git a/frontend/src/styles/common.scss b/frontend/src/styles/common.scss index 6e8c1f6f9..f6e5db8a3 100644 --- a/frontend/src/styles/common.scss +++ b/frontend/src/styles/common.scss @@ -92,15 +92,17 @@ } } -#nprogress .bar { - background: $primary-color !important; -} -#nprogress .spinner-icon { - border-top-color: $primary-color !important; - border-left-color: $primary-color !important; -} -#nprogress .peg { - box-shadow: 0 0 10px $primary-color, 0 0 5px $primary-color !important; +#nprogress { + .bar { + background: $primary-color !important; + } + .spinner-icon { + border-top-color: $primary-color !important; + border-left-color: $primary-color !important; + } + .peg { + box-shadow: 0 0 10px $primary-color, 0 0 5px $primary-color !important; + } } .form-button { @@ -131,35 +133,31 @@ border-collapse: collapse; font-size: 12px; table-layout: fixed; -} - -.myTable td { - width: 35%; - padding: 8px; - height: 23px; - border: 1px solid #383c42; - word-wrap: break-word; -} - -.myTable td div { - margin-top: 2px; -} - -.myTable th { - border: 0; - height: 30px; -} - -.myTable tr:hover { - background-color: #d9dde2; -} - -.myTable tr:first-child:hover { - background-color: transparent !important; -} - -.myTable tr td:nth-child(even) { - color: #85888e; + td { + width: 35%; + padding: 8px; + height: 23px; + border: 1px solid #383c42; + word-wrap: break-word; + div { + margin-top: 2px; + } + th { + border: 0; + height: 30px; + } + tr { + &:hover { + background-color: #d9dde2; + } + &:first-child:hover { + background-color: transparent !important; + } + td:nth-child(even) { + color: #85888e; + } + } + } } .mask { @@ -227,3 +225,22 @@ background-color: rgba(0, 94, 235, 0.1); } } + +// search条圆角 +.search-button { + .el-input__wrapper { + border-radius: 50px; + } +} + +// drawer头部增加按钮 +.drawer-header-button { + span { + color: currentColor !important; + font-size: var(--el-font-size-base) !important; + } + .active-button { + color: var(--el-button-hover-text-color); + border-color: var(--el-button-hover-border-color); + } +} diff --git a/frontend/src/styles/element.scss b/frontend/src/styles/element.scss index c76874ceb..76d93a480 100644 --- a/frontend/src/styles/element.scss +++ b/frontend/src/styles/element.scss @@ -155,10 +155,11 @@ .row-box { display: flex; flex-flow: wrap; + .el-card { + min-width: 100%; + height: 100%; + margin-right: 20px; + border: 0; + } } -.row-box .el-card { - min-width: 100%; - height: 100%; - margin-right: 20px; - border: 0; -} + diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index ee7858924..3a362f94b 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -1,18 +1,6 @@ -@use 'fit2cloud-ui-plus/src/styles/index.scss'; -.search-button { - .el-input__wrapper { - border-radius: 50px; - } -} +@use 'fit2cloud-ui-plus/src/styles/index.scss' as *; +@use './element-dark.scss'; +@use './element.scss' as *; +@use './reset.scss'; + -// drawer头部增加按钮 -.drawer-header-button { - span { - color: currentColor !important; - font-size: var(--el-font-size-base) !important; - } - .active-button { - color: var(--el-button-hover-text-color); - border-color: var(--el-button-hover-border-color); - } -}