Skip to content

Commit

Permalink
Fix site layouts after formatting (#1962)
Browse files Browse the repository at this point in the history
Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
  • Loading branch information
avgustinmm authored Nov 7, 2024
1 parent 0235542 commit 2bb1611
Show file tree
Hide file tree
Showing 12 changed files with 400 additions and 453 deletions.
5 changes: 5 additions & 0 deletions intellij_codeformatter.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@
<SqlCodeStyleSettings version="7">
<option name="DISABLE_FORMATTING" value="true"/>
</SqlCodeStyleSettings>
<codeStyleSettings language="HTML">
<arrangement>
<rules/>
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="RIGHT_MARGIN" value="144"/>
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1"/>
Expand Down
1 change: 1 addition & 0 deletions site/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
content/rest-api/*.json
content/rest-api/*.html
content/rest-api/*.yaml
static/rest-api/*.html
# npm leftover
node_modules
package.json
Expand Down
116 changes: 58 additions & 58 deletions site/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,95 +16,95 @@ metadataformat = "toml"
canonifyurls = false

[markup]
[markup.goldmark]
[markup.goldmark.extensions]
typographer = true
[markup.goldmark.renderer]
unsafe = true
[markup.goldmark]
[markup.goldmark.extensions]
typographer = true
[markup.goldmark.renderer]
unsafe = true

[markup.highlight]
codeFences = false
codeFences = false

[params]
# General information
author = "The Eclipse hawkBit Project"
description = "IoT. Update. Device."
copyright = "The Eclipse hawkBit Project"
logo = "images/hawkbit_icon.png"
favicon = "images/favicon.ico"
# General information
author = "The Eclipse hawkBit Project"
description = "IoT. Update. Device."
copyright = "The Eclipse hawkBit Project"
logo = "images/hawkbit_icon.png"
favicon = "images/favicon.ico"

# Repository
provider = "GitHub"
repo_url = "https://github.com/eclipse-hawkbit/hawkbit"
# Repository
provider = "GitHub"
repo_url = "https://github.com/eclipse-hawkbit/hawkbit"

permalink = "#"
permalink = "#"

# Custom assets
custom_css = ["css/hawkbit.css", "//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css"]
custom_js = []
# Custom assets
custom_css = ["css/hawkbit.css","//www.eclipse.org/eclipse.org-common/themes/solstice/public/stylesheets/vendor/cookieconsent/cookieconsent.min.css"]
custom_js = []

# Syntax highlighting theme
highlight_css = ""
# Syntax highlighting theme
highlight_css = ""

[params.palette]
primary = "deep-purple"
accent = "light-green"
primary = "deep-purple"
accent = "light-green"

[params.font]
text = "Ubuntu"
code = "Ubuntu Mono"
text = "Ubuntu"
code = "Ubuntu Mono"

[social]
github = "eclipse/hawkbit"
gitter = "eclipse/hawkbit"
docker = "hawkbit"
github = "eclipse/hawkbit"
gitter = "eclipse/hawkbit"
docker = "hawkbit"

[[menu.main]]
name = "What is hawkBit"
url = "/whatishawkbit/"
weight = 10
name = "What is hawkBit"
url = "/whatishawkbit/"
weight = 10

[[menu.main]]
name = "Getting started"
url = "/gettingstarted/"
weight = 20
name = "Getting started"
url = "/gettingstarted/"
weight = 20

[[menu.main]]
name = "Guides"
url = "/guides/"
weight = 30
name = "Guides"
url = "/guides/"
weight = 30

[[menu.main]]
name = "Features"
url = "/features/"
weight = 40
name = "Features"
url = "/features/"
weight = 40

[[menu.main]]
name = "Concepts"
url = "/concepts/"
weight = 50
name = "Concepts"
url = "/concepts/"
weight = 50

[[menu.main]]
name = "Architecture"
url = "/architecture/"
weight = 60
name = "Architecture"
url = "/architecture/"
weight = 60

[[menu.main]]
name = "APIs"
url = "/apis/"
weight = 80
name = "APIs"
url = "/apis/"
weight = 80

[[menu.main]]
name = "Release notes"
url = "/release-notes/"
weight = 90
name = "Release notes"
url = "/release-notes/"
weight = 90

[[menu.main]]
name = "Blog"
url = "/blog/"
weight = 100
name = "Blog"
url = "/blog/"
weight = 100

[[menu.main]]
name = "Community"
url = "/community/"
weight = 110
name = "Community"
url = "/community/"
weight = 110
74 changes: 37 additions & 37 deletions site/layouts/_default/list.html
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
{{ partial "head" . }}

{{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
{{ .Scratch.Set "repo_id" $repo_id }}
{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
{{ .Scratch.Set "repo_id" $repo_id }}
{{ end }}

<div class="backdrop">
<div class="backdrop-paper"></div>
<div class="backdrop-paper"></div>
</div>

<input class="toggle" id="toggle-drawer" type="checkbox">
<input class="toggle" id="toggle-search" type="checkbox">
<input class="toggle" type="checkbox" id="toggle-drawer">
<input class="toggle" type="checkbox" id="toggle-search">
<label class="toggle-button overlay" for="toggle-drawer"></label>

<header class="header">
{{ partial "header" . }}
{{ partial "header" . }}
</header>

<main class="main">
<div class="drawer">
{{ partial "drawer" . }}
</div>

<article class="article">
<div class="wrapper">
<h1>Pages in {{ .Title }}</h1>

{{ range .Data.Pages }}
<a href="{{ .Permalink }}" title="{{ .Title }}">
<h2>{{ .Title }}</h2>
</a>

<br>
{{ printf "%s" .Summary | markdownify }} <br><a href="{{ .Permalink }}">[...]</a>

<hr>
{{ end }}

{{ partial "copyright.html" . }}
</div>
</article>

<div aria-live="polite" class="results" role="status">
<div class="scrollable">
<div class="wrapper">
<div class="meta"></div>
<div class="list"></div>
</div>
</div>
</div>
<div class="drawer">
{{ partial "drawer" . }}
</div>

<article class="article">
<div class="wrapper">
<h1>Pages in {{ .Title }}</h1>

{{ range .Data.Pages }}
<a href="{{ .Permalink }}" title="{{ .Title }}">
<h2>{{ .Title }}</h2>
</a>

<br>
{{ printf "%s" .Summary | markdownify }} <br><a href="{{ .Permalink }}">[...]</a>

<hr>
{{ end }}

{{ partial "copyright.html" . }}
</div>
</article>

<div class="results" role="status" aria-live="polite">
<div class="scrollable">
<div class="wrapper">
<div class="meta"></div>
<div class="list"></div>
</div>
</div>
</div>
</main>

{{ partial "footer_js" . }}
64 changes: 32 additions & 32 deletions site/layouts/_default/single.html
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
{{ partial "head" . }}

{{ if (eq (trim .Site.Params.provider " " | lower) "github") | and (isset .Site.Params "repo_url") }}
{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
{{ .Scratch.Set "repo_id" $repo_id }}
{{ $repo_id := replace .Site.Params.repo_url "https://github.com/" ""}}
{{ .Scratch.Set "repo_id" $repo_id }}
{{ end }}

<div class="backdrop">
<div class="backdrop-paper"></div>
<div class="backdrop-paper"></div>
</div>

<input class="toggle" id="toggle-drawer" type="checkbox">
<input class="toggle" id="toggle-search" type="checkbox">
<input class="toggle" type="checkbox" id="toggle-drawer">
<input class="toggle" type="checkbox" id="toggle-search">
<label class="toggle-button overlay" for="toggle-drawer"></label>

<header class="header">
{{ partial "header" . }}
{{ partial "header" . }}
</header>

<main class="main">
<div class="drawer">
{{ partial "drawer" . }}
</div>

<article class="article">
<div class="wrapper">
<h1>{{ .Title }} {{ if .Draft }} (Draft){{ end }}</h1>

{{ .Content }}

{{ partial "copyright.html" . }}

<footer class="footer">
{{ partial "footer" . }}
</footer>
</div>
</article>

<div aria-live="polite" class="results" role="status">
<div class="scrollable">
<div class="wrapper">
<div class="meta"></div>
<div class="list"></div>
</div>
</div>
</div>
<div class="drawer">
{{ partial "drawer" . }}
</div>

<article class="article">
<div class="wrapper">
<h1>{{ .Title }} {{ if .Draft }} (Draft){{ end }}</h1>

{{ .Content }}

{{ partial "copyright.html" . }}

<footer class="footer">
{{ partial "footer" . }}
</footer>
</div>
</article>

<div class="results" role="status" aria-live="polite">
<div class="scrollable">
<div class="wrapper">
<div class="meta"></div>
<div class="list"></div>
</div>
</div>
</div>
</main>

{{ partial "footer_js" . }}
Loading

0 comments on commit 2bb1611

Please sign in to comment.