diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..2433730 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +fontawesome/ diff --git a/css/custom.css b/css/custom.css index 535e33e..578952c 100644 --- a/css/custom.css +++ b/css/custom.css @@ -3,11 +3,6 @@ body, #wrapper min-height: 100vh; } -footer -{ - margin-top: auto; -} - .flex-fill { flex: 1 1 auto; diff --git a/js/core-functions.js b/js/core-functions.js new file mode 100644 index 0000000..36c0fa6 --- /dev/null +++ b/js/core-functions.js @@ -0,0 +1,4 @@ +$("#menu-toggle").click(function(e) { + e.preventDefault(); + $("#wrapper").toggleClass("toggled"); +}); diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig index b4256a5..9402046 100644 --- a/templates/partials/base.html.twig +++ b/templates/partials/base.html.twig @@ -17,48 +17,55 @@ {% block stylesheets %} {# do assets.addCss('https://unpkg.com/purecss@1.0.0/build/pure-min.css', 100) #} {% do assets.addCss('https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css', 100) %} - {% do assets.addCss('https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', 99) %} + {% do assets.addCss('theme://fontawesome/css/all.css', 99) %} {% do assets.addCss('theme://css/custom.css', 96) %} + {% do assets.addCss('theme://css/sidebar.css', 96) %} {% endblock %} {% block javascripts %} {% do assets.addJs('jquery', 100) %} {% do assets.addJs('https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js', 99) %} + {% do assets.addJs('theme://js/core-functions.js', 98) %} {% endblock %} -{% block assets deferred %} +{% block assets_css %} {{ assets.css()|raw }} - {{ assets.js()|raw }} {% endblock %} - +
- {% block body %} -
- {% block header %} - {% include 'partials/navbar.html.twig' %} - {% endblock %} - {% block content %}{% endblock %} + {% include 'partials/navbar.html.twig' %} +
+
+
+ {% block content %}{% endblock %} +
- {% endblock %} - - {% block footer %} - - {% endblock %} +
+
{% block bottom %} {{ assets.js('bottom')|raw }} {% endblock %} + +{% block assets_js deferred %} + {{ assets.js()|raw }} +{% endblock %} + diff --git a/templates/partials/logo.html.twig b/templates/partials/logo.html.twig index 12a52a7..15f7d27 100644 --- a/templates/partials/logo.html.twig +++ b/templates/partials/logo.html.twig @@ -1,14 +1,9 @@ {% set logo = theme_var(mobile ? 'custom_logo_mobile' : 'custom_logo') %} -
- {% if logo %} - {% set logo_file = (logo|first).name %} - - {% else %} - - {% endif %} -
-
- Reitanlage
Oranienburg -
+ {% if logo %} + {% set logo_file = (logo|first).name %} + + {% else %} + + {% endif %} diff --git a/templates/partials/navbar.html.twig b/templates/partials/navbar.html.twig index 88d8922..83f7079 100644 --- a/templates/partials/navbar.html.twig +++ b/templates/partials/navbar.html.twig @@ -1,50 +1,19 @@ -{% macro loop(page) %} - {% for p in page.children.visible %} - {% set current_page = (p.active or p.activeChild) ? 'selected' : '' %} - {% if p.children.visible.count > 0 %} -
  • - -
    - {{ _self.loop(p) }} -
    -
    • - {% else %} -
  • - {{ p.menu }} -
    • - {% endif %} - {% endfor %} -{% endmacro %} - -