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

Reviewed-on: #291
This commit is contained in:
inhji 2023-09-09 10:59:23 +02:00
commit 02f9c4f4c4
3 changed files with 11 additions and 30 deletions

View file

@ -26,37 +26,34 @@
#site-header { #site-header {
@apply block px-3 py-6 bg-gradient-to-r from-slate-900 to-slate-950 text-white print:hidden; @apply block px-3 py-6 bg-gradient-to-r from-slate-900 to-slate-950 text-white print:hidden;
nav ul { & nav ul {
@apply flex gap-3; @apply flex;
a { @apply p-3 rounded hover:bg-primary-500 transition; } & a { @apply p-3 rounded hover:bg-primary-500 transition; }
} }
} }
#primary-sidebar { #primary-sidebar {
@apply col-span-1; @apply col-span-1;
nav { & nav {
@apply flex flex-col md:flex-row lg:flex-col mb-6 lg:mb-0; @apply flex md:flex-row lg:flex-col mb-6 lg:mb-0;
} }
.menu { .menu {
@apply flex-1; @apply flex-1;
h2 {
@apply font-bold;
}
} }
} }
#site-content { #site-content {
@apply grid grid-cols-1 lg:grid-cols-5 gap-0 lg:gap-12; @apply grid grid-cols-1 lg:grid-cols-5 gap-0 lg:gap-12;
@apply px-3 sm:px-0;
#secondary-sidebar { > #secondary-sidebar {
@apply col-span-1; @apply col-span-1;
} }
#content-wrapper { > #content-wrapper {
@apply col-span-4; @apply col-span-4;
} }
} }

View file

@ -72,19 +72,9 @@
<main id="site-content" class="container print:hidden"> <main id="site-content" class="container print:hidden">
<aside id="primary-sidebar"> <aside id="primary-sidebar">
<nav> <nav class="prose">
<div class="menu"> <div class="menu">
<h2>Pages</h2> <strong>Channels</strong>
<ul>
<li><a href={~p"/wiki"}>Wiki</a></li>
<li><a href={~p"/about"}>About</a></li>
<li><a href={~p"/bookmarks"}>Bookmarks</a></li>
</ul>
</div>
<div class="menu">
<h2>Channels</h2>
<ul> <ul>
<%= for channel <- @channels do %> <%= for channel <- @channels do %>
@ -98,7 +88,7 @@
</div> </div>
<div class="menu"> <div class="menu">
<h2>Elsewhere</h2> <strong>Elsewhere</strong>
<ul> <ul>
<%= for identity <- @public_identities do %> <%= for identity <- @public_identities do %>

View file

@ -6,12 +6,6 @@ defmodule ChiyaWeb.PublicComponents do
router: ChiyaWeb.Router, router: ChiyaWeb.Router,
statics: ChiyaWeb.static_paths() statics: ChiyaWeb.static_paths()
import ChiyaWeb.Format
import ChiyaWeb.Markdown, only: [render: 1]
import Phoenix.HTML, only: [raw: 1]
import ChiyaWeb.DarkModeToggle
@doc """ @doc """
Renders a [Hero Icon](https://heroicons.com). Renders a [Hero Icon](https://heroicons.com).