fine-tune the new UI theme, merge the code and fixed conflicts

This commit is contained in:
RockYang
2024-12-24 16:13:36 +08:00
26 changed files with 141 additions and 139 deletions

View File

@@ -113,9 +113,9 @@
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
word-break: break-all;
height 34px
height 50px
font-size: .875rem;
color var(--el-text-color-primary)
color var(--text-fb)
}
}

View File

@@ -131,7 +131,7 @@
min-width: 0;
flex: 1;
background-color: var(--el-bg-color)
color var(--el-text-color-primary)
color var(--text-fb)
.chat-config {
height 50px

View File

@@ -27,9 +27,10 @@
--a-link-color: #6e8eff
--shadow-color:rgba(223,71,255,0.6)
--sm-btn-bg:#6052ed;
--theme-text-tertiary: #595959;
--theme-btn-fill-tertiary: #f0ebff;
--theme-text-btn-tertiary: #6841ea;
--theme-text-tertiary: #595959;
--theme-btn-fill-tertiary: #f0ebff;
--theme-text-btn-tertiary: #6841ea;
// #e7e7e8
@@ -133,11 +134,19 @@
}
}
.sm-btn-theme{
background-color: var(--theme-btn-fill-tertiary) !important;
color: var(--theme-text-btn-tertiary) !important;
border: none;
}
background-color: var(--theme-btn-fill-tertiary) !important;
color: var(--theme-text-btn-tertiary) !important;
border: none;
}
.el-tag, .el-tag.el-tag--primary{
.el-tag, .el-tag.el-tag--primary{
--el-tag-bg-color:#f0ebff
}
}
.box-card{
padding: 20px;
background-color: var(--chat-bg);
border-radius: 8px;
}
.el-table th.el-table__cell {
background-color: var(--chat-bg)
}

View File

@@ -25,8 +25,8 @@
color:var(--text-theme-color)
}
img{
width 30px
height: 30px
width 40px
height: 40px
object-fit: cover
border-radius: 50%
padding: 4px
@@ -44,6 +44,10 @@
align-items center
flex-direction column
.iconfont {
font-size 22px
}
.icon-expand {
font-size 24px
margin-bottom 10px
@@ -57,6 +61,7 @@
cursor pointer
color var(--text-color)
}
}
.menu-list-collapse{
.flex-center-col{
@@ -66,6 +71,10 @@
height: 38px;
line-height: 38px;
.iconfont {
font-size 16px
}
}
.menu-list-item:hover,

View File

@@ -3,9 +3,9 @@
overflow hidden
color var(--text-color)
display flex
justify-content center
align-items baseline
align-items center
background: var(--theme-bg) !important
flex-flow column
height: 100vh
@@ -33,22 +33,25 @@
}
.menu-box {
position absolute
top 0
width 100%
display flex
height 80px
align-items center
.el-menu {
padding 0 30px
width 100%
display flex
justify-content space-between
align-items center
background none
border none
.menu-item {
display flex
padding 20px 0
// padding 20px 0
height 40px
align-items center
color var(--text-color);
.iconfont{

View File

@@ -224,7 +224,7 @@
text-overflow ellipsis
}
.prompt {
color var( --el-text-color-primary)
color var( --text-fb)
cursor: text
}
.failed {

View File

@@ -130,10 +130,13 @@
position: absolute
bottom: 10px
right: 20px
display: flex;
.mm-toolbar {
line-height: 36px;
display flex
flex-flow row
margin-left: 10px;
.mm-toolbar-brand {
display none
@@ -141,7 +144,7 @@
.mm-toolbar-item {
cursor pointer
color var( --el-text-color-primary)
color var( --text-fb)
}
}

View File

@@ -136,10 +136,11 @@
.el-button {
margin 10px 5px 0 5px
padding 0
height 32px
filter: none;
.icon-alipay,.icon-wechat-pay {
color var(--text-theme-color)
color #ffffff
}
.icon-qq {
color #15A6E8

View File

@@ -65,7 +65,7 @@
label {
display flex
width 100px
color :var(--el-text-color-primary)
color :var(--text-fb)
}
.item-value {

View File

@@ -20,6 +20,7 @@
display flex
flex-flow row
justify-content: space-between;
align-items center
.upload-music {
.iconfont {
@@ -293,7 +294,7 @@
.tags {
font-size 14px
color var(--el-text-color-primary)
color var(--text-fb)
padding 3px 0
}
}

View File

@@ -20,32 +20,31 @@
}
--btnColor: linear-gradient(88deg, #af61f0 1.44%, #5b62ce);
--border-active:rgba(255, 255, 255, 0.1);
// --card-bg: rgba(17, 28, 68, 1);
// --card-bg: #1f243f;
--card-bg:#252d58;
--card-bg-table: rgba(17, 28, 68, 1);
--chat-bg:#1f243f
--chat-wel-bg:#2d2f388a;
--card-bg-table: rgba(17, 28, 68, 1);
--theme-bg:rgb(13, 20, 53);
--theme-bg-color: rgb(13, 20, 53);
--theme-bg-all:rgb(13, 20, 53);
--sign-bg: rgba(27, 37, 75, 1);
--text-theme-color: #fff;
--sign-bg: rgba(27, 37, 75, 1);
--text-theme-color: #fff;
--text-color-primary: #d1c7ff;
--el-text-color-regular: rgba(163, 174, 208, 1)
--el-border-color:rgb(79, 80, 85)
--el-text-color-primary: #fff;//
--el-bg-color-overlay: rgba(17, 28, 68, 1);
--el-border-color-light: rgba(255, 255, 255, 0.2);
--theme-text-color-secondary: #a3aed0;
--theme-text-color-primary: #fff;
--theme-text-primary: #f3f3f3;
--line-box:rgba(255, 255, 255, 0.1);
// --chat-bg:#141a36;
--chat-bg:#1f243f
--el-bg-color:#141a36;
--el-fill-color-blank: rgba(17, 28, 68, 1);
--el-fill-color-light: rgba(86, 86, 95, .2);
--el-color-primary-light-9:rgba(86, 86, 95, .2);
--chat-wel-bg:#2d2f388a;
--theme-text-color-secondary: #a3aed0;
// --el-pagination-button-bg-color: rgba(86,86,95,0.2);
--el-text-color-regular: rgba(163, 174, 208, 1)
--el-border-color:rgb(79, 80, 85);//
--el-bg-color-overlay: rgba(17, 28, 68, 1);
--el-border-color-light: rgba(255, 255, 255, 0.2);
--chat-content-bg:rgba(86, 86, 95, .2);
--chat-content-bg-list:rgba(86, 86, 95, .2);
--hover-deep-color:#30323c;
//layout
.more-menus li.moreTitle,
.twoTittle .title,
@@ -62,13 +61,6 @@
background: #0080006e;
}
--theme-text-color-primary: #fff;
--theme-text-primary: #f3f3f3;
--chat-content-bg:rgba(86, 86, 95, .2);
--chat-content-bg-list:rgba(86, 86, 95, .2);
--hover-deep-color:#30323c;
// --theme-text-tertiary: #e1e1e1;
//
--btn-bg: rgba(86, 86, 95, .5);

View File

@@ -3,51 +3,42 @@
@import 'font.styl'
:root[data-theme="light"] {
--text-fb:#000;
// rgba(43, 54, 116, 1)
--text-color: #5b62ce; //
--normal-color: rgba(43, 54, 116, 1); //
p, h1, h2, h3, h4, h5, h6, article {
// color: var(--text-color) !important;
font-family: $font-regular;
}
html,
body,
#app,
.wrapper {
// background: var(--theme-bg)
// background-color: var(--theme-bg)
// background: linear-gradient(88deg, #fff3f3 1.44%, #e7e8ff);
font-family: $font-regular;
}//#6b61f6
}
--btnColor: linear-gradient(88deg, #af61f0 1.44%, #5b62ce);
--border-active:rgba(134, 140, 255, 1);
--code-btnColor: linear-gradient(88deg, #af61f0 1.44%, #5b62ce);
--card-bg:#fff;
--chat-bg:#fff;
--theme-bg:linear-gradient(88deg, #fff3f3 1.44%, #e7e8ff);
--theme-bg-all:#f5f7fd;
--theme-bg-color: #f5f7fd;
--sign-bg: rgba(244, 247, 254, 1);
--text-theme-color: rgba(43, 54, 116, 1)
--text-theme-color: rgba(43, 54, 116, 1)
--text-color-primary: rgba(67, 24, 255, 1);
--line-box:rgba(79, 89, 102, 0.122);
--el-bg-color-overlay: #fff;
--el-bg-color:#fff;
--el-fill-color-blank: #fff;
--theme-text-color-primary: #000;
--theme-text-color-primary: #000;
--theme-text-primary: #000;
--theme-text-color-secondary: #666;
--chat-bg: #fff;
--chat-content-bg:#f5f7fc;
--chat-list-bg: #0302020a;
--chat-content-bg-list: #fff;
--chat-wel-bg: rgba(247, 247, 248, 1);
--el-pagination-button-bg-color: rgba(86, 86, 95, 0.2);
--hover-deep-color: #fff;
--chat-content-bg-list:#fff;
--chat-wel-bg:rgba(247, 247, 248, 1);
--hover-deep-color:#fff;
--el-bg-color-overlay: #fff;
--el-bg-color:#fff;
--el-fill-color-blank: #fff;
--el-pagination-button-bg-color: rgba(86,86,95,0.2);
//
--btn-bg: rgba(100, 100, 100, .1);