From 413326b1aaf261fd7ed32e54d8e5ccf2e71afe0d Mon Sep 17 00:00:00 2001 From: Mimi Momo Date: Wed, 30 Sep 2020 20:14:23 -0500 Subject: [PATCH 01/18] fix typo in header's charset info; add language tag to html; trying to figure out why footer appears in middle of game + presskit pages --- src/static/css/diary.css | 4 ++-- src/static/css/game.css | 11 +++++------ src/views/frame.tpl | 5 +---- src/views/game.tpl | 2 +- src/views/header.tpl | 6 +++--- src/views/presskit.tpl | 2 +- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/static/css/diary.css b/src/static/css/diary.css index 172f62f..9824007 100755 --- a/src/static/css/diary.css +++ b/src/static/css/diary.css @@ -22,6 +22,7 @@ mark { background-color: #900C3F; color: hotpink; } +ul { list-style-position: inside; } .grid { display: grid; @@ -194,11 +195,10 @@ mark { .footer-row { grid-area: 8 / 1 / 9 / 5; background-color: #A8577E; - text-align: center; } .footer { - background-color: #5c374c; + background-color: pink; padding-top: 5px; padding-right: 25px; box-shadow: 0 100vh 0 100vh #581845; diff --git a/src/static/css/game.css b/src/static/css/game.css index d50bec3..bdbf021 100644 --- a/src/static/css/game.css +++ b/src/static/css/game.css @@ -178,12 +178,11 @@ ul { list-style-position: inside; } .footer-row { grid-area: 4 / 1 / 5 / 4; - background-color: #EC424A; - text-align: right; - padding-top: 5px; - padding-right: 25px; + background-color: green; } -.footer { - background-color: #060d1a; +#footer { + background-color: #060d1a; + text-align: right; + overflow: hidden; } diff --git a/src/views/frame.tpl b/src/views/frame.tpl index 59b64f0..ce321ad 100644 --- a/src/views/frame.tpl +++ b/src/views/frame.tpl @@ -1,5 +1,6 @@ + % include('header.tpl') @@ -8,12 +9,8 @@ % include('logo-bar.tpl') % include('nav.tpl')
- {{!base}} - - % include('footer.tpl') - diff --git a/src/views/game.tpl b/src/views/game.tpl index 96f7c74..062726c 100644 --- a/src/views/game.tpl +++ b/src/views/game.tpl @@ -65,4 +65,4 @@ Skills are individual powers gained through gameplay which give specific effects -
+
diff --git a/src/views/header.tpl b/src/views/header.tpl index dc49185..44b25fc 100644 --- a/src/views/header.tpl +++ b/src/views/header.tpl @@ -1,3 +1,3 @@ - {{title or 'blessfrey.me'}} - - + {{title or 'blessfrey.me'}} + + diff --git a/src/views/presskit.tpl b/src/views/presskit.tpl index fcc1ec3..c642e4c 100644 --- a/src/views/presskit.tpl +++ b/src/views/presskit.tpl @@ -94,5 +94,5 @@ The multiclass and skill system emphasizes player skill, personal expression, an -
+
From 9eae40a8e4e36f3c508a1a7e0cccc9532edc31f1 Mon Sep 17 00:00:00 2001 From: Mimi Momo Date: Wed, 30 Sep 2020 20:38:31 -0500 Subject: [PATCH 02/18] fixed html lang tag typo --- src/views/frame.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/frame.tpl b/src/views/frame.tpl index ce321ad..ea51896 100644 --- a/src/views/frame.tpl +++ b/src/views/frame.tpl @@ -1,5 +1,4 @@ - % include('header.tpl') From 76ab1f3a171686f767807e3580aa71953f7a8269 Mon Sep 17 00:00:00 2001 From: Mimi Momo Date: Wed, 30 Sep 2020 20:42:53 -0500 Subject: [PATCH 03/18] removed html tag from bodies of pages --- src/views/diary.tpl | 1 - src/views/game.tpl | 3 +-- src/views/index.tpl | 1 - src/views/presskit.tpl | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/views/diary.tpl b/src/views/diary.tpl index 32319bb..2296a1f 100644 --- a/src/views/diary.tpl +++ b/src/views/diary.tpl @@ -1,4 +1,3 @@ - % rebase('frame.tpl')
diff --git a/src/views/game.tpl b/src/views/game.tpl index 062726c..89e5828 100644 --- a/src/views/game.tpl +++ b/src/views/game.tpl @@ -1,4 +1,3 @@ - % rebase('frame.tpl')
@@ -8,7 +7,7 @@

Story



- You play as a transfer student to a southern American town.
+ You play as a transfer student to a Deep South town.

There's a popular rumor that the local shopping center closes early because it's haunted, evidenced by strange noises and lights.

diff --git a/src/views/index.tpl b/src/views/index.tpl index 6fb085e..522571f 100644 --- a/src/views/index.tpl +++ b/src/views/index.tpl @@ -1,4 +1,3 @@ - % rebase('frame.tpl')