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

Merge branch 'bugfix/fix-layout' into 'develop'

Bugfix/fix layout

See merge request !15
parents 76764056 6985f830
No related branches found
No related tags found
3 merge requests!18Change Layout of the base template,!16Develop,!15Bugfix/fix layout
Pipeline #188533 passed with warnings
...@@ -8,7 +8,7 @@ variables: ...@@ -8,7 +8,7 @@ variables:
docker: docker:
stage: docker stage: docker
image: docker:23 image: docker:24
services: services:
- docker:dind - docker:dind
before_script: before_script:
......
...@@ -131,7 +131,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" ...@@ -131,7 +131,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
LOGIN_REDIRECT_URL = "/" LOGIN_REDIRECT_URL = "/"
LOGOUT_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/"
EMAIL_BACKEND = "django.mail.backends.smtp.EmailBackend" EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
EMAIL_USE_TLS = True EMAIL_USE_TLS = True
EMAIL_HOST = env.get("EMAIL_HOST") EMAIL_HOST = env.get("EMAIL_HOST")
EMAIL_HOST_USER = env.get("EMAIL_USER") EMAIL_HOST_USER = env.get("EMAIL_USER")
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
} }
], ],
"dependencyDashboard": true, "dependencyDashboard": true,
"dependencyDashboardAutoclose": true,
"extends": [ "extends": [
"config:base", "config:base",
"github>whitesource/merge-confidence:beta", "github>whitesource/merge-confidence:beta",
......
Django==4.2.1 Django==4.2.1
whitenoise==6.4.0 whitenoise==6.5.0
gunicorn==20.1.0 gunicorn==21.2.0
\ No newline at end of file \ No newline at end of file
...@@ -7,9 +7,10 @@ ...@@ -7,9 +7,10 @@
<title>{% block title %}Core{% endblock %}</title> <title>{% block title %}Core{% endblock %}</title>
<link href="{% static 'core/css/output.css' %}" rel="stylesheet" type="text/css"> <link href="{% static 'core/css/output.css' %}" rel="stylesheet" type="text/css">
{# <meta http-equiv="refresh" content="10">#} {# <meta http-equiv="refresh" content="10">#}
{% 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"
...@@ -20,7 +21,7 @@ ...@@ -20,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>
...@@ -52,23 +53,22 @@ ...@@ -52,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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment