Merge branch 'master' of http://119.23.72.7/sunlong_v5/note-library

resources/views/web/design.blade.php

@@ -54,7 +54,7 @@
             </div> 
             <div class="fztip">每个辅助格子20px*20px,从左上角开始,横向为X轴,纵向为Y轴</div>
             <div class="fztip" style="color:red;">双击删除编辑区域内标签工具</div>
-            <div class="fztip" ><span style="color:red;">颜色选着器,复制此处颜色可用 </span><input type="text"  id="colorpicker" /></div>
+            <div class="fztip" ><span style="color:red;">颜色选择器,复制此处颜色可用 </span><input type="text"  id="colorpicker" /></div>
            
             <div class="edit-box fl">
                 <div class="edit-con init-border" ></div>