Compare commits

...

5 Commits

Author SHA1 Message Date
890f6cce3f Merge pull request 'staging' (#311) from staging into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #311
2024-03-22 20:50:29 +01:00
67eea1beb0 remove boat reservation
Some checks are pending
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Successful in 9m50s
2024-03-22 20:49:56 +01:00
c007ae6fb8 Merge pull request 'bugfix' (#306) from bugfix into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m41s
CI/CD Pipeline / deploy-staging (push) Successful in 4m38s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #306
2024-03-21 22:20:50 +01:00
53ca2c24c1 Merge pull request 'merger :-)' (#304) from remove-merged-staging-diff into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 9m29s
CI/CD Pipeline / deploy-staging (push) Successful in 6m31s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #304
2024-03-21 21:04:14 +01:00
ac587a1b1c Merge pull request 'fix ci' (#302) from fix-ci into staging
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Reviewed-on: #302
2024-03-21 21:03:35 +01:00

View File

@ -1,5 +1,5 @@
{% macro boatreservation() %}
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3"
{#<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3"
style="margin-top: 10px">
<h2 class="h2">Bootsreservierungen</h2>
<div class="p2" style="margin-bottom: 10px;">
@ -10,7 +10,7 @@
<li style="display: inline-block;">22.04. | Christian Gusenbauer | Boot: Linz + kleiner Hänger</li>
</ul>
</div>
</div>
</div>#}
{% endmacro boatreservation %}
{% macro header(loggedin_user) %}
<header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">