merged from dev

This commit is contained in:
MoyuScript
2011-09-12 21:35:37 +03:00
parent 9f924dfbab
commit f260da2c61
26 changed files with 2470 additions and 14360 deletions

View File

@ -6,9 +6,10 @@
<!DOCTYPE html>
<html>
<head>
<title>z-index tests #2</title>
<title>border tests</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link href="#" type="text/css" rel="stylesheet">
<script type="text/javascript" src="../external/flashcanvas/flashcanvas.js"></script>
<script type="text/javascript" src="../external/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="../build/html2canvas.js"></script>
<script type="text/javascript" src="../build/jquery.plugin.html2canvas.js"></script>
@ -34,7 +35,7 @@
#div1,#div3 {
height: 80px;
position: relative;
border: 1px dashed #669966;
border: 23px double #669966;
background-color: #ccffcc;
padding-left: 5px;
}
@ -43,10 +44,10 @@
opacity: 0.8;
position: absolute;
width: 150px;
height: 200px;
height: 201px;
top: 20px;
left: 170px;
border: 1px dashed #990000;
border: 20px dotted #990000;
background-color: #ffdddd;
text-align: center;
}
@ -58,14 +59,14 @@
height: 70px;
top: 65px;
left: 50px;
border: 1px dashed #000099;
border: 15px dashed #000099;
background-color: #ddddff;
text-align: left;
padding-left: 10px;
}
#div5{
border: 1px dashed #669966;
border: 15px dashed #669966;
background-color: #ccffcc;
padding-left: 5px;
position:relative;
@ -101,7 +102,7 @@
<br />
<div id="div3">
<div id="div3" style="background-image:url(image.jpg)">
<br /><span class="bold">DIV #3</span>
<br />position: relative;
<br />z-index: 1;