From e6e8ecb29841d6ec5dded9b5e8093cf118b43ad7 Mon Sep 17 00:00:00 2001 From: tony <107676016+cs0tony@users.noreply.github.com> Date: Thu, 30 May 2024 11:12:40 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4UI=E5=92=8C=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/public/favicon.ico | Bin 1150 -> 219827 bytes server/src/App.vue | 6 +- server/src/components/Hamburger/index.vue | 12 +- server/src/components/HeaderSearch/index.vue | 2 +- server/src/components/LangSelect/index.vue | 4 +- server/src/components/Screenfull/index.vue | 2 +- server/src/components/SizeSelect/index.vue | 14 +- server/src/icons/svg/collection-fill.svg | 3 + server/src/icons/svg/font-size.svg | 1 + server/src/icons/svg/fullscreen-exit.svg | 3 + server/src/icons/svg/fullscreen.svg | 4 +- server/src/icons/svg/globe-americas.svg | 3 + server/src/icons/svg/list-ul.svg | 3 + server/src/icons/svg/search-line.svg | 3 + server/src/icons/svg/translate.svg | 4 + server/src/layout/components/Navbar.vue | 5 +- server/src/layout/components/Sidebar/Logo.vue | 13 +- .../src/layout/components/Sidebar/index.vue | 38 ++++ server/src/main.js | 9 +- server/src/router/index.js | 6 +- server/src/styles/element-ui.scss | 106 +++++++++- server/src/styles/element-variables.scss | 41 +++- server/src/styles/index.scss | 13 +- server/src/styles/sidebar.scss | 43 ++-- server/src/styles/variables.scss | 30 +-- server/src/views/browser/group.vue | 56 +++--- server/src/views/browser/index.vue | 188 +++++++++--------- 27 files changed, 418 insertions(+), 194 deletions(-) create mode 100644 server/src/icons/svg/collection-fill.svg create mode 100644 server/src/icons/svg/font-size.svg create mode 100644 server/src/icons/svg/fullscreen-exit.svg create mode 100644 server/src/icons/svg/globe-americas.svg create mode 100644 server/src/icons/svg/list-ul.svg create mode 100644 server/src/icons/svg/search-line.svg create mode 100644 server/src/icons/svg/translate.svg diff --git a/server/public/favicon.ico b/server/public/favicon.ico index 2a21c8c27f282b6c0fa91766a94e93c800fe1eea..582308e3c299bc7171e85cba132083b0247af516 100644 GIT binary patch literal 219827 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 S*r}XH=;1Y$ydFhue)b>fYi1z; literal 1150 zcmZvbPiPZC6vn@zHxC96-fSnkwzg60KfFgmqG{-k_0tE})a#zEIG=(yI9Sp_IRW^>g&GrXKb71}p3m z%6BEJ*unfDxuIq&Gm_@fqDbfaecpPu)2oceu5jF*d8kEja+OzZ^18#N`0kO export default { - name: 'App' + name: 'App', + mounted() { + const size = localStorage.getItem('size') || 'mini' + document.body.classList.add('emphasize-' + size) + } } diff --git a/server/src/components/Hamburger/index.vue b/server/src/components/Hamburger/index.vue index ccdcff7..d870a9d 100644 --- a/server/src/components/Hamburger/index.vue +++ b/server/src/components/Hamburger/index.vue @@ -3,14 +3,20 @@ - + /> --> + diff --git a/server/src/components/HeaderSearch/index.vue b/server/src/components/HeaderSearch/index.vue index 62e83a3..b13c057 100644 --- a/server/src/components/HeaderSearch/index.vue +++ b/server/src/components/HeaderSearch/index.vue @@ -1,6 +1,6 @@ @@ -54,3 +64,31 @@ export default { } } + diff --git a/server/src/main.js b/server/src/main.js index 7c34066..39ba5a3 100644 --- a/server/src/main.js +++ b/server/src/main.js @@ -2,11 +2,10 @@ import Vue from 'vue' import Clipboard from 'v-clipboard' import Cookies from 'js-cookie' -import 'normalize.css/normalize.css' // a modern alternative to CSS resets - +// import 'normalize.css/normalize.css' // a modern alternative to CSS resets import Element from 'element-ui' -import './styles/element-variables.scss' - +// import './styles/element-variables.scss' +// import 'element-ui/lib/theme-chalk/index.css' import '@/styles/index.scss' // global css import App from './App' @@ -35,7 +34,7 @@ if (process.env.NODE_ENV === 'production') { Vue.use(Clipboard) Vue.use(Element, { - size: localStorage.getItem('size') || 'mini', // set element-ui default size + size: localStorage.getItem('size') || 'small', // set element-ui default size i18n: (key, value) => i18n.t(key, value) }) diff --git a/server/src/router/index.js b/server/src/router/index.js index a070d61..e2c2112 100644 --- a/server/src/router/index.js +++ b/server/src/router/index.js @@ -85,19 +85,19 @@ export const constantRoutes = [ path: '/', component: Layout, redirect: '/index', - meta: { title: 'browser', icon: 'international' }, + meta: { title: 'browser', icon: 'globe-americas' }, children: [ { path: 'index', component: require('@/views/browser/index').default, name: 'Browser', - meta: { title: 'browser_list', icon: 'list', affix: true } + meta: { title: 'browser_list', icon: 'list-ul', affix: true } }, { path: 'group', component: require('@/views/browser/group').default, name: 'Group', - meta: { title: 'group', icon: 'tab', affix: true } + meta: { title: 'group', icon: 'collection-fill', affix: true } } ] } diff --git a/server/src/styles/element-ui.scss b/server/src/styles/element-ui.scss index 49474de..b069cc4 100644 --- a/server/src/styles/element-ui.scss +++ b/server/src/styles/element-ui.scss @@ -1,4 +1,105 @@ +@import './element-variables.scss'; +@import '~element-ui/packages/theme-chalk/src/index'; + // cover some element-ui styles +// 统一主题圆角尺寸 +.el-popover { + border-radius: $--border-radius-base; +} +.el-menu--popup { + border-radius: $--border-radius-base; + padding: 0 0 5px 0; +} +.el-menu-item { + height: 38px; + line-height: 38px; + margin: 5px 5px 0 5px; + border-radius: $--border-radius-small; +} +// 带边框的表格第一列居中 +.el-table--border th:first-child .cell, +.el-table--border td:first-child .cell { + padding-right: 10px; +} +// 统一small字体大小为13px +.el-table--small { + font-size: 13px; +} +// 修改primary按钮背景 +.el-button--primary { + background: linear-gradient(180deg, $--color-primary 0%, $--color-primary-light-1 100%); + &:hover, + &:focus { + // background: $--color-primary-light-2; + background: linear-gradient(180deg, $--color-primary-light-1 0%, $--color-primary-light-2 100%); + } +} +// 调整el-select样式 +.el-select-dropdown__item { + margin: 0 6px; + border-radius: 5px; +} +.emphasize-medium { + .el-select-dropdown__item { + height: 30px; + line-height: 30px; + padding: 0 17px; + font-size: 14px; + } +} +.emphasize-small { + .el-select-dropdown__item { + height: 27px; + line-height: 27px; + padding: 0 15px; + font-size: 13px; + } +} +.emphasize-mini { + .el-select-dropdown__list { + padding: 3px 0; + } + .el-select-dropdown__item { + height: 24px; + line-height: 24px; + padding: 0 10px; + font-size: 12px; + margin: 0 3px; + } +} +// checkbox边框加粗 +// 圆角调整 +.el-checkbox__inner { + border-width: 2px; + border-radius: 5px; +} +// 调整el-dropdown样式 +.el-dropdown-menu__item { + margin: 0 8px; + border-radius: 5px; +} + +.el-dropdown-menu--medium { + .el-dropdown-menu__item { + margin: 0 6px; + } +} + +.el-dropdown-menu--small { + .el-dropdown-menu__item { + margin: 0 6px; + } +} + +.el-dropdown-menu--mini { + .el-dropdown-menu__item { + margin: 0 3px; + } +} + +.el-message-box { + border-radius: 9px; +} .el-breadcrumb__inner, .el-breadcrumb__inner a { @@ -6,7 +107,7 @@ } .el-upload { - input[type="file"] { + input[type='file'] { display: none !important; } } @@ -48,6 +149,7 @@ // to fixed https://github.com/ElemeFE/element/issues/2461 .el-dialog { + border-radius: 9px; transform: none; left: 0; position: relative; @@ -69,7 +171,7 @@ // dropdown .el-dropdown-menu { a { - display: block + display: block; } } diff --git a/server/src/styles/element-variables.scss b/server/src/styles/element-variables.scss index 4e5f210..1d7387d 100644 --- a/server/src/styles/element-variables.scss +++ b/server/src/styles/element-variables.scss @@ -4,16 +4,24 @@ **/ /* theme color */ -$--color-primary: #2ea000; //#1890ff; -$--color-success: #13ce66; +// $--color-primary: #2ea000; //#1890ff; +// $--color-success: #13ce66; +// $--color-warning: #ffba00; +// $--color-danger: #ff4949; +$--color-primary: #1677ff; //#1890ff; +$--color-success: #3ec487; $--color-warning: #ffba00; -$--color-danger: #ff4949; +$--color-danger: #f03a5f; +$--color-info: #597b98; // $--color-info: #1E1E1E; +// 修改hover背景颜色 +$--background-color-base: #e4eeff; $--button-font-weight: 400; // $--color-text-regular: #1f2d3d; +$--border-color-base: #d9d9d9; $--border-color-light: #dfe4ed; $--border-color-lighter: #e6ebf5; @@ -22,7 +30,32 @@ $--table-border: 1px solid #dfe6ec; /* icon font path, required */ $--font-path: '~element-ui/lib/theme-chalk/fonts'; -@import '~element-ui/packages/theme-chalk/src/index'; +// 统一small字体大小为13px +$--button-small-font-size: 13px; + +// 默认字体颜色 +$--color-text-regular: rgba(0, 0, 0, 0.88); +$--color-text-secondary: #1a1a1a; +$--color-text-placeholder: #c0c4cc; + +/// borderRadius|1|Radius|0 +$--border-radius-base: 8px !default; +/// borderRadius|1|Radius|0 +$--border-radius-small: 6px !default; +/// borderRadius|1|Radius|0 +$--border-radius-circle: 100% !default; +/// borderRadius|1|Radius|0 +$--border-radius-zero: 0 !default; + +// Box-shadow +/// boxShadow|1|Shadow|1 +$--box-shadow-base: 0 0px 10px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.04) !default; +// boxShadow|1|Shadow|1 +$--box-shadow-dark: 0 0px 10px rgba(0, 0, 0, 0.12), 0 0 6px rgba(0, 0, 0, 0.12) !default; +/// boxShadow|1|Shadow|1 +$--box-shadow-light: 0 0px 12px 0 rgba(0, 0, 0, 0.1) !default; + +// @import '~element-ui/packages/theme-chalk/src/index'; // the :export directive is the magic sauce for webpack // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass diff --git a/server/src/styles/index.scss b/server/src/styles/index.scss index 8f9f761..19d0105 100644 --- a/server/src/styles/index.scss +++ b/server/src/styles/index.scss @@ -1,17 +1,18 @@ +@import './element-ui.scss'; @import './variables.scss'; @import './mixin.scss'; @import './transition.scss'; -@import './element-ui.scss'; @import './sidebar.scss'; @import './btn.scss'; body { + margin: 0; height: 100%; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; text-rendering: optimizeLegibility; - font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, - sans-serif; + font-family: system-ui, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, + Arial, sans-serif; } label { @@ -123,6 +124,10 @@ aside { //main-container全局样式 .app-container { + height: calc(100vh - 50px); + display: flex; + flex-direction: column; + overflow: auto; padding: 20px; } @@ -211,5 +216,5 @@ aside { .el-message-box__message p { word-wrap: break-word; - margin-bottom: .2em; + margin-bottom: 0.2em; } diff --git a/server/src/styles/sidebar.scss b/server/src/styles/sidebar.scss index 94760cc..0f769fc 100644 --- a/server/src/styles/sidebar.scss +++ b/server/src/styles/sidebar.scss @@ -1,13 +1,13 @@ #app { - .main-container { min-height: 100%; - transition: margin-left .28s; + transition: margin-left 0.28s; margin-left: $sideBarWidth; position: relative; } .sidebar-container { + border-right: 1px solid #f0f0f0; transition: width 0.28s; width: $sideBarWidth !important; background-color: $menuBg; @@ -39,7 +39,7 @@ &.has-logo { .el-scrollbar { - height: calc(100% - 50px); + height: calc(100% - 130px); } } @@ -71,33 +71,43 @@ // menu hover .submenu-title-noDropdown, .el-submenu__title { + margin: 5px 5px 0 5px; + height: 40px; + line-height: 40px; + border-radius: 6px; &:hover { background-color: $menuHover !important; } } - .is-active>.el-submenu__title { + .is-active > .el-submenu__title { color: $subMenuActiveText !important; + background-color: $subMenuHover !important; } - & .nest-menu .el-submenu>.el-submenu__title, + & .nest-menu .el-submenu > .el-submenu__title, & .el-submenu .el-menu-item { - min-width: $sideBarWidth !important; + min-width: $sideBarWidth - 10px !important; background-color: $subMenuBg !important; + height: 38px; + line-height: 38px; &:hover { background-color: $subMenuHover !important; } + &.is-active { + background-color: $subMenuHover !important; + } } } .hideSidebar { .sidebar-container { - width: 54px !important; + width: 66px !important; } .main-container { - margin-left: 54px; + margin-left: 66px; } .submenu-title-noDropdown { @@ -120,7 +130,9 @@ .el-submenu { overflow: hidden; - &>.el-submenu__title { + & > .el-submenu__title { + margin: 6px 6px 0 6px; + border-radius: 8px; padding: 0 !important; .svg-icon { @@ -139,8 +151,8 @@ .el-menu--collapse { .el-submenu { - &>.el-submenu__title { - &>span { + & > .el-submenu__title { + & > span { height: 0; width: 0; overflow: hidden; @@ -163,7 +175,7 @@ } .sidebar-container { - transition: transform .28s; + transition: transform 0.28s; width: $sideBarWidth !important; } @@ -177,7 +189,6 @@ } .withoutAnimation { - .main-container, .sidebar-container { transition: none; @@ -187,7 +198,7 @@ // when menu collapsed .el-menu--vertical { - &>.el-menu { + & > .el-menu { .svg-icon { margin-right: 16px; } @@ -197,7 +208,7 @@ } } - .nest-menu .el-submenu>.el-submenu__title, + .nest-menu .el-submenu > .el-submenu__title, .el-menu-item { &:hover { // you can use $subMenuHover @@ -206,7 +217,7 @@ } // the scroll bar appears when the subMenu is too long - >.el-menu--popup { + > .el-menu--popup { max-height: 100vh; overflow-y: auto; diff --git a/server/src/styles/variables.scss b/server/src/styles/variables.scss index a19c27c..8893f29 100644 --- a/server/src/styles/variables.scss +++ b/server/src/styles/variables.scss @@ -1,23 +1,23 @@ // base color -$blue:#324157; -$light-blue:#3A71A8; -$red:#C03639; -$pink: #E65D6E; -$green: #30B08F; -$tiffany: #4AB7BD; -$yellow:#FEC171; -$panGreen: #30B08F; +$blue: #324157; +$light-blue: #3a71a8; +$red: #c03639; +$pink: #e65d6e; +$green: #30b08f; +$tiffany: #4ab7bd; +$yellow: #fec171; +$panGreen: #30b08f; // sidebar -$menuText:#bfcbd9; -$menuActiveText:#409EFF; -$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951 +$menuText: #1b1b1b; +$menuActiveText: #1677ff; +$subMenuActiveText: #1677ff; // https://github.com/ElemeFE/element/issues/12951 -$menuBg:#304156; -$menuHover:#263445; +$menuBg: #ffffff; +$menuHover: #e6f4ff; -$subMenuBg:#1f2d3d; -$subMenuHover:#001528; +$subMenuBg: #ffffff; +$subMenuHover: #e6f4ff; $sideBarWidth: 210px; diff --git a/server/src/views/browser/group.vue b/server/src/views/browser/group.vue index 6ce8d32..7b2cbbf 100644 --- a/server/src/views/browser/group.vue +++ b/server/src/views/browser/group.vue @@ -1,34 +1,35 @@ - + - +