From 0d013f7d6f14c4b2173de3573069766bb024a29b Mon Sep 17 00:00:00 2001 From: Daniel Scalzi Date: Tue, 29 Aug 2017 16:40:42 -0400 Subject: [PATCH] Added home page structure --- app/assets/css/launcher.css | 52 +++++++++++++++++++++++++++++++++++ app/assets/js/script.js | 4 +-- app/assets/westeroscraft.json | 4 --- app/index.ejs | 22 +++++++++++++-- 4 files changed, 74 insertions(+), 8 deletions(-) diff --git a/app/assets/css/launcher.css b/app/assets/css/launcher.css index 519bbed..32f9088 100644 --- a/app/assets/css/launcher.css +++ b/app/assets/css/launcher.css @@ -58,4 +58,56 @@ body { #frame_btn_minimize:hover { background-color: #D6FFA6; +} + +#main { + height: calc(100% - 22px); +} + +#main > #upper { + height: 75%; + display: flex; +} + +#main > #lower { + height: 25%; +} + +#main > #upper > #left { + display: inline-flex; + width: 25%; + height: 100%; +} + +#main > #upper > #content { + display: inline-flex; + width: 50%; + height: 100%; +} + +#main > #upper > #right { + display: inline-flex; + width: 25%; + height: 100%; +} + +#main > #lower > #top { + height: 50%; +} + +#main > #lower > #bottom { + height: 50%; + display: flex; +} + +#main > #lower > #bottom > #left { + height: 100%; + width: 50%; + display: inline-flex; +} + +#main > #lower > #bottom > #right { + height: 100%; + width: 50%; + display: inline-flex; } \ No newline at end of file diff --git a/app/assets/js/script.js b/app/assets/js/script.js index 2f7d092..27253e9 100644 --- a/app/assets/js/script.js +++ b/app/assets/js/script.js @@ -31,10 +31,10 @@ document.onreadystatechange = function () { window.minimize() }) - document.getElementById("test_btn").addEventListener('click', function(e){ + /*document.getElementById("test_btn").addEventListener('click', function(e){ console.log('testing') testdownloads() - }) + })*/ } } diff --git a/app/assets/westeroscraft.json b/app/assets/westeroscraft.json index a890bcc..607c79a 100644 --- a/app/assets/westeroscraft.json +++ b/app/assets/westeroscraft.json @@ -229,7 +229,6 @@ "artifact": { "size": 2106193, "MD5": "82f495594cd50e1fda7a8aa0246239fc", - "------path": "OptiFine-1.11.2_HD_U_C3.jar", "extension": ".jar", "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/OptiFine.jar" } @@ -241,7 +240,6 @@ "artifact": { "size": 538740, "MD5": "f4d931f6db6210621a86fa1e7eae8016", - "------path": "jei.jar", "extension": ".jar", "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/jei.jar" } @@ -253,7 +251,6 @@ "artifact": { "size": 16321712, "MD5": "5a89e2ab18916c18965fc93a0766cc6e", - "----path": "WesterosBlocks.jar", "extension": ".jar", "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/prod-1.11.2/mods/WesterosBlocks.jar" } @@ -300,7 +297,6 @@ "artifact": { "size": 37838, "MD5": "0497a93e5429b43082282e9d9119fcba", - "---path": "mod_chatBubbles-1.0.1_for_1.11.2.litemod", "extension": ".litemod", "url": "http://mc.westeroscraft.com/WesterosCraftLauncher/files/1.11.2/mod_chatBubbles-1.0.1_for_1.11.2.litemod" }, diff --git a/app/index.ejs b/app/index.ejs index 2f580aa..7312022 100644 --- a/app/index.ejs +++ b/app/index.ejs @@ -7,8 +7,26 @@ <% include frame.ejs %> -
- +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
\ No newline at end of file