artin/miniPaint
1
0
Fork 0
mirror of https://github.com/viliusle/miniPaint.git synced 2026-02-06 15:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
vilius 2014-04-01 11:42:09 +03:00
parent 62417b5060
commit e8451b03ba
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/exif.js
View File

@ -322,7 +322,13 @@ var EXIF = (function() {
handleBinaryFile(new BinaryFile(e.target.result));
};
fileReader.readAsBinaryString(img);
try{
fileReader.readAsBinaryString(img);
}
catch(err){
console.log("exif.js error: "+err.message);
}
}
}

21
styles/styles.css
View File

@ -330,6 +330,7 @@ label{
.ddsmoothmenu{
position:fixed;
z-index:99999;
top:0;
left:0;
width:100%;
@ -374,14 +375,6 @@ label{
background: #E4EBF8;
color: #2D2D2D;
}
.ddsmoothmenu ul li ul{
position: absolute;
left: -3000px;
display: none;
visibility: hidden;
border:1px solid #5680C1;
border-top:0px;
}
.ddsmoothmenu .hide_ul{
position: absolute;
left: -3000px;
@ -390,8 +383,16 @@ label{
border:1px solid #5680C1;
border-top:0px;
}
.ddsmoothmenu ul li ul{
position: absolute;
left: -3000px;
display: none;
visibility: hidden;
border:1px solid #5680C1;
border-top:0px;
}
.ddsmoothmenu ul li ul li{
display: list-item;
display: list-item;
background: #ffffff;
float: none;
}
@ -403,7 +404,7 @@ label{
padding: 4px 5px 4px 5px;
margin: 0;
color: #2D2D2D;
}
}
* html .ddsmoothmenu{height: 1%;} /*Hack for IE7 and below*/
.downarrowclass{
position: absolute;