Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/components/EditPanel.vue

@@ -1111,6 +1111,7 @@
 
 </script>
 <style>
+  
   .fontSelect:nth-child(1) span {
     color: #000;
   }