SuzanneSoy.github.io/index.html.conflict

175 lines
8.2 KiB
Plaintext
Raw Permalink Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-GB" xml:lang="en-GB">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Suzanne Soys page</title>
<script src="target-within-shim.js"></script>
<link rel="stylesheet" href="test.css">
<link rel="stylesheet" href="3d.css">
</head>
<body>
<<<<<<< Updated upstream
<h1>Suzanne Soy</h1>
<div id="temp-other-content" style="position: relative; z-index: 1;">
=======
<div id="temp-other-content" style="position: relative; z-index: 1;">
<h1>Suzanne Soy</h1>
>>>>>>> Stashed changes
<h2>Procedural Designer</h2>
<p>Latest version of my <a href="phc-thesis/">Ph.D draft</a></p>
<p><a href="git-tutorial/">GIT tutorial</a></p>
</div>
<div class="css3d" style="display: none;">
<div id="detector"></div>
<div tabindex="0" id="a">
A
<div tabindex="0" id="a1">
A1
<iframe srcdoc="<h1>title</h1>"></iframe>
</div>
<div tabindex="0" id="a2">
A2
</div>
</div>
<div tabindex="0" id="b">
B<a href="#a">goto a</a><a href="#b">goto b</a>
</div>
</div>
<<<<<<< Updated upstream
<div class="view3d">
=======
<!--
<div class="view3d" style="display: none">
>>>>>>> Stashed changes
<div class="scene" id="main">
<a class="go" href="#main">→ Enter ←</a>
<div class="rest"></div>
<div tabindex="0" class="three-d room hover room-test">
<div class="three-d object test" id="hello">Hello world
<a class="go" href="#hello">hello</a>
<div class="scene">
<div class="rest"></div>
<div tabindex="0" class="three-d room hover room-test">
<div class="three-d object test" id="turtles">It's turtles all the way down!
<a class="go" href="#turtles">turtles</a>
<div class="scene">
<div class="rest"></div>
<div tabindex="0" class="three-d room hover room-test">
<div class="three-d object test" id="table.js">
<a class="go" href="#table.js">table editor</a>
<iframe
style="width:100%; height:90%;"
src="table.js"></iframe>
</div>
</div>
<div tabindex="0" class="three-d room hover room-test2">
<div class="three-d object test2" id="css-only-virtual-world">
<a class="go" href="#css-only-virtual-world">useful tip</a>
Don't use CSS to do this.</div>
</div>
<div class="three-d room">
<div class="three-d wall wall-l"></div>
<div class="three-d wall wall-r"></div>
<div class="three-d wall wall-u"></div>
<div class="three-d wall wall-d"></div>
<div class="three-d wall wall-b"></div>
<div class="three-d wall wall-f"></div>
</div>
</div>
</div>
</div>
<div tabindex="0" class="three-d room hover room-test2">
<div class="three-d object test2" id="nested-rooms">
<a class="go" href="#nested-rooms">nested-rooms</a>
Nested rooms!
</div>
</div>
<div class="three-d room">
<div class="three-d wall wall-l"></div>
<div class="three-d wall wall-r"></div>
<div class="three-d wall wall-u"></div>
<div class="three-d wall wall-d"></div>
<div class="three-d wall wall-b"></div>
<div class="three-d wall wall-f"></div>
</div>
</div>
</div>
</div>
<div tabindex="0" class="three-d room hover room-test2">
<div class="three-d object test2" id="mental-palace">Mental palace
<a class="go" href="#mental-palace">mental-palace</a>
<div class="scene">
<div tabindex="0" class="three-d room hover room-test">
<div class="three-d object test" id="mental-palace-2001">
<a class="go" href="#mental-palace-2001"></a>
Oh my…
</div>
</div>
<div tabindex="0" class="three-d room hover room-test2">
<div class="three-d object test2" id="mental-palace-stars">
<a class="go" href="#mental-palace-stars"></a>
It's full of &lt;div&gt;s
</div>
</div>
<div class="three-d room">
<div class="three-d wall wall-l"></div>
<div class="three-d wall wall-r"></div>
<div class="three-d wall wall-u"></div>
<div class="three-d wall wall-d"></div>
<div class="three-d wall wall-b"></div>
<div class="three-d wall wall-f"></div>
</div>
</div>
</div>
</div>
<div class="three-d room">
<div class="three-d wall wall-l"></div>
<div class="three-d wall wall-r"></div>
<div class="three-d wall wall-u"></div>
<div class="three-d wall wall-d"></div>
<div class="three-d wall wall-b"></div>
<div class="three-d wall wall-f"></div>
</div>
</div>
</div>-->
<div id="debug">
<section class="new-scene" id="main">
<aside><a href="#main">→ Enter ←</a></aside>
<section id="hello" tabindex="0">
<h1>Hello world</h1>
<aside><a href="#hello">hello</a></aside>
<section id="turtles" tabindex="0">
<aside><a href="#turtles">turtles</a></aside>
<p>It's turtles all the way down!</p>
<section id="table.js">
<aside><a href="#table.js">table editor</a></aside>
<iframe style="width:100%; height:90%;" src="table.js">Table editor alt text</iframe>
</section>
<section id="css-only-virtual-world">
<aside><a href="#css-only-virtual-world">useful tip</a></aside>
<p>Don't use CSS to do this.</p>
</section>
</section>
<section>
<aside><a href="#nested-rooms">nested-rooms</a></aside>
Nested rooms!
</section>
</section>
<section id="mental-palace">
<h1>Mental palace</h1>
<aside><a href="#mental-palace">mental-palace</a></aside>
<!--
<section id="mental-palace-2001">
<aside><a href="#mental-palace-2001"></a></aside>
Oh my…
</section>
<section id="mental-palace-stars">
<aside><a href="#mental-palace-stars"></a></aside>
It's full of &lt;div&gt;s
</section>-->
</section>
</section>
</div>
</body>
</html>