diff --git a/src/index.py b/src/index.py index 2c402bb..5861619 100644 --- a/src/index.py +++ b/src/index.py @@ -36,7 +36,7 @@ def serve_xml(filename): # Error Page @error(404) def error404(error): - return "unfortunately, a 404 error. the page you're searching for doesn't exist. (or am I just hiding it for now?) try another page! " + return "unfortunately, a 404 error. the page you're searching for doesn't exist. (or is it just in hiding?) try another page! " @error(500) def error500(error): return "unfortunately, a 500 error. something is wrong with the page you're trying to find, if it exists at all. try another page! return to blessfrey.me." @@ -48,7 +48,7 @@ def error502(error): def char(char_name): """character page""" loc = 'char/' - info = {'css': 'diary', 'title': 'blessfrey - character - ' + char_name, 'year': find_year(), 'profile': prepare_profile(loc, char_name)} + info = {'css': 'nothing', 'title': 'blessfrey - character - ' + char_name, 'year': find_year(), 'profile': prepare_profile(loc, char_name)} abs_app_dir_path = os.path.dirname(os.path.realpath(__file__)) abs_views_path = os.path.join(abs_app_dir_path, 'views') TEMPLATE_PATH.insert(0, abs_views_path ) diff --git a/src/static/css/index.css b/src/static/css/index.css index 9e712fe..6b8c510 100755 --- a/src/static/css/index.css +++ b/src/static/css/index.css @@ -2,7 +2,8 @@ padding:0; margin:0; font-family: trebuchet ms; arial; calibri; gill sans; helvetica neue; candara; geneva; verdana; sans-serif; - color: #F9B3D7; + background-color: black; + color: gray; } a { @@ -11,78 +12,65 @@ a { .grid { display: grid; - grid-template-columns: auto 75px 400px 25px 225px 75px auto; - grid-template-rows: 25px 90px 457px auto; + grid-template-columns: auto 60% auto; + grid-template-rows: 5% 15% 50% 20%; grid-column-gap: 0px; grid-row-gap: 0px; } -.whitespace { - grid-area: 1 / 1 / 2 / 8; +.top-row { + grid-area: 1 / 1 / 2 / 4; display: flex; flex-direction:column; justify-content:center; align-items: center; - background-color: #900C3F; + background-color: red; +} +.nav-row { + grid-area: 2 / 1 / 3 / 4; + background-color: orange; +} +.content-row { + grid-area: 3 / 1 / 4 / 4; + background-color: yellow; +} +.latest-row { + grid-area: 4 / 1 / 5 / 4; + background-color: green; } -.blessfrey-logo { - grid-area: 1 / 3 / 2 / 6; +.logo { + grid-area: 1 / 2 / 2 / 3; padding-top: 5px; color: #FBDAEC; } - -/* navigation pane */ - -.nav-row { - grid-area: 2 / 1 / 3 / 8; - background-color: #900C3F; -} - .nav-grid { - grid-area: 2 / 2 / 3 / 7; + grid-area: 2 / 2 / 3 / 3; display: flex; flex-direction:row; justify-content:flex-end; display: grid; - grid-template-columns: auto repeat(4, 70px) auto; + grid-template-columns: auto repeat(5, 1fr) auto; grid-template-rows: 90px; grid-column-gap: 17px; grid-row-gap: 0px; align-items: end; justify-items: center; } -.nav-bar { - grid-area: 1 / 1 / 2 / 7; - background-image: url(../img/ele/navbar.png); - height: 86px; - width: 800px; -} -.nav-index { - grid-area: 1 / 2 / 2 / 3; - padding-bottom: 3px; - position: relative; -} -.nav-game { - grid-area: 1 / 3 / 2 / 4; - padding-bottom: 3px; - position: relative; -} -.nav-diary { - grid-area: 1 / 4 / 2 / 5; - padding-bottom: 3px; - position: relative; -} -.nav-presskit { - grid-area: 1 / 5 / 2 / 6; - padding-bottom: 3px; - position: relative; -} + .nav-home { + grid-area: 1 / 2 / 2 / 3; + padding-bottom: 3px; + position: relative; + } + .nav-blessfrey { grid-area: 1 / 3 / 2 / 4; } + .nav-lemonland { grid-area: 1 / 4 / 2 / 5; } + .nav-diary { grid-area: 1 / 5 / 2 / 6; } + .nav-about { grid-area: 1 / 6 / 2/ 7; } .nav-link { - position: absolute; + /*position: absolute; top: 45%; left: 50%; - transform: translate(-50%, -50%) + transform: translate(-50%, -50%)*/ } .nav-link a { font-size: 21px; @@ -99,48 +87,35 @@ a { -1px 0 1px black; } -/* Body */ - -.body-row { - grid-area: 3 / 1 / 4 / 8; - background-color: #080410; -} - -.social { - grid-area: 3 / 6 / 4 / 7; - justify-content: center; -} - -.bg { - grid-area: 3 / 3 / 4 / 6; - background-color:; +.content-grid { + grid-area: 3 / 2 / 4 / 3; + background-color: black; background-image: url(../img/bg/homeBG.png); - width: 650px; - height: 457px; -} - -.footer-row { - grid-area: 4 / 1 / 5 / 8; - background-color: #900C3F; -} - - -.headline { - margin-right: 0px; - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; - padding-top: 3px; - padding-right: 1px; - padding-bottom: 3px; - padding-left: 1px; + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-template-rows: auto; + grid-column-gap: 0px; + grid-row-gap: 0px; } - + .content-left { + grid-area: 1 / 1 / 2 / 2; + } + .content-right { + grid-area: 1 / 2 / 2 / 3; + } +.latest-grid { + grid-area: 4 / 2 / 5 / 3; +} .footer-content { - background-color: #581845; + background-color: blue; color: #F9B3D7; padding-top: 5px; text-align: right; overflow: hidden; - box-shadow: 0 100vh 0 100vh #581845; + box-shadow: 0 100vh 0 100vh black; +} + +#poltics { + height: auto; + width: 100%; } diff --git a/src/static/img/char/WISE/WISE.png b/src/static/img/char/WISE/WISE.png new file mode 100755 index 0000000..5e68029 Binary files /dev/null and b/src/static/img/char/WISE/WISE.png differ diff --git a/src/static/img/lare.png b/src/static/img/lare.png deleted file mode 100644 index 71c8516..0000000 Binary files a/src/static/img/lare.png and /dev/null differ diff --git a/src/static/img/nav/about.png b/src/static/img/nav/about.png new file mode 100644 index 0000000..97144d7 Binary files /dev/null and b/src/static/img/nav/about.png differ diff --git a/src/static/img/nav/blessfrey.png b/src/static/img/nav/blessfrey.png new file mode 100644 index 0000000..97144d7 Binary files /dev/null and b/src/static/img/nav/blessfrey.png differ diff --git a/src/static/img/nav/diary.png b/src/static/img/nav/diary.png new file mode 100644 index 0000000..97144d7 Binary files /dev/null and b/src/static/img/nav/diary.png differ diff --git a/src/static/img/nav/home.png b/src/static/img/nav/home.png new file mode 100644 index 0000000..97144d7 Binary files /dev/null and b/src/static/img/nav/home.png differ diff --git a/src/static/img/nav/lemonland.png b/src/static/img/nav/lemonland.png new file mode 100644 index 0000000..97144d7 Binary files /dev/null and b/src/static/img/nav/lemonland.png differ diff --git a/src/views/char.tpl b/src/views/char.tpl new file mode 100644 index 0000000..5214f81 --- /dev/null +++ b/src/views/char.tpl @@ -0,0 +1,11 @@ +% rebase('frame.tpl') +% import random +
+ +
+
+ {{!profile}} + + +
+
diff --git a/src/views/frame.tpl b/src/views/frame.tpl index 8807186..78d8a12 100644 --- a/src/views/frame.tpl +++ b/src/views/frame.tpl @@ -13,7 +13,7 @@ % include('nav.tpl') -
+
{{!base}} diff --git a/src/views/index.tpl b/src/views/index.tpl index 6d1feaa..3e5bbf6 100644 --- a/src/views/index.tpl +++ b/src/views/index.tpl @@ -1,20 +1,15 @@ % rebase('frame.tpl') % import random -
- -
-
- Maintenance mode!
- The website deserves prettier art, more features, and better editting.
-
- Until then, check out No-Legs the Cat.
-
- (image: He's an orange tabby with orange eyes, a pink nose, and a white chest. He sits with his legs completely tucked, so you can't even tell he has legs. Cutie.) -
-
+
+
+
+ No-Legs the Cat
+ (image: orange cat) +
+
+ (image: orange cat) +
- - - -
+
+ grid
diff --git a/src/views/logo-bar.tpl b/src/views/logo-bar.tpl index 2b3a297..731e3ef 100644 --- a/src/views/logo-bar.tpl +++ b/src/views/logo-bar.tpl @@ -1,5 +1,5 @@ -
+
-