Skip to content

Commit

Permalink
Changes as requested per review from Patrice Chalin (#871)
Browse files Browse the repository at this point in the history
  • Loading branch information
deining committed Feb 11, 2022
1 parent b1f4d84 commit 96604cb
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 39 deletions.
File renamed without changes.
4 changes: 0 additions & 4 deletions module/config.toml → dependencies/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ _merge = "deep"
[[module.mounts]]
source = "assets/bootstrap/scss/_vendor"
target = "assets/vendor/bootstrap/scss/vendor"
# mount user guide so that we can copy it to skeleton site
[[module.mounts]]
source = "userguide"
target = "assets/userguide"
# mount asserts directory
[[module.mounts]]
source = "assets"
Expand Down
3 changes: 3 additions & 0 deletions dependencies/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module github.com/google/docsy/dependencies

go 1.12
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ module github.com/google/docsy

go 1.12

//replace github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d => e4b42eecdf1d

require (
github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac // indirect
github.com/google/docsy/module v0.2.0-pre // indirect
github.com/google/docsy/dependencies v0.2.0-pre // indirect
github.com/twbs/bootstrap v4.6.1+incompatible // indirect
)
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac h1:AjwgwoaDsNEA1Wtc8pgw/BqG7SEk9bKxXPjEPQQ42vY=
github.com/FortAwesome/Font-Awesome v0.0.0-20210804190922-7d3d774145ac/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d h1:5f3AMLwAG2RrZrafxbbv1NE6EpGQkJCiSvJUkJVLYWc=
github.com/google/docsy/module v0.0.0-20220129185551-e4b42eecdf1d/go.mod h1:XSdPwCDtX3JK1d+wwDwQTSYQ2ZEHzghf/uhGIPoeDjw=
github.com/twbs/bootstrap v4.6.1+incompatible h1:75PsBfPU1SS65ag0Z3Cq6JNXVAfUNfB0oCLHh9k9Fu8=
github.com/twbs/bootstrap v4.6.1+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
3 changes: 0 additions & 3 deletions module/go.mod

This file was deleted.

1 change: 0 additions & 1 deletion module/module.go

This file was deleted.

35 changes: 9 additions & 26 deletions userguide/config.toml
Original file line number Diff line number Diff line change
@@ -1,39 +1,22 @@
baseURL = "/"
title = "Docsy Example"

enableRobotsTXT = true

# set docsy as theme, either locally or as module
theme = ["docsy"]
# theme = ["github.com/google/docsy", "github.com/google/docsy/module"]

# when using docsy as module, instead of using
# theme = ["github.com/google/docsy", "github.com/google/docsy/module"]
# you may alternatively use the declaration given below:
#[module]
# # uncomment lines below for temporary local development of module
# # replacements = "github.com/google/docsy -> ../../docsy"
# # replacements = "github.com/google/docsy/module -> ../../docsy"
# [module.hugoVersion]
# extended = true
# min = "0.73.0"
# [[module.imports]]
# # pull in docsy as hugo module
# path = "github.com/google/docsy"
# [[module.imports]]
# # pull in workaround and dependencies
# path = "github.com/google/docsy/module"

# Will give values to .Lastmod etc.
enableGitInfo = true

# Language settings
contentDir = "content/en"
defaultContentLanguage = "en"
defaultContentLanguageInSubdir = false
# Useful when translating.
enableMissingTranslationPlaceholders = true

enableRobotsTXT = true

# set docsy as theme, either locally or as hugo module
theme = ["docsy"]
# theme = ["github.com/google/docsy", "github.com/google/docsy/dependencies"]

# Will give values to .Lastmod etc.
enableGitInfo = true

# disableKinds = ["taxonomy", "taxonomyTerm"]

# Highlighting config
Expand Down

0 comments on commit 96604cb

Please sign in to comment.