extending own stylesheet to remove pico

This commit is contained in:
Niko Abeler 2024-05-09 14:15:19 +02:00
parent 91b82f0e57
commit 1524820d5e
6 changed files with 167 additions and 111 deletions

View File

@ -12,7 +12,6 @@
<link rel="webmention" href="/webmention/" /> <link rel="webmention" href="/webmention/" />
<link rel="alternate" type="application/rss+xml" title="RSS" href="/index.xml"> <link rel="alternate" type="application/rss+xml" title="RSS" href="/index.xml">
<link rel='stylesheet' href='/static/pico-2.min.css'>
<link rel='stylesheet' href='/static/style.css'> <link rel='stylesheet' href='/static/style.css'>
<style> <style>
:root { :root {
@ -41,11 +40,6 @@
} }
header {
background-color: var(--background);
padding-bottom: 1rem !important;
}
footer { footer {
border-top: dashed 2px; border-top: dashed 2px;
border-color: #ccc; border-color: #ccc;
@ -57,23 +51,6 @@
border-radius: 50%; border-radius: 50%;
} }
.header {
display: flex;
flex-flow: row wrap;
justify-content: space-between;
align-items: flex-start;
}
.header-title {
order: 0;
}
.header-profile {
order: 1;
}
hgroup h2 a { color: inherit; }
.photo-grid { .photo-grid {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -93,7 +70,7 @@
} }
main img { main img {
max-height: 50vh; max-width: 100%;
margin: auto; margin: auto;
text-align: center; text-align: center;
display: block; display: block;
@ -104,25 +81,19 @@
</head> </head>
<body> <body>
<header> <header>
<div class="container header h-card"> <div class="header h-card">
<hgroup class="header-title"> {{ if .SiteConfig.AvatarUrl }}
<div class="header-profile">
<img class="u-photo u-logo avatar" src="{{ .SiteConfig.AvatarUrl }}" alt="{{ .SiteConfig.Title }}" width="100" height="100" />
</div>
{{ end }}
<div>
<h2><a class="p-name u-url" href="/">{{ .SiteConfig.Title }}</a></h2> <h2><a class="p-name u-url" href="/">{{ .SiteConfig.Title }}</a></h2>
<h3 class="p-note">{{ .SiteConfig.SubTitle }}</h3> <h3 class="p-note">{{ .SiteConfig.SubTitle }}</h3>
</hgroup>
<div class="header-profile">
{{ if .SiteConfig.AvatarUrl }}
<img class="u-photo u-logo avatar" src="{{ .SiteConfig.AvatarUrl }}" alt="{{ .SiteConfig.Title }}" width="100" height="100" />
{{ end }}
<div style="float: right; list-style: none;">
{{ range $me := .SiteConfig.Me }}
<li><a href="{{$me.Url}}" rel="me">{{$me.Name}}</a>
</li>
{{ end }}
</div>
</div> </div>
</div> </div>
<div class="container"> <div>
<nav> <nav>
<ul> <ul>
{{ range $link := .SiteConfig.HeaderMenu }} {{ range $link := .SiteConfig.HeaderMenu }}
@ -138,10 +109,10 @@
</nav> </nav>
</div> </div>
</header> </header>
<main class="container"> <main>
{{template "main" .Data}} {{template "main" .Data}}
</main> </main>
<footer class="container"> <footer>
<nav> <nav>
<ul> <ul>
<li><a target="_blank" href="/index.xml">RSS Feed</a></li> <li><a target="_blank" href="/index.xml">RSS Feed</a></li>

View File

@ -22,28 +22,29 @@
{{ end }} {{ end }}
<div class="h-entry"> <div class="h-entry">
<hgroup> {{if .Entry.Title}}
{{if .Entry.Title}} <h1 class="p-name entry-title">{{.Entry.Title}}</h1>
<h1 class="p-name">{{.Entry.Title}}</h1> {{else}}
{{end}} <div style="padding-top:4rem;"></div>
<small> {{end}}
<a class="u-url" href="/posts/{{ .Entry.ID }}/">#</a> <div class="entry-meta">
Published: <a class="u-url" href="/posts/{{ .Entry.ID }}/">#</a>
{{ if .Entry.PublishedAt }} Published:
<time class="dt-published" datetime="{{.Entry.PublishedAt.Format "2006-01-02T15:04:05" }}"> {{ if .Entry.PublishedAt }}
{{.Entry.PublishedAt.Format "2006-01-02" }} <time class="dt-published" datetime="{{.Entry.PublishedAt.Format "2006-01-02T15:04:05" }}">
</time> {{.Entry.PublishedAt.Format "2006-01-02" }}
{{ end }} </time>
{{ if .Author.Name }} {{ end }}
by {{ if .Author.Name }}
<a class="p-author h-card" href="{{.Author.FullUrl}}"> by
{{ if .Author.AvatarUrl }} <a class="p-author h-card" href="{{.Author.FullUrl}}">
<img class="u-photo u-logo" style="height: 1em;" src="{{ .Author.AvatarUrl }}" alt="{{ .Author.Config.Title }}" /> {{ if .Author.AvatarUrl }}
{{ end }} <img class="u-photo u-logo" style="height: 1em;" src="{{ .Author.AvatarUrl }}" alt="{{ .Author.Config.Title }}" />
{{.Author.Name}} {{ end }}
</a> {{.Author.Name}}
{{ end }} </a>
</small> {{ end }}
</div>
</hgroup> </hgroup>
<div class="e-content"> <div class="e-content">

View File

@ -6,24 +6,23 @@
<div class="h-feed"> <div class="h-feed">
{{ range .Entries }} {{ range .Entries }}
<div class="h-entry"> <div class="h-entry">
<hgroup> <h1 class="entry-title">
<h3> <a class="u-url" href="/posts/{{ .ID }}/">
<a class="u-url" href="/posts/{{ .ID }}/"> {{if .Title}}
{{if .Title}} {{ .Title }}
{{ .Title }} {{else}}
{{else}} #
# {{end}}
{{end}} </a>
</a> </h1>
</h3> <div class="entry-meta">
<small style="font-size: 0.75em;"> Published:
{{ if .PublishedAt }} {{ if .PublishedAt }}
<time class="dt-published" datetime="{{.PublishedAt.Format "2006-01-02T15:04:05" }}"> <time class="dt-published" datetime="{{.PublishedAt.Format "2006-01-02T15:04:05" }}">
{{.PublishedAt.Format "2006-01-02" }} {{.PublishedAt.Format "2006-01-02" }}
</time> </time>
{{ end }} {{ end }}
</small> </div>
</hgroup>
{{ .Content }} {{ .Content }}
</div> </div>
<hr> <hr>

View File

@ -6,24 +6,23 @@
<div class="h-feed"> <div class="h-feed">
{{ range .Entries }} {{ range .Entries }}
<div class="h-entry"> <div class="h-entry">
<hgroup> <h1 class="entry-title">
<h3> <a class="u-url" href="/posts/{{ .ID }}/">
<a class="u-url" href="/posts/{{ .ID }}/"> {{if .Title}}
{{if .Title}} {{ .Title }}
{{ .Title }} {{else}}
{{else}} #
# {{end}}
{{end}} </a>
</a> </h1>
</h3> <div class="entry-meta">
<small style="font-size: 0.75em;"> Published:
{{ if .PublishedAt }} {{ if .PublishedAt }}
<time class="dt-published" datetime="{{.PublishedAt.Format "2006-01-02T15:04:05" }}"> <time class="dt-published" datetime="{{.PublishedAt.Format "2006-01-02T15:04:05" }}">
{{.PublishedAt.Format "2006-01-02" }} {{.PublishedAt.Format "2006-01-02" }}
</time> </time>
{{ end }} {{ end }}
</small> </div>
</hgroup>
{{ .Content }} {{ .Content }}
</div> </div>
<hr> <hr>

View File

@ -107,7 +107,6 @@ func NewWebApp(
siteConfig.Post("/menus/create/", siteConfigMenusHandler.HandleCreate) siteConfig.Post("/menus/create/", siteConfigMenusHandler.HandleCreate)
siteConfig.Post("/menus/delete/", siteConfigMenusHandler.HandleDelete) siteConfig.Post("/menus/delete/", siteConfigMenusHandler.HandleDelete)
// app.Static("/static/*filepath", http.Dir(repo.StaticDir()))
app.Use("/static", filesystem.New(filesystem.Config{ app.Use("/static", filesystem.New(filesystem.Config{
Root: http.FS(embedDirStatic), Root: http.FS(embedDirStatic),
PathPrefix: "static", PathPrefix: "static",
@ -139,17 +138,6 @@ func NewWebApp(
app.Get("/.well-known/webfinger", activityPubServer.HandleWebfinger) app.Get("/.well-known/webfinger", activityPubServer.HandleWebfinger)
app.Route("/activitypub", activityPubServer.Router) app.Route("/activitypub", activityPubServer.Router)
// Webmention
// app.Post("/webmention/", userWebmentionHandler(repo))
// Micropub
// app.Post("/micropub/", userMicropubHandler(repo))
// IndieAuth
// app.Get("/auth/", userAuthHandler(repo))
// app.Post("/auth/", userAuthProfileHandler(repo))
// app.Post("/auth/verify/", userAuthVerifyHandler(repo))
// app.Post("/auth/token/", userAuthTokenHandler(repo))
// app.Get("/.well-known/oauth-authorization-server", userAuthMetadataHandler(repo))
// app.NotFound = http.HandlerFunc(notFoundHandler(repo))
return &WebApp{ return &WebApp{
FiberApp: app, FiberApp: app,
EntryService: entryService, EntryService: entryService,

View File

@ -1,3 +1,101 @@
body {
font-family: sans-serif;
max-width: 800px;
margin: 0 auto 0 auto;
}
header {
padding: 1rem;
background-color: var(--background);
/* background: linear-gradient(180deg, var(--background) 0%, rgba(255, 255, 255, 0) 100%); */
padding-bottom: 1rem !important;
}
footer {
border-top: dashed 2px;
border-color: #ccc;
padding-bottom: 5rem;
}
a {
color: var(--primary);
text-decoration: none;
}
a:hover {
color: var(--primary-hover);
}
a:focus {
color: var(--primary-focus);
}
nav > ul {
list-style-type: none;
margin: 0;
padding-left: 0;
padding-top: 1rem;
padding-bottom: 1rem;
}
nav > ul > li {
float: left;
padding-right: 2rem;
}
hr {
margin: 3rem
}
h1 {
font-size: 1.5rem;
}
h2 {
font-size: 1.25rem;
}
h3 {
font-size: 1.125rem;
}
h4, h5, h6 {
font-size: 1.0rem;
}
pre {
background-color: #eee;
padding: 0.5rem;
white-space: pre-wrap;
}
.header {
display: flex;
flex-flow: row;
}
.header-profile {
padding-right: 0.5rem;
display: flex;
justify-content: center;
align-items: center;
}
.row {
display: flex;
justify-content: space-between;
}
nav.row {
margin-bottom: 2rem;
}
.entry-title {
margin-bottom: 0;
}
.entry-meta {
font-size: 0.8rem;
padding-bottom: 2rem;
}
.action-tile-list { .action-tile-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;