Skip to content
Snippets Groups Projects
Commit 24c0b99a authored by schneider's avatar schneider
Browse files

Merge branch 'docdock' into 'master' 

use card10 dockdock theme

See merge request !5
parents fc94db4d 4212a422
No related branches found
No related tags found
1 merge request!5use card10 dockdock theme
Pipeline #5974 passed
Stage: test
Stage: deploy
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 18 additions and 6074 deletions
.gitmodules
+ 3
− 3
View file @ 24c0b99a
[submodule "style/vanillaframework"] [submodule "themes/docdock"]
path = style/vanillaframework path = themes/docdock
url = https://github.com/vanilla-framework/vanilla-framework.git url = https://git.card10.badge.events.ccc.de/card10/dockdock.git
config.toml
+ 11
− 8
View file @ 24c0b99a
baseURL = "/" baseURL = "/"
languageCode = "en-us" languageCode = "en-us"
title = "card10" title = "card10"
theme = "docdock"
enableGitInfo = true
[params] [params]
wiki_url = "https://git.card10.badge.events.ccc.de/card10/logix" editURL = "https://git.card10.badge.events.ccc.de/card10/logix/-/blob/master/"
wiki_branch = "master" disableNextPrev = true
ordersectionsby = "weight"
disableNavChevron = true
[outputs]
home = [ "HTML", "RSS", "JSON"]
[[menus.upper]] [[menu.shortcuts]]
name = "Firmware Documentation" name = "<i class='fa fa-book'></i> <div class='sc-text'>Firmware Documentation</div>"
url = "https://firmware.card10.badge.events.ccc.de" url = "https://firmware.card10.badge.events.ccc.de"
weight = 10 weight = 10
[[menus.upper]] [[menu.shortcuts]]
name = "GitLab" name = "<i class='fa fa-gitlab'></i> <div class='sc-text'>GitLab</div>"
url = "https://git.card10.badge.events.ccc.de/card10" url = "https://git.card10.badge.events.ccc.de/card10"
weight = 20 weight = 20
layouts/404.html
+ 3
− 2
View file @ 24c0b99a
{{ partial "default_header.html" . }} {{ partial "flex/head.html" . }}
{{ partial "flex/body-beforecontent.html" . }}
<div class="p-content"> <div class="p-content">
<h1 class="p-heading--one">404 - NotFound</h1> <h1 class="p-heading--one">404 - NotFound</h1>
<div class="p-notification--caution"> <div class="p-notification--caution">
...@@ -24,4 +25,4 @@ ...@@ -24,4 +25,4 @@
document.getElementById("filenameHREF").href = "{{$.Site.Params.Wiki_URL}}/new/{{$.Site.Params.Wiki_Branch}}/" + path + ".md"; document.getElementById("filenameHREF").href = "{{$.Site.Params.Wiki_URL}}/new/{{$.Site.Params.Wiki_Branch}}/" + path + ".md";
</script> </script>
</div> </div>
{{ partial "default_footer.html" . }} {{ partial "flex/body-aftercontent.html" . }}
layouts/_default/list.html deleted 100644 → 0
+ 0
− 65
View file @ fc94db4d
{{ partial "default_header.html" . }}
<aside class="p-aside">
<div id="tree">
<div class="mobile">
<a href="#no-tree" class="p-button has-icon">
<i class="p-icon--plus"></i>
<span>Hide Tree</span>
</a>
</div>
{{if not .Page.IsHome }}
<div class="p-aside__section">
<h4 class="p-aside__header">{{.Title}}</h4>
<nav class="p-aside__nav">
<ul class="p-list">
{{range .Page.Pages}}
<li><a class="p-aside__link" href="{{.Permalink}}">{{.Title}}</a></li>
{{end}}
</ul>
</nav>
</div>
{{end}}
{{range .Sections}}
{{if not .Draft}}
<div class="p-aside__section">
<h4 class="p-aside__header"><a class="p-aside__link" href="{{.Permalink}}">{{.Title}}</a></h4>
<nav class="p-aside__nav">
<ul class="p-list">
{{range .Sections}}
{{if not .Draft}}
<li><a class="p-aside__link" href="{{.Permalink}}">{{.Title}}</a></li>
{{end}}
{{end}}
{{if and (ne (len .Sections) 0) (ne (len .Pages) 0) }}
<li class="divider"></li>
{{end}}
{{range .Pages}}
{{if not .Draft}}
<li><a class="p-aside__link" href="{{.Permalink}}">{{.Title}}</a></li>
{{end}}
{{end}}
</ul>
</nav>
</div>
{{end}}
{{end}}
</div>
<div id="no-tree" class="mobile">
<a href="#tree" class="p-button has-icon">
<i class="p-icon--plus"></i>
<span>Show Tree</span>
</a>
</div>
</aside>
<div class="p-content">
<h1 class="p-heading--one">{{.Title}}</h1>
{{if not .Draft }}
{{.Content}}
{{else}}
This document is in progress, and could not be rendered yet.
<a href="https://github.com/gohugoio/hugo/issues/6215">Track hugo bug of this if</a>
{{end}}
</div>
{{ partial "default_footer.html" . }}
layouts/_default/single.html deleted 100644 → 0
+ 0
− 6
View file @ fc94db4d
{{ partial "default_header.html" . }}
<div class="p-content">
<h1 class="p-heading--one">{{.Title}}</h1>
{{ .Content }}
</div>
{{ partial "default_footer.html" . }}
layouts/partials/default_footer.html deleted 100644 → 0
+ 0
− 9
View file @ fc94db4d
{{ if ne .Page.GitInfo nil }}
<footer class="p-footer">
<span>{{.Lastmod}}</span>
<a href="{{.Site.Params.Wiki_URL}}/commit/{{.GitInfo.Hash}}">{{.GitInfo.AbbreviatedHash}}</a>
<span>{{.GitInfo.Subject}}</span>
</footer>
{{ end }}
</body>
</html>
layouts/partials/default_header.html deleted 100644 → 0
+ 0
− 68
View file @ fc94db4d
<!DOCTYPE html>
<html>
<head>
<title>{{.Site.Title}} - {{.Title}}</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="/css/main.css" />
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
</head>
<body>
<div id="app">
<header id="navigation" class="p-navigation">
<div class="p-navigation__links logo">
<a class="p-navigation__link" href="/">card10</a>
</div>
<div class="p-navigation__banner">
<a href="#navigation" class="p-navigation__toggle--open" title="menu">Menu</a>
<a href="#navigation-closed" class="p-navigation__toggle--close" title="close menu">Close menu</a>
</div>
<nav class="p-navigation__nav" role="menubar">
<span class="u-off-screen">
<a href="#main-content">Jump to main content</a>
</span>
<ul class="p-navigation__links" role="menu">
{{ range site.Menus.upper }}
<li class="p-navigation__link"><a{{ if eq "http" (slicestr .URL 0 4) }} target="_blank"{{ end }} href="{{.URL}}">{{.Name}}</a></li>
{{ end }}
</ul>
<ul class="p-navigation__links u-float-right" role="menu">
<li class="p-navigation__link edit">
{{ with $.File }}
<a target="_blank" href="{{$.Site.Params.Wiki_URL}}/edit/{{$.Site.Params.Wiki_Branch}}/{{.Path}}">Edit</a>
{{ else }}
not source found
{{ end }}
</li>
</ul>
</nav>
</header>
<ul class="p-breadcrumbs">
{{ template "breadcrumbnav" (dict "p1" . "p2" .) }}
</ul>
{{ define "breadcrumbnav" }}
{{ if .p1.Parent }}
{{ template "breadcrumbnav" (dict "p1" .p1.Parent "p2" .p2 ) }}
{{ else if not .p1.IsHome }}
{{ template "breadcrumbnav" (dict "p1" .p1.Site.Home "p2" .p2 ) }}
{{ end }}
<li class="p-breadcrumbs__item{{ if eq .p1 .p2 }} active{{ end }}">
<a href="{{ .p1.Permalink }}">{{ .p1.Title }}</a>
</li>
{{ end }}
static/css/main.css deleted 100644 → 0
+ 0
− 5807
View file @ fc94db4d
This diff is collapsed.
static/css/main.css.map deleted 100644 → 0
+ 0
− 1
View file @ fc94db4d
This diff is collapsed.
style/main.scss deleted 100644 → 0
+ 0
− 104
View file @ fc94db4d
// Download font from local only
$font-import: '/fonts/';
$assets-path: '/assets/';
@import "vanillaframework/scss/vanilla";
@include vanilla;
html {
background-color: #f3f3f3;
}
#app {
display: flex;
flex-flow: row wrap;
max-width: 100vw;
}
#app > * {
flex: 1 100%;
}
#app > aside {
flex: 1 auto;
}
#app > .p-content {
flex: 10 auto;
border: solid #eeeeee;
border-width: 1px 1px 0.2em;
box-shadow: 0 1px 2px 1px rgba(0,0,0,0.02);
background-color: #ffffff;
padding: 1em 2em 3em;
margin: 0 10px;
}
.p-aside__section {
background: #fcfcfc;
border: solid #eeeeee;
border-width: 1px 1px 0.2em;
box-shadow: 0 1px 2px 1px rgba(0,0,0,0.02);
padding: 1.5em 1.5em 0;
margin: 0 1em 1em;
}
.p-aside__header {
padding-bottom: 0.5em;
border-bottom: solid 2px #cccccc;
}
.divider {
border-bottom: solid 2px #cccccc;
}
.p-navigation::after,
.p-navigation__link > a::before {
content: none;
}
#navigation > .logo {
border-bottom: 6px solid #0076ba;
z-index: 2;
width: 30%;
padding: 0px 50px;
font-size: 1.5rem;
line-height: 3rem;
}
#navigation .edit {
font-weight: bold;
}
#navigation .edit > a {
color: #99ba00;
}
#navigation .p-navigation__nav >.p-navigation__links {
border-bottom: 6px solid #ffc600;
width: 50%;
}
#navigation .p-navigation__links.u-float-right {
border-bottom: 6px solid #99ba00;
flex-direction: row-reverse;
}
.mobile {
display: none;
}
@media (max-width: 800px) {
.mobile {
display: block;
}
#app > aside > #tree,
#app > aside > :target ~ #no-tree {
display: none;
}
#app > aside > #no-tree,
#app > aside > #tree:target,
#app > aside > #no-tree:target {
display: block;
}
#app {
flex-direction: column;
}
#app > .p-content {
margin: 0px;
}
}
.p-breadcrumbs {
margin: 0.5em 0 -0.25em 1em;
}
th {
width: auto !important;
}
vanillaframework @ 8b915ae8
Compare 8b915ae8...8b915ae8
Subproject commit 8b915ae82baea3df528a95f005a2a66d832f024e
docdock @ b208a895
Subproject commit b208a895a15b40facf2ef59ea3bde6dbda871c16
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment