diff options
| -rw-r--r-- | main/assets/css/main.css | 40 | ||||
| -rw-r--r-- | main/templates/main_base.html.j2 | 24 | ||||
| -rw-r--r-- | main/templates/main_index.html.j2 | 4 | ||||
| -rw-r--r-- | main/templates/main_neighbors.html.j2 | 14 | ||||
| -rw-r--r-- | main/templates/main_sidebar.html.j2 | 8 | ||||
| -rw-r--r-- | modules/main_generate.py | 9 |
6 files changed, 76 insertions, 23 deletions
diff --git a/main/assets/css/main.css b/main/assets/css/main.css index 0113a27..64cdf6a 100644 --- a/main/assets/css/main.css +++ b/main/assets/css/main.css @@ -13,10 +13,13 @@ a, p { color: white; } -main, div.navbar_main { +main, header, div.navbar_main { + align-items: center; +} + +main, header, div.navbar_main, aside { display: flex; flex-flow: column; - align-items: center; margin: auto; background-color: #666666dd; } @@ -25,12 +28,39 @@ div.navbar_parent { padding: 0.2rem; } +div.main_parent { + padding: 0 !important; +} + +main { + padding-left: 15px; + padding-right: 15px; +} + @media (min-width: 768px) { main, header { - padding: 0 5rem 0 5rem !important; + padding: 0 2rem 0 2rem !important; + } + + div.main_parent { + padding: 0 0.8rem 0 0 !important; } } -main, header { - margin-top: 0.5rem; +main, header, aside { + margin-top: 0.8rem; } + +.icon-text { + display: flex; + flex-flow: row; + align-items: center; + margin-top: 0.2rem; + margin-bottom: 0.2rem; +} + +.icon-text > :first-child { + margin-right: 0.3rem; + width: 32px; + height: 32px; +}
\ No newline at end of file diff --git a/main/templates/main_base.html.j2 b/main/templates/main_base.html.j2 index b589ebe..6859389 100644 --- a/main/templates/main_base.html.j2 +++ b/main/templates/main_base.html.j2 @@ -7,25 +7,19 @@ <div class="bootstrap-wrapper"> <div class="container"> <div class="row"> - <div class="col-md-9 navbar_main"> + <div class="col-md-12 navbar_main"> {{ super() }} </div> </div> <div class="row"> - <main class="col-md-9"> - <p>This is page is work in progress. Meanwhile check my stuff on the navbar at the top of the page.</p> - <h2 style="color: #dddddd; text-align: center">Visit these sites, they have way cooler (and more finished) webpages than me:</h2> - <div align="center"> - <a href="https://www.tar.dev/" target="_blank"><img src="/assets/image/neighbors/tarandir.gif" alt="tar.dev" title="tar.dev" style="width:88px;height:31px;"></a> - <br> - <p>A way cooler neighbor page coming soon... (I swear.)</p> - </div> - <h2 style="color: #dddddd; text-align: center">Fanlistings I'm part of:</h2> - <div align="center"> - <a href="http://fan.after-death.org/crows" target="_blank"><img src="/assets/image/fanlisting/crows.png" alt="http://fan.after-death.org/crows" title="http://fan.after-death.org/crows" style="width:50px;height:50px;"></a> - <a href="https://n7.redcrown.net" target="_blank"><img src="/assets/image/fanlisting/masseffect.png" alt="Mass Effect series fanlisting"></a> - </div> - </main> + <div class="col-md-9 main_parent"> + <main> + {% block content required %}{% endblock %} + </main> + </div> + <aside class="col-md-3"> + {% include 'main_sidebar.html.j2' %} + </aside> </div> </div> </div> diff --git a/main/templates/main_index.html.j2 b/main/templates/main_index.html.j2 new file mode 100644 index 0000000..50f6b9d --- /dev/null +++ b/main/templates/main_index.html.j2 @@ -0,0 +1,4 @@ +{% extends "main_base.html.j2" %} +{% block content %} +<p>This is page is work in progress. Meanwhile check my stuff on the navbar at the top of the page.</p> +{% endblock %} diff --git a/main/templates/main_neighbors.html.j2 b/main/templates/main_neighbors.html.j2 new file mode 100644 index 0000000..dd81617 --- /dev/null +++ b/main/templates/main_neighbors.html.j2 @@ -0,0 +1,14 @@ +{% extends "main_base.html.j2" %} +{% block content %} +<h2 style="color: #dddddd; text-align: center">Visit these sites, they have way cooler (and more finished) webpages than me:</h2> +<div align="center"> + <a href="https://www.tar.dev/" target="_blank"><img src="/assets/image/neighbors/tarandir.gif" alt="tar.dev" title="tar.dev" style="width:88px;height:31px;"></a> + <br> + <p>A way cooler neighbor page coming soon... (I swear.)</p> +</div> +<h2 style="color: #dddddd; text-align: center">Fanlistings I'm part of:</h2> +<div align="center"> + <a href="http://fan.after-death.org/crows" target="_blank"><img src="/assets/image/fanlisting/crows.png" alt="http://fan.after-death.org/crows" title="http://fan.after-death.org/crows" style="width:50px;height:50px;"></a> + <a href="https://n7.redcrown.net" target="_blank"><img src="/assets/image/fanlisting/masseffect.png" alt="Mass Effect series fanlisting"></a> +</div> +{% endblock %} diff --git a/main/templates/main_sidebar.html.j2 b/main/templates/main_sidebar.html.j2 new file mode 100644 index 0000000..05ab83d --- /dev/null +++ b/main/templates/main_sidebar.html.j2 @@ -0,0 +1,8 @@ +<a href="/" class="icon-text"> + <img src="/assets/image/chip.svg" /> + <span>Home</span> +</a> +<a href="/neighbors.html" class="icon-text"> + <img src="/assets/image/chip.svg" /> + <span>Neighbors</span> +</a>
\ No newline at end of file diff --git a/modules/main_generate.py b/modules/main_generate.py index 550c77c..5e058ed 100644 --- a/modules/main_generate.py +++ b/modules/main_generate.py @@ -23,8 +23,11 @@ def generate(jinja_env: jinja2.Environment, output_root_path: str, local: bool): os.mkdir(output_root_path) - root_template = jinja_env.get_template("main_base.html.j2") - with open(os.path.join(output_root_path, "index.html"), "w") as f: - f.write(root_template.render({"url" : Config.MAIN_ROOT_URL})) + for page in ("index", "neighbors"): + template = jinja_env.get_template(f"main_{page}.html.j2") + html_file_name = f"{page}.html" + with open(os.path.join(output_root_path, html_file_name), "w") as f: + url = (Config.MAIN_ROOT_URL + ("" if page == "index" else "/" + html_file_name)) + f.write(template.render({"url" : url})) shutil.copytree(Config.MAIN_ASSETS_SOURCE_DIR, output_root_path + Config.ASSETS_IMPORT_PATH)
\ No newline at end of file |