From 045f7e14bd2dc725bb089d1d96446a582cb582eb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 2 Aug 2022 16:34:15 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E5=8C=BA=E4=BF=AE=E6=94=B9=E6=8E=92=E5=88=97=E6=96=B9=E5=BC=8F?=
=?UTF-8?q?=E5=92=8C=E8=83=8C=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../canvas/components/Editor/CloseBar.vue | 2 +-
.../canvas/components/Editor/EditBar.vue | 18 +++++++++---------
.../canvas/components/Editor/EditBarView.vue | 2 +-
.../components/Editor/MobileCheckBar.vue | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/frontend/src/components/canvas/components/Editor/CloseBar.vue b/frontend/src/components/canvas/components/Editor/CloseBar.vue
index ab4ce0f1bd..497c7edd97 100644
--- a/frontend/src/components/canvas/components/Editor/CloseBar.vue
+++ b/frontend/src/components/canvas/components/Editor/CloseBar.vue
@@ -48,7 +48,7 @@ export default {
padding-left: 3px;
padding-right: 0px;
cursor:pointer!important;
- background-color: #0a7be0;
+ background-color: #3370ff;
}
.bar-main i{
color: white;
diff --git a/frontend/src/components/canvas/components/Editor/EditBar.vue b/frontend/src/components/canvas/components/Editor/EditBar.vue
index 84408c7dc2..747f8dd7fb 100644
--- a/frontend/src/components/canvas/components/Editor/EditBar.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBar.vue
@@ -12,11 +12,6 @@
<el-checkbox size="medium" @change="batchOptChange" />
</div>
<div v-if="normalAreaShow">
- <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;" @amRemoveItem="amRemoveItem" @linkJumpSet="linkJumpSet" @boardSet="boardSet">
- <span slot="icon" :title="$t('panel.setting')">
- <i class="icon iconfont icon-shezhi" style="margin-top:2px" />
- </span>
- </setting-menu>
<span :title="$t('panel.edit')">
<i v-if="activeModel==='edit'&&curComponent&&editFilter.includes(curComponent.type)" class="icon iconfont icon-edit" @click.stop="edit" />
</span>
@@ -26,12 +21,17 @@
<span :title="$t('panel.suspension')">
<i v-if="activeModel==='edit'&&!curComponent.auxiliaryMatrix" class="icon iconfont icon-xuanfuanniu" @click.stop="auxiliaryMatrixChange" />
</span>
- <span :title="$t('panel.details')">
- <i v-if="curComponent.type==='view'" class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
- </span>
<span :title="$t('panel.enlarge')">
<i v-if="curComponent.type==='view'" class="icon iconfont icon-fangda" @click.stop="showViewDetails('enlarge')" />
</span>
+ <span :title="$t('panel.details')">
+ <i v-if="curComponent.type==='view'" class="icon iconfont icon-chakan" @click.stop="showViewDetails('details')" />
+ </span>
+ <setting-menu v-if="activeModel==='edit'" style="float: right;height: 24px!important;" @amRemoveItem="amRemoveItem" @linkJumpSet="linkJumpSet" @boardSet="boardSet">
+ <span slot="icon" :title="$t('panel.setting')">
+ <i class="icon iconfont icon-shezhi" style="margin-top:2px" />
+ </span>
+ </setting-menu>
<span :title="$t('panel.cancel_linkage')">
<i v-if="curComponent.type==='view'&&existLinkage" class="icon iconfont icon-quxiaoliandong" @click.stop="clearLinkage" />
</span>
@@ -315,7 +315,7 @@ export default {
padding-left: 3px;
padding-right: 0px;
cursor:pointer!important;
- background-color: rgba(10,123,224, 1);
+ background-color: #3370ff;
}
.bar-main i{
color: white;
diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/Editor/EditBarView.vue
index 9253fa932e..b9526d9bde 100644
--- a/frontend/src/components/canvas/components/Editor/EditBarView.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue
@@ -149,7 +149,7 @@ export default {
padding-left: 3px!important;
padding-right: 0px!important;
cursor:pointer!important;
- background-color: #0a7be0;
+ background-color: #3370ff;
}
.bar-main i{
color: white;
diff --git a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
index 9dcb0779c2..974ed5a6d6 100644
--- a/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
+++ b/frontend/src/components/canvas/components/Editor/MobileCheckBar.vue
@@ -76,7 +76,7 @@ export default {
padding-right: 1px;
cursor:pointer!important;
text-align: center;
- background-color: #0a7be0;
+ background-color: #3370ff;
}
.bar-main i{
color: white;