diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index baa3f068..e3b096a7 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -365,8 +365,9 @@ footer { transition: all .3s; } - .volume, .collect, .easy { + svg { opacity: 0; + color: var(--color-icon-hightlight); } &.active { @@ -376,15 +377,21 @@ footer { color: var(--color-sub-text); } - .volume, .collect, .easy, .fill { + svg { color: var(--color-icon-hightlight); } } + .fill { + svg { + opacity: 1 !important; + } + } + &:hover { @extend .active; - .volume, .collect, .easy { + svg { opacity: 1; } } diff --git a/src/components/BaseIcon.vue b/src/components/BaseIcon.vue index 592294a0..6a562957 100644 --- a/src/components/BaseIcon.vue +++ b/src/components/BaseIcon.vue @@ -8,6 +8,7 @@ defineProps<{ title?: string, icon: string, disabled?: boolean, + noBg?: boolean, }>() const emit = defineEmits(['click']) @@ -20,7 +21,7 @@ const emit = defineEmits(['click']) v-bind="$attrs" @click="e => (!disabled) && emit('click',e)" class="icon-wrapper" - :class="{disabled}" + :class="{disabled,noBg}" > @@ -42,9 +43,12 @@ $w: 1.4rem; background: transparent; transition: all .3s; - &:hover:not(.disabled) { + &:hover:not(.disabled,.noBg) { background: var(--color-icon-hightlight); - color: white; + + svg { + color: white; + } } &.disabled { diff --git a/src/components/icon/VolumeIcon.vue b/src/components/icon/VolumeIcon.vue index 3ca135b7..d109ea4c 100644 --- a/src/components/icon/VolumeIcon.vue +++ b/src/components/icon/VolumeIcon.vue @@ -1,10 +1,5 @@ \ No newline at end of file + diff --git a/src/pages/pc/Setting.vue b/src/pages/pc/Setting.vue index f276bc44..6c51df00 100644 --- a/src/pages/pc/Setting.vue +++ b/src/pages/pc/Setting.vue @@ -375,7 +375,7 @@ function importData(e) {
- +
diff --git a/src/pages/pc/article/practice-article/index.vue b/src/pages/pc/article/practice-article/index.vue index e2163902..de3593e8 100644 --- a/src/pages/pc/article/practice-article/index.vue +++ b/src/pages/pc/article/practice-article/index.vue @@ -17,7 +17,6 @@ import BaseIcon from "@/components/BaseIcon.vue"; import {useArticleOptions} from "@/hooks/dict.ts"; import ArticleList from "@/pages/pc/components/list/ArticleList.vue"; import {useOnKeyboardEventListener} from "@/hooks/event.ts"; -import TranslateSetting from "@/pages/pc/components/toolbar/TranslateSetting.vue"; import {genArticleSectionData, usePlaySentenceAudio} from "@/hooks/article.ts"; import {ElProgress} from 'element-plus'; @@ -296,13 +295,11 @@ const {playSentenceAudio} = usePlaySentenceAudio()
{{ store.currentBook.name }}
- - - - - + v-if="store.currentBook.lastLearnIndex < articleData.articles.length - 1" + @click="emitter.emit(EventKey.continueStudy)" + icon="octicon:arrow-right-24"/>
{{ articleData.articles.length }}篇文章 @@ -373,7 +370,7 @@ const {playSentenceAudio} = usePlaySentenceAudio()
-
+
- - - - - - + :icon="['majesticons:eye-off-line','mdi:eye-outline'][settingStore.dictation?0:1]"/> - +
+ :stroke-width="8" + :show-text="false"/>
diff --git a/src/pages/pc/components/BasePage.vue b/src/pages/pc/components/BasePage.vue index caf80e03..0c7f0acd 100644 --- a/src/pages/pc/components/BasePage.vue +++ b/src/pages/pc/components/BasePage.vue @@ -11,7 +11,7 @@ diff --git a/src/pages/pc/components/Logo.vue b/src/pages/pc/components/Logo.vue index 82d8a17a..e47e6f4f 100644 --- a/src/pages/pc/components/Logo.vue +++ b/src/pages/pc/components/Logo.vue @@ -3,7 +3,8 @@ import {useSettingStore} from "@/stores/setting.ts"; import router from "@/router.ts"; const settingStore = useSettingStore() -function goHome(){ + +function goHome() { router.push('/') } @@ -27,4 +28,4 @@ function goHome(){ height: 2rem; } } - \ No newline at end of file + diff --git a/src/pages/pc/components/list/ArticleList.vue b/src/pages/pc/components/list/ArticleList.vue index 045080d0..bc73ab60 100644 --- a/src/pages/pc/components/list/ArticleList.vue +++ b/src/pages/pc/components/list/ArticleList.vue @@ -59,7 +59,7 @@ defineExpose({scrollToBottom, scrollToItem})