From e6fc8b7adf14a4f3391dcc16028d8db53e108ad8 Mon Sep 17 00:00:00 2001 From: horus Date: Tue, 16 Jan 2024 10:44:35 +0100 Subject: . --- app.php | 3 +- public/css/app.css | 8 ++++ public/index.php | 8 +++- views/about2.html | 102 +++++++++++++++++++++++++++++++++++++++++++ views/index.html | 4 +- views/projects.html | 20 +-------- views/projects_all.html | 22 ++++++++++ views/snippets/layout.html | 4 ++ views/snippets/navbar.html | 2 + views/snippets/projects.html | 19 ++++++++ views/snippets/things.html | 39 +++++++++++++++++ views/things.html | 43 +----------------- 12 files changed, 210 insertions(+), 64 deletions(-) create mode 100644 public/css/app.css create mode 100644 views/about2.html create mode 100644 views/projects_all.html create mode 100644 views/snippets/projects.html create mode 100644 views/snippets/things.html diff --git a/app.php b/app.php index 16ce17c..f64c6aa 100644 --- a/app.php +++ b/app.php @@ -14,7 +14,8 @@ $function = new \Twig\TwigFunction('is_active', function($route) { $twig->addFunction($function); $function = new \Twig\TwigFunction('maincss', function() { - echo readfile(__DIR__ . '/public/css/bootstrap.min.css'); + echo file_get_contents(__DIR__ . '/public/css/bootstrap.min.css'); + echo file_get_contents(__DIR__ . '/public/css/app.css'); }); $twig->addFunction($function); diff --git a/public/css/app.css b/public/css/app.css new file mode 100644 index 0000000..a26e7d1 --- /dev/null +++ b/public/css/app.css @@ -0,0 +1,8 @@ + +.mastodon { + display: inline-block; + font-size: inherit; + height: 1em; + overflow: visible; + vertical-align: -0.125em; +} diff --git a/public/index.php b/public/index.php index 957bed4..0460889 100644 --- a/public/index.php +++ b/public/index.php @@ -10,11 +10,17 @@ case("/"): echo $twig->render('index.html'); break; case("/about/"): + echo $twig->render('about2.html'); + break; +case("/about2/"): echo $twig->render('about.html'); break; -case("/projects/"): +case("/projects2/"): echo $twig->render('projects.html'); break; +case("/projects/"): + echo $twig->render('projects_all.html'); + break; case("/feeds/"): echo $twig->render('feeds.html'); break; diff --git a/views/about2.html b/views/about2.html new file mode 100644 index 0000000..c16e76c --- /dev/null +++ b/views/about2.html @@ -0,0 +1,102 @@ +{% extends "snippets/layout.html" %} + +{% block title "about me | Maximilian Möhring" %} + +{% block css %} +.main { +/* + font-size: 1.25rem; +*/ + margin-top: 4rem; +} +.img-show-desktop { + float: right !important; +} +.img-show-mobile { + display: none !important; +} +@media (max-width: 992px) { + .img-show-desktop { + display: none !important; + } + .img-show-mobile { + display: inherit !important; + margin-left:auto; + margin-right: auto; + } +} +.text-small { + font-size: 1rem; +} +{% endblock %} + +{% block main %} + +
+ +
+ + +
+ +
+

About Me

+

+ Hi, to be short, I... +

+
+ + + +
+
+ +

+

+ +
+ +{% endblock %} diff --git a/views/index.html b/views/index.html index 2288172..cf103c6 100644 --- a/views/index.html +++ b/views/index.html @@ -57,7 +57,7 @@ -
  • +
  • # I have more hobbys besides sleep(10)
    diff --git a/views/projects.html b/views/projects.html index f01a67b..ff64562 100644 --- a/views/projects.html +++ b/views/projects.html @@ -5,25 +5,7 @@
    -
    -

    My Projects

    - Stuff I spent my free time on -
    - - + {% include "snippets/projects.html" %}
    diff --git a/views/projects_all.html b/views/projects_all.html new file mode 100644 index 0000000..15b6985 --- /dev/null +++ b/views/projects_all.html @@ -0,0 +1,22 @@ +{% extends "snippets/layout.html" %} + +{% block title "projects | Maximilian Möhring" %} +{% block css %} +.main { +/* + font-size: 1.25rem; +*/ + margin-top: 4rem; +} +{% endblock %} +{% block main %} + +
    + + {% include "snippets/projects.html" %} + + {% include "snippets/things.html" with {'included': true}%} + +
    + +{% endblock %} diff --git a/views/snippets/layout.html b/views/snippets/layout.html index 17262b1..9a55ad4 100644 --- a/views/snippets/layout.html +++ b/views/snippets/layout.html @@ -101,6 +101,10 @@ color: #ddd277; } + .included-space { + margin-top: 4rem; + } +