Merge branch 'refs/heads/master' into dev

# Conflicts:
#	src/pages/article/BookList.vue
#	src/pages/article/components/VolumeSetting.vue
#	src/pages/word/DictDetail.vue
#	src/pages/word/DictList.vue
This commit is contained in:
Zyronon
2025-10-19 03:05:56 +08:00
19 changed files with 241 additions and 298 deletions

View File

@@ -214,34 +214,6 @@ a {
text-decoration: none;
}
.base-textarea {
flex: 1;
font-family: var(--font-family);
font-size: 1.1rem;
outline: none;
border: 1px solid transparent;
border-radius: .4rem;
padding: .5rem .6rem;
transition: all .3s;
min-height: 1.2rem;
width: 100%;
box-sizing: border-box;
background: var(--color-textarea-bg);
&:focus {
border: 1px solid var(--color-select-bg);
}
&[readonly] {
cursor: not-allowed;
opacity: .7;
}
}
.base-input {
@extend .base-textarea;
flex: none;
}
@supports selector(::-webkit-scrollbar) {
::-webkit-scrollbar {
@@ -348,7 +320,7 @@ a {
gap: .5rem;
color: var(--color-main-text);
span{
span {
flex-shrink: 0;
}
@@ -469,7 +441,7 @@ a {
}
}
#typing-listener{
#typing-listener {
position: fixed;
right: 0;
bottom: 0;