Skip to content
Snippets Groups Projects
Commit 47a08b5d authored by Tobias Mieves's avatar Tobias Mieves :sparkles:
Browse files

Merge branch 'develop' into 'main' 

Change Layout of the base template

See merge request !18
parents 9885b873 baf20036
No related branches found
No related tags found
1 merge request!18Change Layout of the base template
Pipeline #191206 passed
Stage: test
Stage: docker
Show whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 1
View file @ 47a08b5d
...@@ -143,10 +143,11 @@ cython_debug/ ...@@ -143,10 +143,11 @@ cython_debug/
**/env/ **/env/
**/db.sqlite3 **/db.sqlite3
/db/ /db/db.sqlite3
/staticfiles/ /staticfiles/
# Apps # Apps
wedding/ wedding/
wishlist/ wishlist/
trips/
/static/core/css/output.css /static/core/css/output.css
requirements.txt
+ 1
− 1
View file @ 47a08b5d
Django==4.2.1 Django==4.2.5
whitenoise==6.5.0 whitenoise==6.5.0
gunicorn==21.2.0 gunicorn==21.2.0
\ No newline at end of file
templates/base.html
+ 80
− 70
View file @ 47a08b5d
...@@ -10,9 +10,13 @@ ...@@ -10,9 +10,13 @@
{% block head %}{% endblock %} {% block head %}{% endblock %}
</head> </head>
<body> <body>
<div class="navbar shadow-lg bg-neutral text-neutral-content rounded-box max-h-24 mb-3.5"> <div class="drawer">
<input id="drawer" type="checkbox" class="drawer-toggle"/>
<div class="drawer-content flex flex-col">
<!-- Navbar -->
<div class="navbar w-full bg-neutral text-neutral-content rounded-box">
<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="drawer" 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"
class="inline-block w-6 h-6 stroke-current"> class="inline-block w-6 h-6 stroke-current">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
...@@ -20,17 +24,29 @@ ...@@ -20,17 +24,29 @@
</svg> </svg>
</label> </label>
</div> </div>
<div class="flex-1 px-2 mx-2 navbar-start"> <div class="flex-1 px-2 mx-2">
<a href="{% url 'home_view' %}" class="text-lg font-bold align-middle"> <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>
<div class="flex-none gap-2"> <div class="flex-none hidden lg:block">
{% block navbar_extra %} <ul class="menu menu-horizontal">
<div class="form-control"> {% block navbar_links %}
<input type="text" placeholder="Search" class="input input-bordered"/> <li><a>Item 1</a></li>
</div> <li tabindex="0">
<details>
<summary>Parent</summary>
<ul class="p-2">
<li><a>Submenu 1</a></li>
<li><a>Submenu 2</a></li>
</ul>
</details>
</li>
<li><a>Item 3</a></li>
{% endblock %} {% endblock %}
</ul>
</div>
<div class="dropdown dropdown-end"> <div class="dropdown dropdown-end">
{% block account_picture %} {% block account_picture %}
<label tabindex="0" class="btn btn-ghost btn-circle avatar"> <label tabindex="0" class="btn btn-ghost btn-circle avatar">
...@@ -52,27 +68,21 @@ ...@@ -52,27 +68,21 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
<div class="drawer drawer-mobile pt-20" style="margin-top:-5rem;">
<input id="my-drawer-3" type="checkbox" class="drawer-toggle"/>
<div class="drawer-content flex flex-col">
<!-- Navbar -->
<!-- Page content here --> <!-- Page content here -->
<main> <main class="p-4 w-full">
<div class="p-4 mb-20 lg:mb-0">
{% block content %} {% block content %}
Content
{% endblock %} {% endblock %}
</div>
</main> </main>
</div> </div>
<div class="drawer-side shadow-lg rounded-box lg:ml-4"> <div class="drawer-side">
<label for="my-drawer-3" class="drawer-overlay"></label> <label for="drawer" class="drawer-overlay"></label>
<ul class="menu p-4 w-fit m-w-xs mb-20 lg:mb-0 bg-base-100"> <ul class="menu p-4 w-80 min-h-full bg-base-200">
{% block sidebar_list %} {% block sidebar_links %}
<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>
{% endblock %} {% endblock %}
</ul> </ul>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment