diff options
author | Ian Lewis <ianmlewis@gmail.com> | 2019-04-17 14:43:35 -0400 |
---|---|---|
committer | Ian Lewis <ianlewis@google.com> | 2019-04-23 11:51:39 +0900 |
commit | c010346c76457ed89b658e6030dd597cc5d6dcca (patch) | |
tree | c59c4a5b010b95eae46625e0127f4554d48631a5 /themes/docsy | |
parent | 45028bdd82ca3f54d8bb0e99330b1bab6e64cb78 (diff) |
Updated docsy to HEAD
- Docsy has support for the _styles_project.scss file now so we don't need
to override main.scss anymore.
- Docsy doc edit links now work for non-multilingual sites so we don't
need to override page-meta-links.html anymore.
Diffstat (limited to 'themes/docsy')
22 files changed, 16 insertions, 4 deletions
diff --git a/themes/docsy/assets/scss/_styles_project.scss b/themes/docsy/assets/scss/_styles_project.scss new file mode 100644 index 000000000..ab68a8844 --- /dev/null +++ b/themes/docsy/assets/scss/_styles_project.scss @@ -0,0 +1,7 @@ +/* + +Nothing defined here. The Hugo project that uses this theme can override Bootstrap by adding a file to: + +assets/scss/_styles_project.scss + +*/ diff --git a/themes/docsy/assets/scss/_variables_project.scss b/themes/docsy/assets/scss/_variables_project.scss index 69ee04629..387082dca 100644 --- a/themes/docsy/assets/scss/_variables_project.scss +++ b/themes/docsy/assets/scss/_variables_project.scss @@ -1,7 +1,7 @@ /* -Nothing defined here. The Hugo project that uses this theme can override Bootstrap and theme variables by adding a file to: +Nothing defined here. The Hugo project that uses this theme can override theme variables by adding a file to: assets/scss/_variables_project.scss -*/
\ No newline at end of file +*/ diff --git a/themes/docsy/assets/scss/main.scss b/themes/docsy/assets/scss/main.scss index 909935b4d..66c036c7b 100644 --- a/themes/docsy/assets/scss/main.scss +++ b/themes/docsy/assets/scss/main.scss @@ -53,4 +53,6 @@ footer { height: 5rem; visibility: hidden; } -}
\ No newline at end of file +} + +@import "styles_project"; diff --git a/themes/docsy/layouts/partials/page-meta-links.html b/themes/docsy/layouts/partials/page-meta-links.html index b8e0925b5..0f18b1e37 100644 --- a/themes/docsy/layouts/partials/page-meta-links.html +++ b/themes/docsy/layouts/partials/page-meta-links.html @@ -2,7 +2,10 @@ {{ $gh_repo := ($.Param "github_repo") }} {{ if $gh_repo }} <div class="td-page-meta ml-2 pb-1 pt-2 mb-0"> -{{ $editURL := printf "%s/edit/master/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }} +{{ $editURL := printf "%s/edit/master/content/%s" $gh_repo .Path }} +{{ if .Site.IsMultiLingual }} +{{ $editURL = printf "%s/edit/master/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }} +{{ end }} {{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (htmlEscape $.Title )}} <a href="{{ $editURL }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a> <a href="{{ $issuesURL }}" target="_blank"><i class="fab fa-github fa-fw"></i> {{ T "post_create_issue" }}</a> diff --git a/themes/docsy/static/favicons/android-144x144.png b/themes/docsy/static/favicons/android-144x144.png Binary files differindex b65a18405..8851c09a4 100644..100755 --- a/themes/docsy/static/favicons/android-144x144.png +++ b/themes/docsy/static/favicons/android-144x144.png diff --git a/themes/docsy/static/favicons/android-192x192.png b/themes/docsy/static/favicons/android-192x192.png Binary files differindex 6cbdc25ec..94b2ad2db 100644..100755 --- a/themes/docsy/static/favicons/android-192x192.png +++ b/themes/docsy/static/favicons/android-192x192.png diff --git a/themes/docsy/static/favicons/android-36x36.png b/themes/docsy/static/favicons/android-36x36.png Binary files differindex 3321febae..7ec5cf650 100644..100755 --- a/themes/docsy/static/favicons/android-36x36.png +++ b/themes/docsy/static/favicons/android-36x36.png diff --git a/themes/docsy/static/favicons/android-48x48.png b/themes/docsy/static/favicons/android-48x48.png Binary files differindex 0e93c9e56..419a445ad 100644..100755 --- a/themes/docsy/static/favicons/android-48x48.png +++ b/themes/docsy/static/favicons/android-48x48.png diff --git a/themes/docsy/static/favicons/android-72x72.png b/themes/docsy/static/favicons/android-72x72.png Binary files differindex fdc0453d3..230b18fd5 100644..100755 --- a/themes/docsy/static/favicons/android-72x72.png +++ b/themes/docsy/static/favicons/android-72x72.png diff --git a/themes/docsy/static/favicons/android-96x196.png b/themes/docsy/static/favicons/android-96x196.png Binary files differindex 997d5e35a..8cc698973 100644..100755 --- a/themes/docsy/static/favicons/android-96x196.png +++ b/themes/docsy/static/favicons/android-96x196.png diff --git a/themes/docsy/static/favicons/apple-touch-icon-180x180.png b/themes/docsy/static/favicons/apple-touch-icon-180x180.png Binary files differindex 0d2d95cbf..03d0b5134 100644..100755 --- a/themes/docsy/static/favicons/apple-touch-icon-180x180.png +++ b/themes/docsy/static/favicons/apple-touch-icon-180x180.png diff --git a/themes/docsy/static/favicons/favicon-1024.png b/themes/docsy/static/favicons/favicon-1024.png Binary files differindex c65839bbe..920f10720 100644 --- a/themes/docsy/static/favicons/favicon-1024.png +++ b/themes/docsy/static/favicons/favicon-1024.png diff --git a/themes/docsy/static/favicons/favicon-16x16.png b/themes/docsy/static/favicons/favicon-16x16.png Binary files differindex dfbcd7a07..ce918ee3a 100644..100755 --- a/themes/docsy/static/favicons/favicon-16x16.png +++ b/themes/docsy/static/favicons/favicon-16x16.png diff --git a/themes/docsy/static/favicons/favicon-256.png b/themes/docsy/static/favicons/favicon-256.png Binary files differindex 944522e18..ebd3f8c98 100644 --- a/themes/docsy/static/favicons/favicon-256.png +++ b/themes/docsy/static/favicons/favicon-256.png diff --git a/themes/docsy/static/favicons/favicon-32x32.png b/themes/docsy/static/favicons/favicon-32x32.png Binary files differindex 58b2ce3f3..e95c80ad6 100644..100755 --- a/themes/docsy/static/favicons/favicon-32x32.png +++ b/themes/docsy/static/favicons/favicon-32x32.png diff --git a/themes/docsy/static/favicons/favicon.ico b/themes/docsy/static/favicons/favicon.ico Binary files differindex 1275d6996..216330ff2 100644..100755 --- a/themes/docsy/static/favicons/favicon.ico +++ b/themes/docsy/static/favicons/favicon.ico diff --git a/themes/docsy/static/favicons/pwa-192x192.png b/themes/docsy/static/favicons/pwa-192x192.png Binary files differindex 6cbdc25ec..94b2ad2db 100644..100755 --- a/themes/docsy/static/favicons/pwa-192x192.png +++ b/themes/docsy/static/favicons/pwa-192x192.png diff --git a/themes/docsy/static/favicons/pwa-512x512.png b/themes/docsy/static/favicons/pwa-512x512.png Binary files differindex 384c8b603..89258a4e6 100644..100755 --- a/themes/docsy/static/favicons/pwa-512x512.png +++ b/themes/docsy/static/favicons/pwa-512x512.png diff --git a/themes/docsy/static/favicons/tile150x150.png b/themes/docsy/static/favicons/tile150x150.png Binary files differindex 53ff09748..3d0c7604e 100644..100755 --- a/themes/docsy/static/favicons/tile150x150.png +++ b/themes/docsy/static/favicons/tile150x150.png diff --git a/themes/docsy/static/favicons/tile310x150.png b/themes/docsy/static/favicons/tile310x150.png Binary files differindex 104925c6d..ed8904286 100644..100755 --- a/themes/docsy/static/favicons/tile310x150.png +++ b/themes/docsy/static/favicons/tile310x150.png diff --git a/themes/docsy/static/favicons/tile310x310.png b/themes/docsy/static/favicons/tile310x310.png Binary files differindex 267f13ec8..67172b306 100644..100755 --- a/themes/docsy/static/favicons/tile310x310.png +++ b/themes/docsy/static/favicons/tile310x310.png diff --git a/themes/docsy/static/favicons/tile70x70.png b/themes/docsy/static/favicons/tile70x70.png Binary files differindex 1894ab4d6..31413a2be 100644..100755 --- a/themes/docsy/static/favicons/tile70x70.png +++ b/themes/docsy/static/favicons/tile70x70.png |