fix: issues caused by PR(vrcx-team#1034). (vrcx-team#1033)

Natsumi-sama · Dec 27, 2024 · 53e82b4 · 53e82b4
1 parent a5af18b
commit 53e82b4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/html/src/app.scss b/html/src/app.scss
@@ -784,7 +784,7 @@ i.x-status-icon.red {
     border-color: #67c23a !important;
 }
 
-.el-button--danger {
+.x-dialog .el-button--danger {
     background-color: #f56c6c !important;
     border-color: #f56c6c !important;
 }

diff --git a/html/src/mixins/tabs/profile.pug b/html/src/mixins/tabs/profile.pug
@@ -22,7 +22,7 @@ mixin profileTab()
                         span.name {{ $t('view.profile.profile.v_bucks') }}
                         span.extra {{ API.currentUser.$vbucks ?? $t('view.profile.profile.refresh') }}
             div(style="margin-top:10px")
-                el-button(size="small" type="danger" plain icon="el-icon-switch-button" @click="logout()" style="margin-left:0;margin-right:5px;margin-top:10px;background:#fef0f0 !important;border-color:#fbc4c4 !important;") {{ $t('view.profile.profile.logout') }}
+                el-button(size="small" type="danger" plain icon="el-icon-switch-button" @click="logout()" style="margin-left:0;margin-right:5px;margin-top:10px;") {{ $t('view.profile.profile.logout') }}
                 el-button(size="small" icon="el-icon-picture-outline" @click="showGalleryDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.manage_gallery_icon') }}
                 el-button(size="small" icon="el-icon-printer" @click="showExportFriendsListDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.export_friend_list') }}
                 el-button(size="small" icon="el-icon-user" @click="showExportAvatarsListDialog()" style="margin-left:0;margin-right:5px;margin-top:10px") {{ $t('view.profile.profile.export_own_avatars') }}

diff --git a/html/src/theme.dark.scss b/html/src/theme.dark.scss
@@ -44,10 +44,14 @@ button {
 .el-textarea .el-input__count,
 .el-input .el-input__count .el-input__count-inner {
     color: #fff;
-    background-color: #333;
+    background-color: #444;
     border: #333;
 }
 
+.x-friend-item .el-textarea .el-input__count {
+    background-color: #333;
+}
+
 // User dialog memo: input count background color
 .x-friend-item:hover .el-input__count {
     background: #3e3e3e;

diff --git a/html/src/theme.material3.scss b/html/src/theme.material3.scss
@@ -212,7 +212,7 @@ div[style*='margin: 0px 0px 10px;'] {
     flex: 1;
 }
 
-.options-container-item *:not(.el-color-picker__color-inner):last-child {
+.options-container-item > :not(.el-color-picker__color-inner):last-child {
     margin-right: 4px;
 }
 
@@ -988,7 +988,7 @@ input[type='number'],
 }
 .el-button:not(.el-button--text, .el-button--primary)
     > i:first-child:last-child {
-    padding: 0 11px;
+    padding: 5px 10px;
 }
 .el-button:not(.el-button--text, .el-button--primary) > i:first-child {
     padding-left: 16px;
@@ -2002,3 +2002,15 @@ i.x-user-status {
     background-color: transparent;
     border: transparent;
 }
+
+.simple-switch {
+    font-size: 12px;
+    margin-top: 5px;
+    display: flex;
+    justify-content: space-between;
+    width: 100%;
+}
+
+.el-dialog__body .el-tag--mini {
+    line-height: 28px;
+}