From 561acc0a1f02773ab38060caa00fe8e6b48ff711 Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Mon, 9 Apr 2018 11:56:30 -0500 Subject: [PATCH 1/7] Added mostly themeing --- PongP5JS | 1 + games.html | 43 +++++++++++++++++++++++++++++++++++ index.html | 25 ++++++++++++++++++--- style.css | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++- system.html | 43 +++++++++++++++++++++++++++++++++++ 5 files changed, 172 insertions(+), 4 deletions(-) create mode 160000 PongP5JS diff --git a/PongP5JS b/PongP5JS new file mode 160000 index 0000000..5aeddfb --- /dev/null +++ b/PongP5JS @@ -0,0 +1 @@ +Subproject commit 5aeddfb1427bc46eb5a6fe574b3321ebc39c9028 diff --git a/games.html b/games.html index e69de29..09f5b53 100644 --- a/games.html +++ b/games.html @@ -0,0 +1,43 @@ + + + + Retro City + + + + +
+ +
+

Retro City

+ +
+ + +
+

catagories

+ +
+ + +
+

About

+
+ p{} +
+
+
+ +
+

Created by: Brandon Behar, Erin Sims, Wade Kelly-Higgs

+
+ + + diff --git a/index.html b/index.html index dbacd72..72277ad 100644 --- a/index.html +++ b/index.html @@ -6,18 +6,37 @@ +
+

Retro City

-

Home

+ + +
+

catagories

+ +
+ +
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Praesentium ratione ipsum, vero inventore quam sunt sint architecto similique aliquid alias pariatur recusandae autem tempora minima iure rerum sit minus illum quis quos eos cupiditate commodi magni accusamus! Ipsam doloremque, sapiente doloribus veniam maxime tempore vero a dignissimos in inventore maiores reprehenderit quo dolor dolorem commodi odit voluptates quas perspiciatis molestias magnam ab corporis laborum ratione quidem qui. Voluptas veritatis dolor inventore eligendi minus rerum nisi explicabo reprehenderit! Esse voluptatem, quos, facere quas animi tenetur repellendus consectetur similique, recusandae dolore voluptas deserunt eveniet optio nisi veniam! Voluptas hic, pariatur vero ullam.

+

About

+
+ p{} +
+
+
+ +
+

Created by: Brandon Behar, Erin Sims, Wade Kelly-Higgs

diff --git a/style.css b/style.css index 2144498..e271f85 100644 --- a/style.css +++ b/style.css @@ -1,6 +1,7 @@ -body{ +html, body{ margin: 0; padding: 0; + height: 100%; background-color:rgb(86, 105, 110); font-family: sans; } @@ -53,5 +54,66 @@ body{ .content{ margin: 1em; background-color: white; + border: solid black; + margin-right: 14em; +} + +/* Catagories */ +.catagories{ + float: right; + width: 12em; + height: 5em; + background-color: white; + margin: 1em; + border: solid black; + padding-bottom: 2em; +} + +.catagories a{ + text-decoration: none; + height: 95%; + color: black; + border-bottom: dashed black 1px;; +} + +.catagories a:hover{ + border-bottom: solid red 1px; +} + +.catagories li{ +} + +.catagories ul{ + list-style-type: none; +} + +.titles{ + color: red; + text-shadow: 1px 1px black, -1px -1px black, -1px 1px black, 1px -1px black; + text-align: center; +} + +.text{ + margin: 1em; + padding: 1em; + background-color: midnightblue; + color: white; +} + +.footer{ + background-color: black; + border-top: solid red; + display: fixed; + bottom: 0; + color: grey; + font-size: 10px; + margin: 0; +} +.footer p,a{ + margin: 0; + padding: 5px; +} +.wraper{ + min-height: 100%; height: 100%; } diff --git a/system.html b/system.html index e69de29..e2e5913 100644 --- a/system.html +++ b/system.html @@ -0,0 +1,43 @@ + + + + Retro City + + + + +
+ +
+

Retro City

+ +
+ + +
+

catagories

+ +
+ + +
+

About

+
+ p{} +
+
+
+ +
+

Created by: Brandon Behar, Erin Sims, Wade Kelly-Higgs

+
+ + + From 1546ef909f9de5c6fddac4f80124675c74cf0688 Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Mon, 9 Apr 2018 11:58:39 -0500 Subject: [PATCH 2/7] Renamed system.html to systems.html --- system.html => systems.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename system.html => systems.html (100%) diff --git a/system.html b/systems.html similarity index 100% rename from system.html rename to systems.html From 0d0f11f7a22c453bbdc5764e4b4dbf7f7b3c6c02 Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Mon, 9 Apr 2018 21:52:48 -0500 Subject: [PATCH 3/7] Added Pong game using iframe --- pong.html | 24 ++++++++++++++++++++++++ style.css | 5 +++++ 2 files changed, 29 insertions(+) create mode 100644 pong.html diff --git a/pong.html b/pong.html new file mode 100644 index 0000000..6efcfb7 --- /dev/null +++ b/pong.html @@ -0,0 +1,24 @@ + + + + Retro City + + + + +
+ +
+

Retro City

+ +
+ + + + + diff --git a/style.css b/style.css index e271f85..1944697 100644 --- a/style.css +++ b/style.css @@ -117,3 +117,8 @@ html, body{ min-height: 100%; height: 100%; } + +#pong{ + height: 40em; + margin-left: 10%; +} From fea98ab3e90d0cd2cf673103ca8def55360ab49e Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Mon, 9 Apr 2018 21:56:13 -0500 Subject: [PATCH 4/7] Added some placeholder text --- games.html | 2 +- index.html | 2 +- systems.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/games.html b/games.html index 09f5b53..f4a43ff 100644 --- a/games.html +++ b/games.html @@ -30,7 +30,7 @@

About

- p{} +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Hic numquam, ipsa modi alias, porro voluptatibus, blanditiis dolor illum laudantium dicta reiciendis ipsam ratione. Harum beatae amet deleniti modi minus, suscipit odio alias soluta quas explicabo mollitia voluptate aspernatur incidunt reprehenderit provident saepe voluptatem maiores. Autem amet deserunt laborum dignissimos? Placeat explicabo, itaque voluptates quibusdam vero fugiat magni qui perferendis provident, ipsum doloribus est dignissimos ducimus deserunt. Magnam temporibus explicabo blanditiis dignissimos aliquam, eius ut numquam tenetur repellendus possimus, mollitia ex consectetur dolorem? Quos ipsa eum ullam architecto non fuga labore, sapiente repudiandae ea obcaecati accusamus, minus reiciendis, impedit quibusdam, sed.

diff --git a/index.html b/index.html index 72277ad..c4e0473 100644 --- a/index.html +++ b/index.html @@ -30,7 +30,7 @@

About

- p{} +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Repellat laborum cum libero, maxime consectetur doloribus non, assumenda fugit illo amet quas quam animi fuga nesciunt et delectus? Veritatis id autem odio possimus optio eum perferendis dolorem, consectetur ut ipsum, quisquam qui. Illum, recusandae aperiam iure beatae atque officiis quidem consectetur vitae nisi culpa unde consequatur corrupti quibusdam debitis illo hic aspernatur voluptas pariatur dolor! Cum exercitationem, id. Dolores aliquid, totam facere commodi dolorum beatae impedit numquam rem quasi, distinctio delectus possimus inventore omnis. Cupiditate repudiandae soluta, minima reprehenderit. Accusamus qui distinctio sint, perspiciatis labore minus nam quo beatae dolorum temporibus.

diff --git a/systems.html b/systems.html index e2e5913..8acf4e8 100644 --- a/systems.html +++ b/systems.html @@ -30,7 +30,7 @@

About

- p{} +

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Unde ut deleniti inventore voluptates quas nihil praesentium nisi enim vel ipsum architecto quo, soluta, harum dignissimos esse. Iure placeat quia explicabo cumque delectus odit, praesentium, debitis, voluptate consectetur dicta qui repudiandae similique vitae voluptas expedita laborum, voluptatem quae facilis dignissimos. Recusandae delectus sit, asperiores aliquid obcaecati non autem iusto cupiditate sint necessitatibus beatae molestiae explicabo dicta totam saepe minima nobis, aut quidem fugit quisquam dolorem consequatur reprehenderit molestias. Amet, voluptatem necessitatibus possimus quisquam ducimus animi, esse tempora dolor laudantium, reprehenderit, fuga nemo sint ipsam praesentium aspernatur earum natus dolore commodi iusto.

From bd3bd1af6194f28654dede049c858eb5a830865b Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Wed, 11 Apr 2018 14:08:37 -0500 Subject: [PATCH 5/7] Removed some dead space --- pong.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/pong.html b/pong.html index 6efcfb7..1937d1f 100644 --- a/pong.html +++ b/pong.html @@ -18,7 +18,5 @@ - - From 15e299e6e91d3db3cfddf76d4350d4883d6150d3 Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Wed, 11 Apr 2018 14:09:21 -0500 Subject: [PATCH 6/7] Changed some things in the nav bar --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index c4e0473..74c7e62 100644 --- a/index.html +++ b/index.html @@ -11,10 +11,10 @@

Retro City

From 1e21f870b473eee9c9aa902557718b3176ae3380 Mon Sep 17 00:00:00 2001 From: TechRunner2 Date: Wed, 11 Apr 2018 14:09:33 -0500 Subject: [PATCH 7/7] added margin to logo --- style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/style.css b/style.css index 1944697..9a3f2b7 100644 --- a/style.css +++ b/style.css @@ -11,6 +11,7 @@ html, body{ float:left; color: red; margin: inherit; + margin-left: 1em; margin-top: 5px; text-shadow: 1px 1px white, -1px -1px white, -1px 1px white, 1px -1px white; }