From 2e56105da84145350e9b6fe2925cee63d55283f6 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期六, 09 十月 2021 10:40:36 +0800
Subject: [PATCH] zzjv2
---
src/pages/settings/views/generalSettings.vue | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/src/pages/settings/views/generalSettings.vue b/src/pages/settings/views/generalSettings.vue
index fa4e6d4..026e3c5 100644
--- a/src/pages/settings/views/generalSettings.vue
+++ b/src/pages/settings/views/generalSettings.vue
@@ -139,7 +139,7 @@
</div>
<div class="bar-group">
<div
- class="bar"
+ class="general-bar"
v-for="(item, i) in soundList"
:key="i"
@click="clickSound(item, i)"
@@ -148,7 +148,7 @@
<div class="left-part">
<span class="name">{{ item.name }}</span>
</div>
- <div class="btns">
+ <div class="sound-btns">
<span @click="togglePlay(item, i)">
<span
class="iconfont"
@@ -665,6 +665,7 @@
}
.bar-group {
overflow: auto;
+<<<<<<< HEAD
height: 400px;
}
.bar {
@@ -684,10 +685,30 @@
}
.btns {
width: 52px;
+=======
+ height: 520px;
+ .general-bar {
+ height: 48px;
+ background-color: #f8f8f8;
+ border-radius: 10px;
+ line-height: 48px;
+ box-sizing: border-box;
+ padding: 0 20px 0 20px;
+ font-weight: 700;
+>>>>>>> 0892efe5131551631fe287cfda29e59e4f2f6707
display: flex;
justify-content: space-between;
- color: rgba(191, 191, 191, 1);
- /* .el-icon-video-pause {
+ margin-bottom: 2px;
+ border: 2px solid #fff;
+ .name {
+ font-size: 14px;
+ }
+ .sound-btns {
+ width: 52px;
+ display: flex;
+ justify-content: space-between;
+ color: rgba(191, 191, 191, 1);
+ /* .el-icon-video-pause {
cursor: pointer;
font-size: 23px;
vertical-align: middle;
@@ -699,18 +720,20 @@
vertical-align: middle;
color: #409eff;
} */
- span {
- color: #333;
+ span {
+ color: #333;
+ }
+ .del:hover {
+ color: #fc4958;
+ }
}
- .del:hover {
- color: #fc4958;
+ .desc {
+ font-size: 14px;
+ color: rgba(134, 134, 134, 1);
}
- }
- .desc {
- font-size: 14px;
- color: rgba(134, 134, 134, 1);
}
}
+
/* .bar:hover {
border: 2px solid #4E94FF !important;
} */
--
Gitblit v1.8.0