Merge branch 'origin/main' into nightly
Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys
Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API
This commit is contained in:
Vendored
+35
@@ -31,6 +31,13 @@ body {
|
||||
background-color: var(--semi-color-bg-0);
|
||||
}
|
||||
|
||||
/* 桌面端禁止 body 纵向滚动 - 防止 VChart tooltip 触发页面滚动条 */
|
||||
@media (min-width: 768px) {
|
||||
body {
|
||||
overflow-y: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
.app-layout {
|
||||
height: 100vh;
|
||||
height: 100dvh;
|
||||
@@ -469,6 +476,9 @@ html.dark .sbg-variant-green {
|
||||
.custom-footer {
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.custom-footer.na-cb6feafeb3990c78 {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* 卡片内容容器通用样式 */
|
||||
.card-content-container {
|
||||
@@ -989,3 +999,28 @@ html.dark .with-pastel-balls::before {
|
||||
.semi-datepicker-range-input {
|
||||
border-radius: 10px !important;
|
||||
}
|
||||
|
||||
@keyframes slideInLeft {
|
||||
from {
|
||||
transform: translateX(-100%);
|
||||
opacity: 0;
|
||||
}
|
||||
to {
|
||||
transform: translateX(0);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* Channel advanced settings side panel animations */
|
||||
@keyframes slideInRight {
|
||||
from {
|
||||
transform: translateX(100%);
|
||||
opacity: 0;
|
||||
}
|
||||
to {
|
||||
transform: translateX(0);
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.ec-dbcd0a3c01b55203 { forced-color-adjust: auto; }
|
||||
|
||||
Reference in New Issue
Block a user