diff --git a/src/components.d.ts b/src/components.d.ts index 3a9bd79..9215cd2 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -7,6 +7,7 @@ export {} declare module "vue" { export interface GlobalComponents { + IconModule: (typeof import("./components/IconModule/index.vue"))["default"]; RouterLink: (typeof import("vue-router"))["RouterLink"]; RouterView: (typeof import("vue-router"))["RouterView"]; SvgIcon: (typeof import("./components/SvgIcon/index.vue"))["default"]; diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 6cc0227..0653e19 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -1,7 +1,13 @@ - @@ -80,6 +97,10 @@ import Tom from "@/assets/img/tom.jpg"; display: flex; justify-content: space-around; align-items: center; + .menu_fold_icon { + color: $color-text-1; + border-radius: $radius-box; + } } .breadcrumb { margin-left: $margin; @@ -89,23 +110,23 @@ import Tom from "@/assets/img/tom.jpg"; display: flex; justify-content: space-between; align-items: center; - > div { - width: 32px; - height: 32px; - border-radius: 50%; + > .icon_btn { + width: $icon-box; + height: $icon-box; + border-radius: $radius-box; box-sizing: border-box; - // border: $border-1 solid $color-border-1; margin-left: $margin; display: flex; justify-content: space-around; align-items: center; + color: $color-text-1; } - > div:hover { - background: $color-fill-1; - } + .my_image { width: 32px; height: 32px; + border-radius: 50%; + margin-left: $margin; overflow: hidden; } } diff --git a/src/layout/components/Tabs/index.vue b/src/layout/components/Tabs/index.vue index 34ffbae..c6f46a8 100644 --- a/src/layout/components/Tabs/index.vue +++ b/src/layout/components/Tabs/index.vue @@ -1,13 +1,89 @@ - + diff --git a/src/style/global-hover.scss b/src/style/global-hover.scss new file mode 100644 index 0000000..3deb349 --- /dev/null +++ b/src/style/global-hover.scss @@ -0,0 +1,9 @@ +// global hover css +// 鼠标移入过渡 +.move-fill { + background: rgba($color-fill-1, 0); + transition: background 0.2s; +} +.move-fill:hover { + background: rgba($color-fill-1, 1); +} diff --git a/src/style/global-theme.scss b/src/style/global-theme.scss index 1fb3ef9..2c007d8 100644 --- a/src/style/global-theme.scss +++ b/src/style/global-theme.scss @@ -2,7 +2,9 @@ $margin: 14px; // 盒子间距 $padding: 16px; // 盒子和内容的间距 -$radius-box: 2px; // 边框圆角 +$radius-box: 4px; // 边框圆角 +$icon-box: 24px; // icon盒子通用大小 +$icon-size: 18px; // icon通用大小 // 边框宽度 $border-1: 1px; // 常规-主要 @@ -24,7 +26,7 @@ $shadow-border-5: inset 0 0 0 1px violet; $shadow-border-6: inset 0 0 0 1px green; // 填充色 -$color-fill-1: #eeeeee; // 常规填充色/白底悬浮 +$color-fill-1: #eeeeee; // 常规填充色/灰底悬浮 $color-fill-2: #d1d1d1; // 深/灰底悬浮 $color-fill-3: #b6b6b6; // 重/特殊场景 $color-fill-4: #9b9b9b; // 浅/禁用 diff --git a/src/style/index.scss b/src/style/index.scss index 9ab8656..1d65ae3 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -1,4 +1,5 @@ @import "./global-theme.scss"; +@import "./global-hover.scss"; * { margin: 0;