From 19ac0950dff0d7c2cd2fc4ae7e7a1d9ebb81e79f Mon Sep 17 00:00:00 2001 From: zyronon Date: Wed, 6 Dec 2023 02:14:59 +0800 Subject: [PATCH] save --- src/Mobile.vue | 2 +- src/assets/css/style.scss | 17 ++++------------- src/assets/css/variable.scss | 16 ---------------- src/components/DictListPanel.vue | 1 + src/components/Input.vue | 2 +- src/components/Ring.vue | 1 + src/components/dialog/ArticleContentDialog.vue | 2 +- src/pages/dict/components/ArticleDictDetail.vue | 2 +- src/pages/practice/Statistics.vue | 5 +++++ src/pages/practice/practice-word/Typing.vue | 4 ++-- src/pages/practice/practice-word/TypingWord.vue | 2 +- 11 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/Mobile.vue b/src/Mobile.vue index 1b438c68..6a91fa84 100644 --- a/src/Mobile.vue +++ b/src/Mobile.vue @@ -449,7 +449,7 @@ html, body { .mobile { width: 100vw; height: 100vh; - background: $dark-main-bg; + background: var(--color-background); overflow: hidden; canvas { diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index 9cabd80c..78639a72 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -135,13 +135,6 @@ html.dark { transition: background var(--anim-time), color var(--anim-time), border var(--anim-time); } -.word-font-family { - font-family: var(--word-font-family); - //font-family: source-serif-pro, Georgia, Cambria, "Times New Roman", Times, serif; //medium - //font-family: Optimistic Text,-apple-system,ui-sans-serif,system-ui,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji; // react - //font-family: Google Sans Text,Noto Sans,Noto Sans JP,Noto Sans KR,Noto Naskh Arabic,Noto Sans Thai,Noto Sans Hebrew,Noto Sans Bengali,sans-serif; //android-dev - line-height: 30rem; -} html, body { font-size: 1px; @@ -150,30 +143,27 @@ html, body { width: 100vw; height: 100vh; overflow: hidden; - color: $font-color; + color: rgb(187, 187, 187); //color: var(--color-font-1); //font-family: var(--font-family); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } -.en-word { - font-family: var(--word-font-family); -} - #app { width: 100%; height: 100%; } a { + $main: rgb(64,158,255); color: $main; text-decoration: none; } .base-textarea { flex: 1; - font-family: $font-family; + font-family: var(--font-family); font-size: 18rem; outline: none; border: 1px solid transparent; @@ -220,6 +210,7 @@ a { } footer { + $footer-height: 60rem; box-sizing: content-box; height: $footer-height; display: flex; diff --git a/src/assets/css/variable.scss b/src/assets/css/variable.scss index 54fdb90d..e69de29b 100644 --- a/src/assets/css/variable.scss +++ b/src/assets/css/variable.scss @@ -1,16 +0,0 @@ -//$dark-main-bg: rgb(46, 46, 46); -$dark-main-bg: rgba(0, 5, 24, 1); -$dark-second-bg: rgb(60, 63, 65); - -$font-color: rgb(187, 187, 187); - -$main: rgb(64,158,255); -//$main: rgb(121,187,255); -//$second: rgb(75, 110, 175); -$second: rgb(59, 87, 138); -$item-hover: rgb(75, 75, 75); -$footer-height: 40rem; -$card-radius: 8rem; - -$font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif; -$word-font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace; \ No newline at end of file diff --git a/src/components/DictListPanel.vue b/src/components/DictListPanel.vue index c223124b..b4887402 100644 --- a/src/components/DictListPanel.vue +++ b/src/components/DictListPanel.vue @@ -143,6 +143,7 @@ const groupedByCategoryAndTag = $computed(() => { gap: 6rem; &.active { + $main: rgb(64,158,255); border-bottom: 2px solid $main; } diff --git a/src/components/Input.vue b/src/components/Input.vue index 77b1cc14..89943efb 100644 --- a/src/components/Input.vue +++ b/src/components/Input.vue @@ -67,7 +67,7 @@ useDisableEventListener(() => focus) } input { - font-family: $font-family; + font-family: var(--font-family); font-size: 18rem; outline: none; min-height: 20rem; diff --git a/src/components/Ring.vue b/src/components/Ring.vue index ea978bce..dd8fd81d 100644 --- a/src/components/Ring.vue +++ b/src/components/Ring.vue @@ -64,6 +64,7 @@ $w2: calc($w / 2); position: absolute; .circle-full { + $item-hover: rgb(75, 75, 75); stroke: $item-hover; } diff --git a/src/components/dialog/ArticleContentDialog.vue b/src/components/dialog/ArticleContentDialog.vue index 3e5b90c2..3860f384 100644 --- a/src/components/dialog/ArticleContentDialog.vue +++ b/src/components/dialog/ArticleContentDialog.vue @@ -34,7 +34,7 @@ onUnmounted(() => { :header="false" v-model="show">
-
+
{{ article.title }}
diff --git a/src/pages/dict/components/ArticleDictDetail.vue b/src/pages/dict/components/ArticleDictDetail.vue index 61323e7d..8adc0106 100644 --- a/src/pages/dict/components/ArticleDictDetail.vue +++ b/src/pages/dict/components/ArticleDictDetail.vue @@ -359,7 +359,7 @@ defineExpose({getDictDetail, add, editDict})
-
+
{{ article.title }}
{