Jelajahi Sumber

'update_2020.12.16_18:42'

zhangyu 4 tahun lalu
induk
melakukan
c0d410144c

+ 91 - 0
src/assets/less/reset.less

@@ -1,3 +1,94 @@
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+hr,
+p,
+blockquote,
+dl,
+dt,
+dd,
+ul,
+ol,
+li,
+pre,
+form,
+fieldset,
+legend,
+button,
+input,
+textarea,
+th,
+td,
+div {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+}
+
+body,
+button,
+input,
+select,
+textarea {
+    // font: 12px/1.5 Arial, 'Microsoft YaHei', '\65b0\5b8b\4f53';
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-size: 100%;
+}
+
+address,
+cite,
+dfn,
+var,
+em,
+i,
+u {
+    font-style: normal;
+}
+
+ol,
+ul {
+    list-style: none;
+}
+
+a {
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+img {
+    border: none;
+    vertical-align: middle;
+}
+
+:focus {
+    outline: 0;
+}
+
+button,
+input,
+select,
+textarea {
+    font-size: 100%;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
 div {
     -moz-user-select: none; /*火狐*/
     -webkit-user-select: none; /*webkit浏览器*/

+ 21 - 4
src/components/editview/rightPropertyBar/BaseEquipment.vue

@@ -46,11 +46,13 @@
                         <el-input type="textarea" disabled v-model="EquipItem.formula" :rows="2" placeholder="请输入内容"> </el-input>
                     </div>
                 </div>
-                <div class="box-padding box-border-bottom">
+                <div class="box-padding box-border-bottom property">
                     <p class="box-title">字符</p>
                     <div class="base-property">
                         <div class="base-property-item">
-                            <el-color-picker show-alpha class="fix-box-1" v-model="color"></el-color-picker>
+                            <div class="cololorSelect">
+                                <el-color-picker show-alpha class="fix-box-1" v-model="color"></el-color-picker>
+                            </div>
                         </div>
                         <div class="base-property-item"></div>
                     </div>
@@ -100,8 +102,8 @@ export default {
             },
             set: function () {
                 this.EquipItem.color = new SColor(this.color);
-            }
-        }
+            },
+        },
     },
     methods: {
         // 设置宽
@@ -256,6 +258,21 @@ export default {
                 padding-right: 12px;
             }
         }
+        .cololorSelect {
+            width: 32px;
+            height: 20px;
+            overflow: hidden;
+            position: relative;
+            margin: 4px 0;
+            .fix-box-1 {
+                margin-top: -8px;
+                margin-left: -8px;
+                /deep/ .el-color-picker__trigger {
+                    width: 200px;
+                    height: 200px;
+                }
+            }
+        }
     }
 }
 </style>