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

feat: Switch to generated css file

parent de79eb53
No related branches found
No related tags found
No related merge requests found
Pipeline #156314 failed
Stage: test
Stage: release
Expand all Hide whitespace changes
Inline Side-by-side
.releaserc
+ 1
− 1
View file @ 6a1f0976
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
"@semantic-release/gitlab", "@semantic-release/gitlab",
"@semantic-release/changelog" "@semantic-release/changelog"
] ]
"branches": ["main"] "branches": ["main", {name: 'develop', prerelease: true}]
requirements.txt
+ 2
− 6
View file @ 6a1f0976
asgiref==3.5.2
Django==4.1.3 Django==4.1.3
environ==1.0 environ==1.0
pip==21.3.1 whitenoise==6.2.0
setuptools==60.2.0 gunicorn==20.1.0
sqlparse==0.4.3 \ No newline at end of file
wheel==0.37.1
whitenoise==6.2.0
\ No newline at end of file
static/core/css/.gitkeep 0 → 100644
+ 0
− 0
View file @ 6a1f0976
static/core/css/daisyui.css deleted 100644 → 0
+ 0
− 3
View file @ de79eb53
This diff is collapsed.
static/core/css/tailwind.min.css deleted 100644 → 0
+ 0
− 1
View file @ de79eb53
This diff is collapsed.
templates/base-clear.html
+ 5
− 7
View file @ 6a1f0976
...@@ -2,13 +2,11 @@ ...@@ -2,13 +2,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Core{% endblock %}</title> <title>{% block title %}Core{% endblock %}</title>
<link href="{% static 'core/css/daisyui.css' %}" rel="stylesheet" type="text/css"> <link href="{% static 'core/css/output.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'core/css/tailwind.min.css' %}" rel="stylesheet" type="text/css"> {# <meta http-equiv="refresh" content="10">#}
<link href="{% static 'wedding/css/output.css' %}" rel="stylesheet" type="text/css">
<meta http-equiv="refresh" content="10">
</head> </head>
<body> <body>
{% block content %} {% block content %}
......
templates/base.html
+ 67
− 69
View file @ 6a1f0976
...@@ -2,82 +2,80 @@ ...@@ -2,82 +2,80 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{% block title %}Core{% endblock %}</title> <title>{% block title %}Core{% endblock %}</title>
<link href="{% static 'core/css/daisyui.css' %}" rel="stylesheet" type="text/css"> <link href="{% static 'core/css/output.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'core/css/tailwind.min.css' %}" rel="stylesheet" type="text/css"> {# <meta http-equiv="refresh" content="10">#}
<link href="{% static 'wedding/css/output.css' %}" rel="stylesheet" type="text/css">
<meta http-equiv="refresh" content="10">
</head> </head>
<body> <body>
<div class="navbar mb-2 shadow-lg bg-neutral text-neutral-content rounded-box"> <div class="navbar mb-2 shadow-lg 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="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"
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"
d="M4 6h16M4 12h16M4 18h16"></path> d="M4 6h16M4 12h16M4 18h16"></path>
</svg> </svg>
</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">
{% block home_logo %}DaisyUI{% endblock %} {% block home_logo %}DaisyUI{% endblock %}
</a> </a>
</div> </div>
<div class="flex-none gap-2"> <div class="flex-none gap-2">
{% block navbar_extra %} {% block navbar_extra %}
<div class="form-control"> <div class="form-control">
<input type="text" placeholder="Search" class="input input-bordered" /> <input type="text" placeholder="Search" class="input input-bordered"/>
</div> </div>
{% endblock %} {% endblock %}
<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">
<div class="w-10 rounded-full"> <div class="w-10 rounded-full">
<img src="https://placeimg.com/80/80/people" /> <img src="https://placeimg.com/80/80/people"/>
</div> </div>
</label> </label>
{% endblock %} {% endblock %}
<ul tabindex="0" <ul tabindex="0"
class="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 text-base-content rounded-box w-52"> class="mt-3 p-2 shadow menu menu-compact dropdown-content bg-base-100 text-base-content rounded-box w-52">
{% block account_dropdown_list %} {% block account_dropdown_list %}
<li> <li>
<a href="{% url 'password_change' %}">Passwort ändern</a> <a href="{% url 'password_change' %}">Passwort ändern</a>
</li> </li>
<li> <li>
<a href="{% url 'logout' %}">{{ user.username }} abmelden</a> <a href="{% url 'logout' %}">{{ user.username }} abmelden</a>
</li> </li>
{% endblock %} {% endblock %}
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<div class="drawer drawer-mobile"> <div class="drawer drawer-mobile">
<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 lg:pl-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 sm:shadow-lg sm:rounded-box m-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 bg-base-100">
<!-- Sidebar content here --> <!-- 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>
{% endblock %} {% endblock %}
</ul> </ul>
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment