disinclined.org / git / cellular-automaton.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 62b73ae)
2d!
authorDylan Lloyd <dylan@dylansserver.com>
Sun, 16 Dec 2012 14:34:19 +0000 (09:34 -0500)
committerDylan Lloyd <dylan@dylansserver.com>
Sun, 16 Dec 2012 14:34:19 +0000 (09:34 -0500)
index.php patch | blob | history
style.css patch | blob | history

diff --git a/index.php b/index.php
index 4df2fe2..e838f18 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,15 +3,16 @@
     <title>cellular automaton</title>
     <link type='text/css' rel='stylesheet' href='style.css'>
     <script type='text/javascript' src='jquery-core.js'></script>
-    <script type='text/javascript' src='1d.js'></script>
+    <script type='text/javascript' src='2d.js'></script>
   </head>
   <body>
     <div id='container'>
-      <canvas id='canvas'></canvas>
+      <canvas width='750px' height='750px' id='canvas'></canvas>
+    </div>
+    <div id='controls'>
+    <h1>2D</h1>
+    Generation: <span id='generation'>0</span>
     </div>
-    <ul id='controls'>
-         <li id='draw' class='tool'>1D</li>
-    </ul>
     <div id='markup'>test</div>
   </body>
 </html>
diff --git a/style.css b/style.css
index 1475fb1..668ed4e 100644 (file)
--- a/style.css
+++ b/style.css
@@ -2,9 +2,8 @@ canvas {
     position: absolute;
     top: 1px;
     left: 1px;
-    border:1px solid black;
     margin: 20px;
-    width: 750px;
+    border: 1px solid black;
     }
 #controls {
     float:right;
1D and 2D cellular automaton on a HTML canvas