From bdb547fc46c12d8586b6339b4dd44095c3984d7b Mon Sep 17 00:00:00 2001 From: Adam Gospodarczyk Date: Wed, 27 Apr 2022 03:23:21 +0200 Subject: [PATCH] Updated styles --- assets/js/graph.js | 13 ++++++------- assets/styles/custom.scss | 32 ++++++++++++++++++++++++++++++++ data/graphConfig.yaml | 2 +- layouts/404.html | 1 - layouts/_default/section.html | 1 - layouts/_default/single.html | 1 - layouts/_default/taxonomy.html | 1 - layouts/_default/term.html | 1 - layouts/index.html | 1 - layouts/partials/backlinks.html | 4 ++-- layouts/partials/footer.html | 7 ++++--- layouts/partials/graph.html | 2 +- layouts/partials/head.html | 4 ++-- layouts/partials/toc.html | 4 ++-- 14 files changed, 50 insertions(+), 24 deletions(-) diff --git a/assets/js/graph.js b/assets/js/graph.js index f0b1f7f6f..49c9b298c 100644 --- a/assets/js/graph.js +++ b/assets/js/graph.js @@ -70,11 +70,11 @@ async function drawGraph(url, baseUrl, pathColors, depth, enableDrag, enableLege .on("end", enableDrag ? dragended : noop); } - const height = 250 + const height = 450 const width = document.getElementById("graph-container").offsetWidth const simulation = d3.forceSimulation(data.nodes) - .force("charge", d3.forceManyBody().strength(-30)) + .force("charge", d3.forceManyBody().strength(-2000)) .force("link", d3.forceLink(data.links).id(d => d.id)) .force("center", d3.forceCenter()); @@ -86,8 +86,8 @@ async function drawGraph(url, baseUrl, pathColors, depth, enableDrag, enableLege if (enableLegend) { const legend = [ - { "Current": "var(--g-node-active)" }, - { "Note": "var(--g-node)" }, + { "Aktualna strona": "var(--g-node-active)" }, + { "Notatka": "var(--g-node)" }, ...pathColors ] legend.forEach((legendEntry, i) => { @@ -186,7 +186,7 @@ async function drawGraph(url, baseUrl, pathColors, depth, enableDrag, enableLege .attr("dx", 12) .attr("dy", ".35em") .text((d) => content[d.id]?.title || d.id.replace("-", " ")) - .style("opacity", 0) + .style("opacity", 1) .style("pointer-events", "none") .call(drag(simulation)); @@ -194,8 +194,7 @@ async function drawGraph(url, baseUrl, pathColors, depth, enableDrag, enableLege if (enableZoom) { svg.call(d3.zoom() - .extent([[0, 0], [width, height]]) - .scaleExtent([0.25, 4]) + .extent([[5, 5], [width, height]]) .on("zoom", ({ transform }) => { link.attr("transform", transform); node.attr("transform", transform); diff --git a/assets/styles/custom.scss b/assets/styles/custom.scss index ef97c04a5..cd0624edb 100644 --- a/assets/styles/custom.scss +++ b/assets/styles/custom.scss @@ -65,12 +65,44 @@ body, body.theme-dark { article a { color: rgb(238, 27, 231); background: none; } +a:hover { + color: #ee1be7 !important; text-decoration: underline !important; +} article a.internal-link { background: none; } article h2 { margin-top: 2rem; } +p, article, article p, article li, article a, .page-end>.backlinks-container>ul>li { + font-family: "Poppins", sans-serif; + line-height: 29px; + font-size: 16px; + font-weight: 500; +} + +#TableOfContents>ol>li::marker { + font-family: "Poppins", sans-serif; +} + +header { justify-content: space-between; } +header>.spacer { display: none; } + +.mainTOC { + margin: 1rem 0; cursor: pointer; +} +.mainTOC details summary, .mainTOC details[open] summary { + color: #888; cursor: pointer; +} + +h1 a, h2 a, h3 a, h4 a, h5 a, h6 a, ol a, ul a, thead a { + font-family: "Poppins", sans-serif; + font-weight: revert; + margin: revert; + padding: revert; + font-size: inherit; +} + body.theme-dark h1, body.theme-dark h2, body.theme-dark h3, diff --git a/data/graphConfig.yaml b/data/graphConfig.yaml index 3f8d3fb6b..e5a708982 100644 --- a/data/graphConfig.yaml +++ b/data/graphConfig.yaml @@ -3,4 +3,4 @@ enableDrag: true enableZoom: true depth: -1 # set to -1 to show full graph paths: - - /moc: "#4388cc" \ No newline at end of file + - /moc: "#4388cc" diff --git a/layouts/404.html b/layouts/404.html index 424839502..ed820af5e 100644 --- a/layouts/404.html +++ b/layouts/404.html @@ -4,7 +4,6 @@
- {{partial "darkmode.html" .}}

404.

Hey! You look a little lost. This page doesn't exist (or may be private).

diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 1a4aae058..1b6417544 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -10,7 +10,6 @@

{{ .Site.Data.config.page_title }}

Search IconIcon to open search
- {{partial "darkmode.html" .}}

All {{.Title}}

diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 45c34eefe..54a3d3748 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -10,7 +10,6 @@

{{ .Site.Data.config.page_title }}

Search IconIcon to open search
- {{partial "darkmode.html" .}}
{{if .Title}}

{{ .Title }}

{{end}} diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html index b7a45b10f..e3027274b 100644 --- a/layouts/_default/taxonomy.html +++ b/layouts/_default/taxonomy.html @@ -10,7 +10,6 @@

{{ .Site.Data.config.page_title }}

Search IconIcon to open search
- {{partial "darkmode.html" .}}

All {{.Title}}

diff --git a/layouts/_default/term.html b/layouts/_default/term.html index 16ea85cf8..69b27f0fd 100644 --- a/layouts/_default/term.html +++ b/layouts/_default/term.html @@ -10,7 +10,6 @@

{{ .Site.Data.config.page_title }}

Search IconIcon to open search
- {{partial "darkmode.html" .}}

Tag: {{.Title | humanize}}

diff --git a/layouts/index.html b/layouts/index.html index a1cde288d..0be3801a7 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -9,7 +9,6 @@

{{if .Title}}{{ .Title }}{{else}}Untitled{{end}}

Search IconIcon to open search
- {{partial "darkmode.html" .}}
{{partial "toc.html" .}} diff --git a/layouts/partials/backlinks.html b/layouts/partials/backlinks.html index 425ec67cf..cdca0677f 100644 --- a/layouts/partials/backlinks.html +++ b/layouts/partials/backlinks.html @@ -1,4 +1,4 @@ -

Backlinks

+

Powiązania

    {{$url := urls.Parse .Site.BaseURL }} {{$host := strings.TrimRight "/" $url.Path }} @@ -18,7 +18,7 @@ {{- end -}} {{else}}
  • - No backlinks found + Brak powiązań
    • {{end}}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 317372d24..cbdb8f75c 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,10 +1,11 @@
+{{partial "graph.html" .}}
{{partial "backlinks.html" .}}
- {{partial "graph.html" .}} +
@@ -22,8 +23,8 @@ } else { link.textContent = newContent; } - + }) })() - \ No newline at end of file + diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html index ca379689b..8a7096b36 100644 --- a/layouts/partials/graph.html +++ b/layouts/partials/graph.html @@ -1,5 +1,5 @@ -

Interactive Graph

+

Mapa treści