From 17fe88ec240e6be932fed2bbf698200354209dfc Mon Sep 17 00:00:00 2001 From: Marcell Mars Date: Fri, 18 Jun 2021 13:14:41 +0200 Subject: [PATCH] !publish! mod vendor... --- .../SandpointsEditPage/public/global.css | 109 +++++++++++++----- .../layouts/partials/singlebody.html | 12 +- _vendor/modules.txt | 4 +- config.toml | 4 +- 4 files changed, 92 insertions(+), 37 deletions(-) diff --git a/_vendor/git.sandpoints.org/Drawwell/SandpointsEditPage/public/global.css b/_vendor/git.sandpoints.org/Drawwell/SandpointsEditPage/public/global.css index ddae25f..9d45d88 100644 --- a/_vendor/git.sandpoints.org/Drawwell/SandpointsEditPage/public/global.css +++ b/_vendor/git.sandpoints.org/Drawwell/SandpointsEditPage/public/global.css @@ -1,66 +1,66 @@ html, body { - position: relative; - width: 100%; - height: 100%; + position: relative; + width: 100%; + height: 100%; } body { - color: #333; - margin: 0; - padding: 8px; - box-sizing: border-box; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; + color: #333; + margin: 0; + padding: 8px; + box-sizing: border-box; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif; } a { - color: rgb(0,100,200); - text-decoration: none; + color: rgb(0,100,200); + text-decoration: none; } a:hover { - text-decoration: underline; + text-decoration: underline; } a:visited { - color: rgb(0,80,160); + color: rgb(0,80,160); } input, button, select, textarea { - font-family: inherit; - font-size: inherit; - -webkit-padding: 0.4em 0; - padding: 0.4em; - margin: 0 0 0.5em 0; - box-sizing: border-box; - border: 1px solid #ccc; - border-radius: 2px; + font-family: inherit; + font-size: inherit; + -webkit-padding: 0.4em 0; + padding: 0.4em; + margin: 0 0 0.5em 0; + box-sizing: border-box; + border: 1px solid #ccc; + border-radius: 2px; } input:disabled { - color: #ccc; + color: #ccc; } button { - color: #333; - background-color: #f4f4f4; - outline: none; + color: #333; + background-color: #f4f4f4; + outline: none; } button:disabled { - color: #999; + color: #999; } button:not(:disabled):active { - background-color: #ddd; + background-color: #ddd; } button:focus { - border-color: #666; + border-color: #666; } /* custom part */ -form { +.formgrid { display: grid; grid-template-columns: auto 1fr; grid-gap: 1rem; @@ -72,12 +72,12 @@ form { margin-top: 1rem; } -label { +label, .filepath { grid-column: 1/2; text-transform: capitalize; } -input, button, textarea, .selecttier { +input, button, textarea, .selecttier, .relpath { grid-column: 2/3; } @@ -99,6 +99,7 @@ textarea { .tierline { display: flex; + align-items: baseline; } .tiertitle { @@ -110,3 +111,51 @@ textarea { margin-left: auto; padding-left: 0.2rem; } + +select { + align-self: start; + border: 0; + padding: 0.1rem; +} + +.selecttier { + margin-top: 0.5rem; +} + +.buttons button { + border: solid #999 1px; + padding: 0; + padding-left: 0.1rem; + padding-right: 0.1rem; + margin: 1px; +} + +.filepath { + font-size: large; + font-style: italic; + margin-bottom: 1rem; +} + +.relpath { + font-size: large; + font-weight: bold; +} + +.tierbox, #selecthas { + margin-top: 0.5rem; +} + +.fmHidden { + display: none; +} + +.fmShown { + display: grid; + grid-template-columns: auto 1fr; + grid-gap: 1rem; +} + +.togglefold { + margin-top: 1rem; + margin-bottom: 1rem; +} diff --git a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/singlebody.html b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/singlebody.html index 9e4eaf3..e598157 100644 --- a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/singlebody.html +++ b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/singlebody.html @@ -9,7 +9,8 @@ {{ $scratch := $s.Get $currentFile }} {{ $sandnamePlural := (slice) }} - +{{ $sandnameSingular := "" }} +{{ $mentionLink := "" }}
{{ substr $currentDir 0 -1 }}⁄{{ substr .Title 0 1 }}{{ substr .Title 1 }}
@@ -32,12 +33,17 @@ {{ $mentions := intersect $paramsKeys $sandnamePlural }} {{ range $mention := $mentions }} {{ range $k, $m := index $currentNode.Params $mention }} - {{ $mentionLink := printf "/%s/%s" (substr $mention 0 -1) $m }} + {{ range $k, $v := $.Site.Data.sandpointsnamegraph }} + {{ if eq $v $mention }} + {{ $mentionLink = printf "/%s/%s" $k $m }} + {{ $sandnameSingular = $k }} + {{ end }} + {{ end }} {{- with $.GetPage $mentionLink -}} {{- with not $k -}} {{ $closeDivs = true }}
-
{{ with (index $currentNode.Params $mention) }}{{ if gt (len (index $currentNode.Params $mention)) 1 }}{{ $mention }}{{ else }}{{ substr $mention 0 -1 }}{{ end }}{{ end }}⁄
+
{{ with (index $currentNode.Params $mention) }}{{ if gt (len (index $currentNode.Params $mention)) 1 }}{{ $mention }}{{ else }}{{ $sandnameSingular }}{{ end }}{{ end }}⁄
{{- end -}}
diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 1e1b505..83ac04a 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1,2 +1,2 @@ -# git.sandpoints.org/Drawwell/SandpointsTheme v0.0.0-20210518233224-555c8051a159 -# git.sandpoints.org/Drawwell/SandpointsEditPage v0.0.0-20210430215933-46a4decd1e9b +# git.sandpoints.org/Drawwell/SandpointsTheme v0.0.0-20210525005428-46407d6d7eae +# git.sandpoints.org/Drawwell/SandpointsEditPage v0.0.0-20210608103907-b24f80e496c9 diff --git a/config.toml b/config.toml index 4bac3b9..11807c0 100644 --- a/config.toml +++ b/config.toml @@ -33,7 +33,7 @@ disableKinds = ["RSS", "sitemap"] [module] # replacement allow for easier local development - replacements = ["git.sandpoints.org/Drawwell/SandpointsTheme -> /home/m/devel/SandpointsTheme", "git.sandpoints.org/Drawwell/SandpointsEditPage -> /home/m/devel/SandpointsEditPage"] + # replacements = ["git.sandpoints.org/Drawwell/SandpointsTheme -> /home/m/devel/SandpointsTheme", "git.sandpoints.org/Drawwell/SandpointsEditPage -> /home/m/devel/SandpointsEditPage"] [[module.imports]] path = "git.sandpoints.org/Drawwell/SandpointsTheme" [[module.imports.mounts]] @@ -78,7 +78,7 @@ disableKinds = ["RSS", "sitemap"] target = "static/edit/build/bundle.js.map" - # [[module.imports.mounts]] + # [[MODULE.imports.mounts]] # source = "customizations/Dotawo/assets/css/site.css" # target = "assets/css/site.css" # [[module.imports.mounts]]