Skip to content

Commit c845d99

Browse files
author
piexlmax
committed
适配element 1.2.0 bate6 css
1 parent 9d50dcc commit c845d99

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"axios": "^0.19.2",
1515
"core-js": "^3.6.5",
1616
"echarts": "4.9.0",
17-
"element-plus": "1.2.0-beta.5",
17+
"element-plus": "1.2.0-beta.6",
1818
"highlight.js": "^10.6.0",
1919
"marked": "^2.0.0",
2020
"mitt": "^3.0.0",

web/src/style/element_visiable.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,6 @@
143143
}
144144
}
145145
}
146-
.el-pagination__jump {
147-
.el-pagination__editor {}
148-
}
149146
}
150147

151148
.el-button--mini {
@@ -188,4 +185,8 @@
188185
}
189186
}
190187
}
188+
}
189+
190+
.el-drawer__body{
191+
padding:0;
191192
}

web/src/view/dashboard/index.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99
<el-row>
1010
<el-col :span="8" :xs="24" :sm="8">
1111
<div class="flex-center">
12-
<el-icon class="icon">
12+
<el-icon class="dasboard-icon">
1313
<sort />
1414
</el-icon>
1515
今日流量 (1231231)
1616
</div>
1717
</el-col>
1818
<el-col :span="8" :xs="24" :sm="8">
1919
<div class="flex-center">
20-
<el-icon class="icon">
20+
<el-icon class="dasboard-icon">
2121
<avatar />
2222
</el-icon>
2323
总用户数 (24001)
2424
</div>
2525
</el-col>
2626
<el-col :span="8" :xs="24" :sm="8">
2727
<div class="flex-center">
28-
<el-icon class="icon">
28+
<el-icon class="dasboard-icon">
2929
<comment />
3030
</el-icon>
3131
好评率 (99%)
@@ -282,7 +282,7 @@ export default {
282282
padding: 14px;
283283
}
284284
}
285-
.icon {
285+
.dasboard-icon {
286286
font-size: 20px;
287287
color: rgb(85, 160, 248);
288288
width: 30px;
@@ -318,7 +318,7 @@ export default {
318318
line-height: 20px;
319319
}
320320
}
321-
.icon {
321+
.dasboard-icon {
322322
font-size: 18px;
323323
}
324324
}

web/src/view/superAdmin/menu/icon.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<template>
22
<div>
3-
<span class="icon" style="position: absolute; z-index: 9999; padding: 5px 10px; ">
3+
<span class="gva-icon" style="position: absolute; z-index: 9999; padding: 5px 10px; ">
44
<el-icon>
55
<component :is="metaData.icon" />
66
</el-icon>
77
</span>
88
<el-select v-model="metaData.icon" style="width:100%" clearable filterable class="gva-select" placeholder="请选择">
99
<el-option v-for="item in options" :key="item.key" :label="item.key" :value="item.key">
10-
<span class="icon" :class="item.label">
10+
<span class="gva-icon" :class="item.label">
1111
<el-icon>
1212
<component :is="item.label" />
1313
</el-icon>
@@ -1166,7 +1166,7 @@ export default {
11661166
</script>
11671167

11681168
<style lang="scss">
1169-
.icon {
1169+
.gva-icon {
11701170
float: left;
11711171
color: rgb(132, 146, 166);
11721172
font-size: 13px;

0 commit comments

Comments
 (0)