diff --git a/web-vue/packages/core/layouts/default/footer/index.vue b/web-vue/packages/core/layouts/default/footer/index.vue
index 81c90193..6191177c 100644
--- a/web-vue/packages/core/layouts/default/footer/index.vue
+++ b/web-vue/packages/core/layouts/default/footer/index.vue
@@ -1,13 +1,6 @@
@@ -15,10 +8,7 @@
import { computed, defineComponent, unref, ref } from 'vue';
import { Layout } from 'ant-design-vue';
import { Icon } from '@jeesite/core/components/Icon';
-
- import { DOC_URL, GITHUB_URL, SITE_URL } from '@jeesite/core/settings/siteSetting';
import { openWindow } from '@jeesite/core/utils';
-
import { useI18n } from '@jeesite/core/hooks/web/useI18n';
import { useRootSetting } from '@jeesite/core/hooks/setting/useRootSetting';
import { useRouter } from 'vue-router';
diff --git a/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue b/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue
index 6ea041ea..5d26ab53 100644
--- a/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue
+++ b/web-vue/packages/core/layouts/default/tabs/components/TabContent.vue
@@ -38,7 +38,7 @@
const getIcon = computed(() => {
const { tabItem: { meta } = {} } = props;
- return meta && t(meta.tabIcon as string);
+ return meta && t((meta.tabIcon as string) || (meta.icon as string));
});
const getTitle = computed(() => {
diff --git a/web-vue/packages/core/layouts/default/tabs/index.vue b/web-vue/packages/core/layouts/default/tabs/index.vue
index 9f6579d8..952b0443 100644
--- a/web-vue/packages/core/layouts/default/tabs/index.vue
+++ b/web-vue/packages/core/layouts/default/tabs/index.vue
@@ -17,7 +17,6 @@
-
diff --git a/web-vue/packages/core/layouts/default/tabs/index3.less b/web-vue/packages/core/layouts/default/tabs/index3.less
index 62563258..58e9dfb2 100644
--- a/web-vue/packages/core/layouts/default/tabs/index3.less
+++ b/web-vue/packages/core/layouts/default/tabs/index3.less
@@ -1,9 +1,9 @@
/**
- * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+ * Copyright (c) 2013-Now https://jeesite.com All rights reserved.
* No deletion without permission, or be held responsible to law.
* @author Vben、ThinkGem
*/
-@prefix-cls-3: ~'jeesite-multiple-tabs-3';
+@prefix-cls-3: ~'jeesite-multiple-tabs-3'; // Tabs style
@multiple-height-large: 40px; // TABS_HEIGHT_LARGE
.@{prefix-cls-3} {
@@ -29,7 +29,7 @@
color: @text-color-base;
background-color: @component-background;
transition: none;
- border-radius: 4px !important;
+ border-radius: 7px !important;
margin: 12px 0 0;
padding-left: 10px;
padding-right: 11px;
@@ -46,7 +46,7 @@
.anticon {
opacity: 0.8;
- font-size: 16px;
+ font-size: 13px;
text-align: center;
margin-right: 5px;
@@ -63,6 +63,8 @@
padding: 0;
.anticon {
+ font-size: 16px;
+
svg {
width: 0.6em;
}
@@ -76,33 +78,25 @@
.ant-tabs-tab:not(.ant-tabs-tab-active) {
&:hover {
- color: @primary-color;
+ .ant-tabs-tab-btn {
+ color: @primary-color;
+ }
}
}
.ant-tabs-tab-active {
position: relative;
- // padding-left: 18px;
- color: @white !important;
- // color: @primary-color !important;
background: fade(@primary-color, 90);
- // border-color: fade(@primary-color, 25);
- // height: calc(@multiple-height-large - 2px);
border: 0;
transition: none;
text-shadow: none;
- // span {
- // color: @white !important;
- // }
.ant-tabs-tab-btn {
color: @white !important;
text-shadow: none;
}
.ant-tabs-tab-remove {
- opacity: 1;
-
svg {
fill: @white;
}
@@ -158,13 +152,13 @@
&__extra-fold {
display: inline-block;
width: 30px;
- // height: @multiple-height-large;
- // line-height: @multiple-height-large;
+ //height: @multiple-height-large;
+ //line-height: @multiple-height-large;
padding-top: 7px;
color: @text-color-secondary;
text-align: center;
cursor: pointer;
- // border-left: 1px solid @header-light-bottom-border-color;
+ //border-left: 1px solid @header-light-bottom-border-color;
&:hover {
color: @text-color-base;
@@ -227,9 +221,10 @@ html[data-theme='dark'] {
svg {
fill: #aaa !important;
}
+ }
- &:hover,
- .ant-tabs-tab-btn:hover {
+ .ant-tabs-tab:not(.ant-tabs-tab-active) {
+ &:hover {
color: #ddd !important;
}
}