From c010346c76457ed89b658e6030dd597cc5d6dcca Mon Sep 17 00:00:00 2001 From: Ian Lewis Date: Wed, 17 Apr 2019 14:43:35 -0400 Subject: 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. --- themes/docsy/assets/scss/_styles_project.scss | 7 +++++++ themes/docsy/assets/scss/_variables_project.scss | 4 ++-- themes/docsy/assets/scss/main.scss | 4 +++- themes/docsy/layouts/partials/page-meta-links.html | 5 ++++- themes/docsy/static/favicons/android-144x144.png | Bin 3787 -> 4299 bytes themes/docsy/static/favicons/android-192x192.png | Bin 5841 -> 5264 bytes themes/docsy/static/favicons/android-36x36.png | Bin 854 -> 980 bytes themes/docsy/static/favicons/android-48x48.png | Bin 1254 -> 1071 bytes themes/docsy/static/favicons/android-72x72.png | Bin 1713 -> 1926 bytes themes/docsy/static/favicons/android-96x196.png | Bin 2611 -> 2309 bytes .../static/favicons/apple-touch-icon-180x180.png | Bin 5296 -> 4748 bytes themes/docsy/static/favicons/favicon-1024.png | Bin 48098 -> 27759 bytes themes/docsy/static/favicons/favicon-16x16.png | Bin 367 -> 498 bytes themes/docsy/static/favicons/favicon-256.png | Bin 6884 -> 8037 bytes themes/docsy/static/favicons/favicon-32x32.png | Bin 719 -> 807 bytes themes/docsy/static/favicons/favicon.ico | Bin 1150 -> 1150 bytes themes/docsy/static/favicons/pwa-192x192.png | Bin 5841 -> 5264 bytes themes/docsy/static/favicons/pwa-512x512.png | Bin 18491 -> 20743 bytes themes/docsy/static/favicons/tile150x150.png | Bin 7789 -> 8985 bytes themes/docsy/static/favicons/tile310x150.png | Bin 11422 -> 11661 bytes themes/docsy/static/favicons/tile310x310.png | Bin 20871 -> 23621 bytes themes/docsy/static/favicons/tile70x70.png | Bin 3179 -> 3592 bytes 22 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 themes/docsy/assets/scss/_styles_project.scss mode change 100644 => 100755 themes/docsy/static/favicons/android-144x144.png mode change 100644 => 100755 themes/docsy/static/favicons/android-192x192.png mode change 100644 => 100755 themes/docsy/static/favicons/android-36x36.png mode change 100644 => 100755 themes/docsy/static/favicons/android-48x48.png mode change 100644 => 100755 themes/docsy/static/favicons/android-72x72.png mode change 100644 => 100755 themes/docsy/static/favicons/android-96x196.png mode change 100644 => 100755 themes/docsy/static/favicons/apple-touch-icon-180x180.png mode change 100644 => 100755 themes/docsy/static/favicons/favicon-16x16.png mode change 100644 => 100755 themes/docsy/static/favicons/favicon-32x32.png mode change 100644 => 100755 themes/docsy/static/favicons/favicon.ico mode change 100644 => 100755 themes/docsy/static/favicons/pwa-192x192.png mode change 100644 => 100755 themes/docsy/static/favicons/pwa-512x512.png mode change 100644 => 100755 themes/docsy/static/favicons/tile150x150.png mode change 100644 => 100755 themes/docsy/static/favicons/tile310x150.png mode change 100644 => 100755 themes/docsy/static/favicons/tile310x310.png mode change 100644 => 100755 themes/docsy/static/favicons/tile70x70.png (limited to 'themes/docsy') 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 }}
-{{ $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 )}} {{ T "post_edit_this" }} {{ T "post_create_issue" }} diff --git a/themes/docsy/static/favicons/android-144x144.png b/themes/docsy/static/favicons/android-144x144.png old mode 100644 new mode 100755 index b65a18405..8851c09a4 Binary files a/themes/docsy/static/favicons/android-144x144.png and b/themes/docsy/static/favicons/android-144x144.png differ diff --git a/themes/docsy/static/favicons/android-192x192.png b/themes/docsy/static/favicons/android-192x192.png old mode 100644 new mode 100755 index 6cbdc25ec..94b2ad2db Binary files a/themes/docsy/static/favicons/android-192x192.png and b/themes/docsy/static/favicons/android-192x192.png differ diff --git a/themes/docsy/static/favicons/android-36x36.png b/themes/docsy/static/favicons/android-36x36.png old mode 100644 new mode 100755 index 3321febae..7ec5cf650 Binary files a/themes/docsy/static/favicons/android-36x36.png and b/themes/docsy/static/favicons/android-36x36.png differ diff --git a/themes/docsy/static/favicons/android-48x48.png b/themes/docsy/static/favicons/android-48x48.png old mode 100644 new mode 100755 index 0e93c9e56..419a445ad Binary files a/themes/docsy/static/favicons/android-48x48.png and b/themes/docsy/static/favicons/android-48x48.png differ diff --git a/themes/docsy/static/favicons/android-72x72.png b/themes/docsy/static/favicons/android-72x72.png old mode 100644 new mode 100755 index fdc0453d3..230b18fd5 Binary files a/themes/docsy/static/favicons/android-72x72.png and b/themes/docsy/static/favicons/android-72x72.png differ diff --git a/themes/docsy/static/favicons/android-96x196.png b/themes/docsy/static/favicons/android-96x196.png old mode 100644 new mode 100755 index 997d5e35a..8cc698973 Binary files a/themes/docsy/static/favicons/android-96x196.png and b/themes/docsy/static/favicons/android-96x196.png differ diff --git a/themes/docsy/static/favicons/apple-touch-icon-180x180.png b/themes/docsy/static/favicons/apple-touch-icon-180x180.png old mode 100644 new mode 100755 index 0d2d95cbf..03d0b5134 Binary files a/themes/docsy/static/favicons/apple-touch-icon-180x180.png and b/themes/docsy/static/favicons/apple-touch-icon-180x180.png differ diff --git a/themes/docsy/static/favicons/favicon-1024.png b/themes/docsy/static/favicons/favicon-1024.png index c65839bbe..920f10720 100644 Binary files a/themes/docsy/static/favicons/favicon-1024.png and b/themes/docsy/static/favicons/favicon-1024.png differ diff --git a/themes/docsy/static/favicons/favicon-16x16.png b/themes/docsy/static/favicons/favicon-16x16.png old mode 100644 new mode 100755 index dfbcd7a07..ce918ee3a Binary files a/themes/docsy/static/favicons/favicon-16x16.png and b/themes/docsy/static/favicons/favicon-16x16.png differ diff --git a/themes/docsy/static/favicons/favicon-256.png b/themes/docsy/static/favicons/favicon-256.png index 944522e18..ebd3f8c98 100644 Binary files a/themes/docsy/static/favicons/favicon-256.png and b/themes/docsy/static/favicons/favicon-256.png differ diff --git a/themes/docsy/static/favicons/favicon-32x32.png b/themes/docsy/static/favicons/favicon-32x32.png old mode 100644 new mode 100755 index 58b2ce3f3..e95c80ad6 Binary files a/themes/docsy/static/favicons/favicon-32x32.png and b/themes/docsy/static/favicons/favicon-32x32.png differ diff --git a/themes/docsy/static/favicons/favicon.ico b/themes/docsy/static/favicons/favicon.ico old mode 100644 new mode 100755 index 1275d6996..216330ff2 Binary files a/themes/docsy/static/favicons/favicon.ico and b/themes/docsy/static/favicons/favicon.ico differ diff --git a/themes/docsy/static/favicons/pwa-192x192.png b/themes/docsy/static/favicons/pwa-192x192.png old mode 100644 new mode 100755 index 6cbdc25ec..94b2ad2db Binary files a/themes/docsy/static/favicons/pwa-192x192.png and b/themes/docsy/static/favicons/pwa-192x192.png differ diff --git a/themes/docsy/static/favicons/pwa-512x512.png b/themes/docsy/static/favicons/pwa-512x512.png old mode 100644 new mode 100755 index 384c8b603..89258a4e6 Binary files a/themes/docsy/static/favicons/pwa-512x512.png and b/themes/docsy/static/favicons/pwa-512x512.png differ diff --git a/themes/docsy/static/favicons/tile150x150.png b/themes/docsy/static/favicons/tile150x150.png old mode 100644 new mode 100755 index 53ff09748..3d0c7604e Binary files a/themes/docsy/static/favicons/tile150x150.png and b/themes/docsy/static/favicons/tile150x150.png differ diff --git a/themes/docsy/static/favicons/tile310x150.png b/themes/docsy/static/favicons/tile310x150.png old mode 100644 new mode 100755 index 104925c6d..ed8904286 Binary files a/themes/docsy/static/favicons/tile310x150.png and b/themes/docsy/static/favicons/tile310x150.png differ diff --git a/themes/docsy/static/favicons/tile310x310.png b/themes/docsy/static/favicons/tile310x310.png old mode 100644 new mode 100755 index 267f13ec8..67172b306 Binary files a/themes/docsy/static/favicons/tile310x310.png and b/themes/docsy/static/favicons/tile310x310.png differ diff --git a/themes/docsy/static/favicons/tile70x70.png b/themes/docsy/static/favicons/tile70x70.png old mode 100644 new mode 100755 index 1894ab4d6..31413a2be Binary files a/themes/docsy/static/favicons/tile70x70.png and b/themes/docsy/static/favicons/tile70x70.png differ -- cgit v1.2.3