index.html.conflict (8379B)
1 <!DOCTYPE html> 2 <html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB" xml:lang="en-GB"> 3 <head> 4 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> 5 <title>Suzanne Soy’s page</title> 6 <script src="target-within-shim.js"></script> 7 <link rel="stylesheet" href="test.css"> 8 <link rel="stylesheet" href="3d.css"> 9 </head> 10 <body> 11 <<<<<<< Updated upstream 12 <h1>Suzanne Soy</h1> 13 <div id="temp-other-content" style="position: relative; z-index: 1;"> 14 ======= 15 <div id="temp-other-content" style="position: relative; z-index: 1;"> 16 <h1>Suzanne Soy</h1> 17 >>>>>>> Stashed changes 18 <h2>Procedural Designer</h2> 19 <p>Latest version of my <a href="phc-thesis/">Ph.D draft</a></p> 20 <p><a href="git-tutorial/">GIT tutorial</a></p> 21 </div> 22 <div class="css3d" style="display: none;"> 23 <div id="detector"></div> 24 <div tabindex="0" id="a"> 25 A 26 <div tabindex="0" id="a1"> 27 A1 28 <iframe srcdoc="<h1>title</h1>"></iframe> 29 </div> 30 <div tabindex="0" id="a2"> 31 A2 32 </div> 33 </div> 34 <div tabindex="0" id="b"> 35 B<a href="#a">goto a</a><a href="#b">goto b</a> 36 </div> 37 </div> 38 <<<<<<< Updated upstream 39 <div class="view3d"> 40 ======= 41 <!-- 42 <div class="view3d" style="display: none"> 43 >>>>>>> Stashed changes 44 <div class="scene" id="main"> 45 <a class="go" href="#main">→ Enter ←</a> 46 <div class="rest"></div> 47 <div tabindex="0" class="three-d room hover room-test"> 48 <div class="three-d object test" id="hello">Hello world 49 <a class="go" href="#hello">hello</a> 50 <div class="scene"> 51 <div class="rest"></div> 52 <div tabindex="0" class="three-d room hover room-test"> 53 <div class="three-d object test" id="turtles">It's turtles all the way down! 54 <a class="go" href="#turtles">turtles</a> 55 <div class="scene"> 56 <div class="rest"></div> 57 <div tabindex="0" class="three-d room hover room-test"> 58 <div class="three-d object test" id="table.js"> 59 <a class="go" href="#table.js">table editor</a> 60 <iframe 61 style="width:100%; height:90%;" 62 src="table.js"></iframe> 63 </div> 64 </div> 65 <div tabindex="0" class="three-d room hover room-test2"> 66 <div class="three-d object test2" id="css-only-virtual-world"> 67 <a class="go" href="#css-only-virtual-world">useful tip</a> 68 Don't use CSS to do this.</div> 69 </div> 70 <div class="three-d room"> 71 <div class="three-d wall wall-l"></div> 72 <div class="three-d wall wall-r"></div> 73 <div class="three-d wall wall-u"></div> 74 <div class="three-d wall wall-d"></div> 75 <div class="three-d wall wall-b"></div> 76 <div class="three-d wall wall-f"></div> 77 </div> 78 </div> 79 </div> 80 </div> 81 <div tabindex="0" class="three-d room hover room-test2"> 82 <div class="three-d object test2" id="nested-rooms"> 83 <a class="go" href="#nested-rooms">nested-rooms</a> 84 Nested rooms! 85 </div> 86 </div> 87 <div class="three-d room"> 88 <div class="three-d wall wall-l"></div> 89 <div class="three-d wall wall-r"></div> 90 <div class="three-d wall wall-u"></div> 91 <div class="three-d wall wall-d"></div> 92 <div class="three-d wall wall-b"></div> 93 <div class="three-d wall wall-f"></div> 94 </div> 95 </div> 96 </div> 97 </div> 98 <div tabindex="0" class="three-d room hover room-test2"> 99 <div class="three-d object test2" id="mental-palace">Mental palace 100 <a class="go" href="#mental-palace">mental-palace</a> 101 <div class="scene"> 102 <div tabindex="0" class="three-d room hover room-test"> 103 <div class="three-d object test" id="mental-palace-2001"> 104 <a class="go" href="#mental-palace-2001"></a> 105 Oh my… 106 </div> 107 </div> 108 <div tabindex="0" class="three-d room hover room-test2"> 109 <div class="three-d object test2" id="mental-palace-stars"> 110 <a class="go" href="#mental-palace-stars"></a> 111 It's full of <div>s 112 </div> 113 </div> 114 <div class="three-d room"> 115 <div class="three-d wall wall-l"></div> 116 <div class="three-d wall wall-r"></div> 117 <div class="three-d wall wall-u"></div> 118 <div class="three-d wall wall-d"></div> 119 <div class="three-d wall wall-b"></div> 120 <div class="three-d wall wall-f"></div> 121 </div> 122 </div> 123 </div> 124 </div> 125 <div class="three-d room"> 126 <div class="three-d wall wall-l"></div> 127 <div class="three-d wall wall-r"></div> 128 <div class="three-d wall wall-u"></div> 129 <div class="three-d wall wall-d"></div> 130 <div class="three-d wall wall-b"></div> 131 <div class="three-d wall wall-f"></div> 132 </div> 133 </div> 134 </div>--> 135 <div id="debug"> 136 <section class="new-scene" id="main"> 137 <aside><a href="#main">→ Enter ←</a></aside> 138 <section id="hello" tabindex="0"> 139 <h1>Hello world</h1> 140 <aside><a href="#hello">hello</a></aside> 141 <section id="turtles" tabindex="0"> 142 <aside><a href="#turtles">turtles</a></aside> 143 <p>It's turtles all the way down!</p> 144 <section id="table.js"> 145 <aside><a href="#table.js">table editor</a></aside> 146 <iframe style="width:100%; height:90%;" src="table.js">Table editor alt text</iframe> 147 </section> 148 <section id="css-only-virtual-world"> 149 <aside><a href="#css-only-virtual-world">useful tip</a></aside> 150 <p>Don't use CSS to do this.</p> 151 </section> 152 </section> 153 <section> 154 <aside><a href="#nested-rooms">nested-rooms</a></aside> 155 Nested rooms! 156 </section> 157 </section> 158 <section id="mental-palace"> 159 <h1>Mental palace</h1> 160 <aside><a href="#mental-palace">mental-palace</a></aside> 161 <!-- 162 <section id="mental-palace-2001"> 163 <aside><a href="#mental-palace-2001"></a></aside> 164 Oh my… 165 </section> 166 <section id="mental-palace-stars"> 167 <aside><a href="#mental-palace-stars"></a></aside> 168 It's full of <div>s 169 </section>--> 170 </section> 171 </section> 172 </div> 173 </body> 174 </html>