Merge pull request 'devel' (#49) from devel into main

Reviewed-on: #49
This commit is contained in:
inhji 2023-04-07 16:21:08 +02:00
commit 6827227c61
3 changed files with 13 additions and 6 deletions

View file

@ -132,7 +132,7 @@ defmodule ChiyaWeb.AdminComponents do
<li> <li>
<.link <.link
href={~p"/user/log_in"} href={~p"/user/log_in"}
class="text-xs leading-6 text-gray-100 font-semibold dark:hover:text-gray-300 hover:text-gray-700" class="text-xs leading-6 text-gray-900 dark:text-gray-100 font-semibold dark:hover:text-gray-300 hover:text-gray-700"
> >
Log in Log in
</.link> </.link>

View file

@ -13,7 +13,7 @@
</div> </div>
</header> </header>
<main class="mx-auto max-w-2xl px-4"> <section class="mx-auto max-w-2xl px-4 mb-16">
<.flash_group flash={@flash} /> <.flash_group flash={@flash} />
<%= @inner_content %> <%= @inner_content %>
</main> </section>

View file

@ -24,9 +24,16 @@
<%= @settings.custom_css %> <%= @settings.custom_css %>
</style> </style>
</head> </head>
<body class="bg-theme-background antialiased"> <body class="bg-theme-background antialiased min-h-screen flex flex-col">
<.admin_bar current_user={@current_user} /> <.admin_bar current_user={@current_user} />
<main class="flex-1">
<%= @inner_content %> <%= @inner_content %>
</main>
<footer class="px-4 py-1 sm:px-6 lg:px-8 bg-white/30 dark:bg-black/30 text-gray-900 dark:text-gray-100 text-xs leading-6 font-semibold">
<span class="text-theme-primary">⌘</span> <span><%= @settings.title %></span>
</footer>
<%= raw(@settings.custom_html) %> <%= raw(@settings.custom_html) %>
</body> </body>