diff options
| author | christophd@sugarlabs.org <christophd@sugarlabs.org> | 2009-08-31 09:01:24 (GMT) |
|---|---|---|
| committer | christophd@sugarlabs.org <christophd@sugarlabs.org> | 2009-08-31 09:01:24 (GMT) |
| commit | 3a02347d72192c5703eec5f05b802065b9144256 (patch) | |
| tree | ff801f086fa34a100bfc4cb9601ecca2ad73d777 | |
| parent | e24737446f346eb289670318b89507531c86e9b4 (diff) | |
| parent | 94be8b6d0b68b198eea02be4179c213e52a7f3c9 (diff) | |
Merge branch 'master' of git://git.sugarlabs.org/karma/mainline
| -rwxr-xr-x | examples/adding_up_to_10/css/mytest.css | 10 | ||||
| -rwxr-xr-x | examples/adding_up_to_10/js/mytest.js | 13 | ||||
| -rwxr-xr-x | examples/adding_up_to_10/mytest.html | 4 | ||||
| -rw-r--r-- | experiments/ball.png | bin | 0 -> 6493 bytes | |||
| -rwxr-xr-x | experiments/banana.png | bin | 0 -> 5277 bytes | |||
| -rw-r--r-- | experiments/mytest1.html | 81 | ||||
| -rw-r--r-- | experiments/yellowBox300px.png | bin | 0 -> 10046 bytes |
7 files changed, 105 insertions, 3 deletions
diff --git a/examples/adding_up_to_10/css/mytest.css b/examples/adding_up_to_10/css/mytest.css index 09e3af1..2f27eaa 100755 --- a/examples/adding_up_to_10/css/mytest.css +++ b/examples/adding_up_to_10/css/mytest.css @@ -11,6 +11,7 @@ position:relative; width:80%; } #sidebar { +background-image: url(../assets/generic/images/sidebar.png); -moz-background-clip:border; -moz-background-inline-policy:continuous; -moz-background-origin:padding; @@ -169,4 +170,13 @@ float:left; position:absolute; top:20%; } + +#banana { +height:0px; +width:0px; +} +#ball { +height:0px; +width:0px; +}
\ No newline at end of file diff --git a/examples/adding_up_to_10/js/mytest.js b/examples/adding_up_to_10/js/mytest.js index fa3ed20..b8b602c 100755 --- a/examples/adding_up_to_10/js/mytest.js +++ b/examples/adding_up_to_10/js/mytest.js @@ -1,5 +1,14 @@ window.addEventListener('load', function() { - var mainTopCanvas = document.getElementById('mainTopCanvas'); + var actionTopLeftCanvas = document.getElementById('actionTopLeftCanvas'); + var atlCtx = actionTopLeftCanvas.getContext('2d'); + + var ballImg = document.getElementById('ball'); + atlCtx.drawImage(ballImg, 0, 0); + actionTopLeftCanvas.setAttribute('width', '45%'); + atlCtx.drawImage(ballImg, 2, 2, 30, 15); + + +/* var mainTopCanvas = document.getElementById('mainTopCanvas'); var mainBottomCanvas = document.getElementById('mainBottomCanvas'); var asideCanvas = document.getElementById('asideCanvas'); @@ -10,7 +19,7 @@ window.addEventListener('load', function() { var logo = new Image(); -/* logo.src = 'assets/generic/images/logo_w_name.png'; + logo.src = 'assets/generic/images/logo_w_name.png'; logo.onload = function () {}; tcCtx.drawImage(logo, 0, 0, 0, 0); diff --git a/examples/adding_up_to_10/mytest.html b/examples/adding_up_to_10/mytest.html index 17ad9d3..85ef470 100755 --- a/examples/adding_up_to_10/mytest.html +++ b/examples/adding_up_to_10/mytest.html @@ -5,7 +5,7 @@ <title>Karma - Adding Up to 10</title> <meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal" /> <link type="text/css" rel="stylesheet" href="css/mytest.css" /> - <!-- <script type="text/javascript" src="js/mytest.js"></script> --> + <script type="text/javascript" src="js/mytest.js"></script> @@ -52,6 +52,8 @@ <aside id="sidebar"> <section> <img id="timer" class="sidebarItem" src="assets/generic/images/scorebox.png" alt=""/> + <img id="banana" src="assets/generic/images/banana.png" alt=""/> + <img id="ball" src="assets/generic/images/ball.png" alt=""/> </section> <section> <img id="scorebox" class="sidebarItem" src="assets/generic/images/scorebox.png" alt=""/> diff --git a/experiments/ball.png b/experiments/ball.png Binary files differnew file mode 100644 index 0000000..522fb66 --- /dev/null +++ b/experiments/ball.png diff --git a/experiments/banana.png b/experiments/banana.png Binary files differnew file mode 100755 index 0000000..7600af1 --- /dev/null +++ b/experiments/banana.png diff --git a/experiments/mytest1.html b/experiments/mytest1.html new file mode 100644 index 0000000..51f2437 --- /dev/null +++ b/experiments/mytest1.html @@ -0,0 +1,81 @@ +<!DOCTYPE html> +<html lang="en"> +<head> +<title>testing dawing layouts</title> + +<script type="text/javascript"> + window.addEventListener('load', function() { + var leftCanvas = document.getElementById('leftCanvas'); + var rightCanvas = document.getElementById('rightCanvas'); + + var ltCtx = leftCanvas.getContext('2d'); + var rtCtx = rightCanvas.getContext('2d'); + + var ballImg = document.getElementById('ball'); + var bananaImg = document.getElementById('banana'); + + ltCtx.drawImage(ballImg, 0, 0, 77, 77); + ltCtx.drawImage(ballImg, 77, 100, 77, 77); + + + }, false); + +</script> + +<style type="text/css"> + +#main { + width: 900px; + height: 800px; +} + +.side { + float: left; + width: 450px; + height: 800px; + position: relative +} + + +.boxImg { + width: 300px; + height: 300px; + position: absolute; + top: 10%; +} + +.canvas { +// width: 300px; +// height: 300px; + position: absolute; + top: 10%; +} + +/*#image { + width: 0px; + height: 0px; +}*/ + +</style> + +</head> +<body> + <div id="main"> + <div class="side"> + <img id="leftBox" src="yellowBox300px.png" alt="" class="boxImg" /> + <canvas id="leftCanvas" class="canvas"></canvas> + </div> + + <div class="side"> + <img id="rightBox" src="yellowBox300px.png" alt="" class="boxImg" /> + <canvas id="rightCanvas" class="canvas"></canvas> + </div> + + <img id="ball" src="ball.png" alt="" class="image" /> + <img id="banana" src="banana.png" alt="" class="image" /> + + </div> + + +</body> +</html>
\ No newline at end of file diff --git a/experiments/yellowBox300px.png b/experiments/yellowBox300px.png Binary files differnew file mode 100644 index 0000000..9357e21 --- /dev/null +++ b/experiments/yellowBox300px.png |
