Merge pull request #20 from i2Echo/master

fix font & selectbox bug
This commit is contained in:
Zhang Chen 2017-12-24 14:09:54 +08:00 committed by GitHub
commit e355832eac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,7 +5,7 @@
<style> <style>
html,body,div,img{margin:0;padding:0;} html,body,div,img{margin:0;padding:0;}
body{ body{
font-family: -apple-system,"Helvetica Neue",Helvetica,Arial,"PingFang SC","Hiragino Sans GB","WenQuanYi Micro Hei","Microsoft Yahei",sans-serif; font-family: Roboto,"Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;;
background-color: #F5F5F5; background-color: #F5F5F5;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
@ -44,10 +44,13 @@
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
margin-left: 22px; margin-left: 22px;
margin-top: 21px; margin-top: 23px;
line-height: 20px; line-height: 20px;
font-size: 13.3333px; font-size: 12.3px;
font-family: monospace; font-family: 'Lucida Console', Monaco, monospace;
white-space: pre;
border: 1px solid #ddd;
border-radius: 2px;
} }
#editTip{ #editTip{
position: absolute; position: absolute;
@ -208,6 +211,7 @@
table, td { table, td {
border: 1px solid #fff; border: 1px solid #fff;
color: #fff; color: #fff;
cursor:crosshair;
} }
table.col{ table.col{
position: relative; position: relative;
@ -253,7 +257,7 @@
border-collapse: collapse; border-collapse: collapse;
} }
table.row td{ table.row td{
background-color: #A1887F; background-color: #4C221B;
} }
#arrRowMark{ #arrRowMark{
top: 5px; top: 5px;
@ -278,7 +282,7 @@
height: 32px; height: 32px;
width: 416px; width: 416px;
z-index: 100; z-index: 100;
background-color: rgba(121,85,72,.5); background-color: rgba(76,34,27,.5);
} }
/* for vue dom */ /* for vue dom */
[v-cloak] { [v-cloak] {
@ -437,7 +441,7 @@
<script type="text/javascript"> <script type="text/javascript">
//预处理草的源图片 //预处理草的源图片
importGrass=function(){ importGrass=function(){
autotile = new Image(); autotile = new Image();
autotile.src = "images/autotile.png" autotile.src = "images/autotile.png"
@ -608,8 +612,7 @@
} }
} }
} }
}
}
</script> </script>
<script> <script>
@ -909,10 +912,10 @@
document.body.onmousedown = function(e){ document.body.onmousedown = function(e){
selectBox.isSelected = false; selectBox.isSelected = false;
info = {}; info = {};
canSelectAg = false;
} }
iconLib.onmousedown = function(e){
e.stopPropagation();
}
var exportM = new Vue({ var exportM = new Vue({
el: '#exportM', el: '#exportM',