Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: owncloud/product
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 840767d395f7e666bfa98f03dac7732cafee71ed
Choose a base ref
..
head repository: owncloud/product
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ae7f1631397381cf9bdd7f95823b8407995aff83
Choose a head ref
14 changes: 10 additions & 4 deletions .drone.star
Original file line number Diff line number Diff line change
@@ -23,10 +23,10 @@ def testing(ctx):
'steps': [
{
'name': 'build',
'image': 'klakegg/hugo:0.69.0-ext-alpine',
'image': 'owncloudci/hugo:0.69.2',
'pull': 'always',
'commands': [
'hugo-official',
'hugo',
],
},
{
@@ -58,10 +58,10 @@ def website(ctx):
'steps': [
{
'name': 'build',
'image': 'klakegg/hugo:0.69.0-ext-alpine',
'image': 'owncloudci/hugo:0.69.2',
'pull': 'always',
'commands': [
'hugo-official',
'hugo',
],
},
{
@@ -89,4 +89,10 @@ def website(ctx):
'depends_on': [
'testing',
],
'trigger': {
'ref': [
'refs/heads/master',
'refs/pull/**',
],
},
}
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -2,6 +2,8 @@ SHELL := bash
NAME := product
PUBLIC := public
RESOURCES := resources
THEME_DIR := hugo/themes/hugo-geekdoc
THEME_VERSION ?= v0.2.2

.PHONY: all
all: docs-build
@@ -20,3 +22,15 @@ docs: docs-build
.PHONY: docs-server
docs-server:
hugo -D server

.PHONY: theme-clean
theme-clean:
rm -rf $(THEME_DIR)

.PHONY: theme-sync
theme-sync:
mkdir -p $(THEME_DIR); \
curl -sSL https://github.com/xoxys/hugo-geekdoc/releases/download/$(THEME_VERSION)/hugo-geekdoc.tar.gz | tar -xz -C $(THEME_DIR)/ --strip-components=1

.PHONY: theme
theme: theme-clean theme-sync
3 changes: 0 additions & 3 deletions config.yaml
Original file line number Diff line number Diff line change
@@ -18,9 +18,6 @@ publishDir: public

# Needed for mermaid/katex shortcodes
markup:
goldmark:
renderer:
unsafe: true
tableOfContents:
startLevel: 1
endLevel: 9
3 changes: 0 additions & 3 deletions hugo/layouts/shortcodes/div.html

This file was deleted.

14 changes: 0 additions & 14 deletions hugo/layouts/shortcodes/include.html

This file was deleted.

5 changes: 0 additions & 5 deletions hugo/static/custom.css
Original file line number Diff line number Diff line change
@@ -81,11 +81,6 @@ a:visited,
color: #4e85c8;
}

.chroma .lntable td:first-child {
padding-right: .5em;
background-color: rgba(86,96,105,.1);

}
/* custom shortcodes */
/* button */
.gdoc-button { color: #495057; }
5 changes: 1 addition & 4 deletions hugo/themes/hugo-geekdoc/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
* BREAKING
* min Hugo version is now v0.65
* ENHANCEMENT
* update mermaid to v8.5.0
* update config documentation
* [#6](https://github.com/xoxys/hugo-geekdoc/pull/6) improve code block formatting
2 changes: 1 addition & 1 deletion hugo/themes/hugo-geekdoc/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2.0
v0.2.2
7 changes: 3 additions & 4 deletions hugo/themes/hugo-geekdoc/layouts/partials/title.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{{ $title := "" }}

{{ if .Title }}
{{ $title = .Title }}
{{ $title = .Title }}
{{ else if and .IsSection .File }}
{{ $sections := split (trim .File.Dir "/") "/" }}
{{ $title = index ($sections | last 1) 0 | humanize }}
{{ $title = path.Base .File.Dir | humanize | title }}
{{ else if and .IsPage .File }}
{{ $title = .File.BaseFileName | humanize | title }}
{{ $title = .File.BaseFileName | humanize | title }}
{{ end }}

{{ return $title }}
8 changes: 8 additions & 0 deletions hugo/themes/hugo-geekdoc/layouts/shortcodes/include.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{{$file := .Get "file"}}
{{- if eq (.Get "markdown") "true" -}}
{{- $file | readFile | markdownify -}}
{{- else if (.Get "language") -}}
{{- highlight ($file | readFile) (.Get "language") (default "linenos=table" (.Get "options")) -}}
{{- else -}}
{{ $file | readFile | safeHTML }}
{{- end -}}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/mstile-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/mstile-150x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/mstile-310x150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/mstile-310x310.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/favicon/mstile-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hugo/themes/hugo-geekdoc/static/fonts/GeekdocIcons.woff
Binary file not shown.
Binary file modified hugo/themes/hugo-geekdoc/static/fonts/GeekdocIcons.woff2
Binary file not shown.
12 changes: 8 additions & 4 deletions hugo/themes/hugo-geekdoc/static/main.css
Original file line number Diff line number Diff line change
@@ -845,7 +845,13 @@ img {
.chroma .lntable td:nth-child(2) code {
border-radius: 0;
border-top-right-radius: .15rem;
border-bottom-right-radius: .15rem
border-bottom-right-radius: .15rem;
padding-left: .5em
}
.chroma .lntable td:nth-child(2) code .hl {
width: auto;
margin-left: -.5em;
padding: 0 .5em
}
.highlight pre.chroma {
margin: 0
@@ -874,10 +880,8 @@ img {
overflow: auto;
display: block
}
.chroma .lntable td:first-child {
padding-right: .5em
}
.chroma .lntable td:first-child code {
background-color: #e9ecef;
border-right: 1px solid #dcdfe3;
padding: .5em 0
}
2 changes: 1 addition & 1 deletion hugo/themes/hugo-geekdoc/static/main.min.css

Large diffs are not rendered by default.