Skip to content
Snippets Groups Projects

Develop

Merged Develop
develop into main
Merged Tobias Mieves requested to merge develop into main
Compare
and
1 file
+ 6
− 7
Compare changes
  • Side-by-side
  • Inline
templates/base.html
+ 6
− 7
@@ -10,7 +10,7 @@
@@ -10,7 +10,7 @@
{% block head %}{% endblock %}
{% block head %}{% endblock %}
</head>
</head>
<body>
<body>
<div class="navbar mb-2 shadow-lg bg-neutral text-neutral-content rounded-box">
<div class="navbar shadow-lg bg-neutral text-neutral-content rounded-box max-h-24 mb-3.5">
<div class="flex-none lg:hidden">
<div class="flex-none lg:hidden">
<label for="my-drawer-3" class="btn btn-square btn-ghost">
<label for="my-drawer-3" class="btn btn-square btn-ghost">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
@@ -21,7 +21,7 @@
@@ -21,7 +21,7 @@
</label>
</label>
</div>
</div>
<div class="flex-1 px-2 mx-2 navbar-start">
<div class="flex-1 px-2 mx-2 navbar-start">
<a href="{% url 'home_view' %}" class="text-lg font-bold">
<a href="{% url 'home_view' %}" class="text-lg font-bold align-middle">
{% block home_logo %}DaisyUI{% endblock %}
{% block home_logo %}DaisyUI{% endblock %}
</a>
</a>
</div>
</div>
@@ -53,23 +53,22 @@
@@ -53,23 +53,22 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="drawer drawer-mobile">
<div class="drawer drawer-mobile pt-20" style="margin-top:-5rem;">
<input id="my-drawer-3" type="checkbox" class="drawer-toggle"/>
<input id="my-drawer-3" type="checkbox" class="drawer-toggle"/>
<div class="drawer-content flex flex-col">
<div class="drawer-content flex flex-col">
<!-- Navbar -->
<!-- Navbar -->
<!-- Page content here -->
<!-- Page content here -->
<main>
<main>
<div class="p-4 lg:pl-0">
<div class="p-4 mb-20 lg:mb-0">
{% block content %}
{% block content %}
{% endblock %}
{% endblock %}
</div>
</div>
</main>
</main>
</div>
</div>
<div class="drawer-side sm:shadow-lg sm:rounded-box m-4">
<div class="drawer-side shadow-lg rounded-box lg:ml-4">
<label for="my-drawer-3" class="drawer-overlay"></label>
<label for="my-drawer-3" class="drawer-overlay"></label>
<ul class="menu p-4 w-fit m-w-xs bg-base-100">
<ul class="menu p-4 w-fit m-w-xs mb-20 lg:mb-0 bg-base-100">
<!-- Sidebar content here -->
{% block sidebar_list %}
{% block sidebar_list %}
<li><a>Sidebar Item 1</a></li>
<li><a>Sidebar Item 1</a></li>
<li><a>Sidebar Item 2</a></li>
<li><a>Sidebar Item 2</a></li>