Change dir tree

strangeglyph · Jul 23, 2019 · f17bd03 · f17bd03
1 parent 02a00a0
commit f17bd03
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea
 build
-web
+deploy
 sunrise.iml
 gradle
 .gradle
diff --git a/build.gradle b/build.gradle
@@ -44,10 +44,17 @@ task assembleWeb(type: Sync) {
             }
         })
     }
+
+    into "${projectDir}/deploy"
     from compileKotlin2Js.destinationDir
-    into "${projectDir}/web"
+    from "${projectDir}/html"
+
+    into('resources') {
+        from "${projectDir}/resources"
+    }
 
     dependsOn classes
 }
 
-assemble.dependsOn assembleWeb
+
+assemble.dependsOn assembleWeb
diff --git a/credits.html → html/credits.html b/credits.html → html/credits.html
@@ -8,23 +8,23 @@
 <body>
 <div id="content">
     <span class="credit-line">
-        <img src="resources/energy.svg" alt="Energy" class="resource-icon"/>
+        <img src="../resources/energy.svg" alt="Energy" class="resource-icon"/>
         <span class="credit-text">"Energy" is CCBY Caitlin George (<a href="https://thenounproject.com/cgeorge1028">https://thenounproject.com/cgeorge1028</a>)</span>
     </span>
     <span class="credit-line">
-        <img src="resources/direct.svg" alt="No Nonsense" class="resource-icon"/>
+        <img src="../resources/direct.svg" alt="No Nonsense" class="resource-icon"/>
         <span class="credit-text">"through" is CCBY luca fruzza (<a href="https://thenounproject.com/lucafruzza">https://thenounproject.com/lucafruzza</a>)</span>
     </span>
     <span class="credit-line">
-        <img src="resources/indirect.svg" alt="Thinking Outside The Box" class="resource-icon"/>
+        <img src="../resources/indirect.svg" alt="Thinking Outside The Box" class="resource-icon"/>
         <span class="credit-text">"Detour Around" is CCBY Ben Davis (<a href="https://thenounproject.com/smashicons">https://thenounproject.com/smashicons</a>)</span>
     </span>
     <span class="credit-line">
-        <img src="resources/explosives.svg" alt="Explosives" class="resource-icon"/>
+        <img src="../resources/explosives.svg" alt="Explosives" class="resource-icon"/>
         <span class="credit-text">"explosion" is CCBY Louis Hesse (<a href="https://thenounproject.com/louishesse">https://thenounproject.com/louishesse</a>)</span>
     </span>
     <span class="credit-line">
-        <img src="resources/door_broken.svg" alt="A Broken Door" class="resource-icon"/>
+        <img src="../resources/door_broken.svg" alt="A Broken Door" class="resource-icon"/>
         <span class="credit-text">is based on "gate", CCBY Deemak Dasina (<a href="https://thenounproject.com/deemakdaksina">https://thenounproject.com/deemakdaksina</a>)</span>
     </span>
 </div>

diff --git a/index.html → html/index.html b/index.html → html/index.html
@@ -38,6 +38,11 @@
             <div class="interactions"></div>
         </div>
 
+        <div id="inside" class="tab" style="display: none">
+            <div class="description"></div>
+            <div class="interactions"></div>
+        </div>
+
         <div id="log" class="tab" style="display: none">
             <div class="description"></div>
             <div class="interactions"></div>
@@ -54,9 +59,9 @@
     <a href="credits.html">Credits</a>
 </div>
 
-<script src="web/kotlin.js"></script>
-<script src="web/kotlinx-html-js.js"></script>
-<script src="web/sunrise.js"></script>
+<script src="../scripts/kotlin.js"></script>
+<script src="../scripts/kotlinx-html-js.js"></script>
+<script src="../scripts/sunrise.js"></script>
 
 </body>
 </html>
diff --git a/style.css → html/style.css b/style.css → html/style.css