diff --git a/.gitignore b/.gitignore index 40da2e53..f0da88ad 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,6 @@ Temporary Items # Jekyll .jekyll-cache _site -vendor \ No newline at end of file +vendor +Gemifile +Gemfile.lock diff --git a/Gemfile b/Gemfile index d08d3e6f..6bafa7dd 100644 --- a/Gemfile +++ b/Gemfile @@ -3,4 +3,5 @@ source "https://rubygems.org" gem "jekyll-seo-tag" -gem "jekyll-remote-theme", github: "benbalter/jekyll-remote-theme", branch: "master" \ No newline at end of file +gem "jekyll-remote-theme", github: "benbalter/jekyll-remote-theme", branch: "master" +gem "sass-embedded", "~> 1.60.0" # Specify a version compatible and available \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 69296789..01f69f1d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,4 +81,4 @@ DEPENDENCIES jekyll-seo-tag BUNDLED WITH - 2.3.9 + 2.3.9 \ No newline at end of file diff --git a/_includes/resources-inc/footer.html b/_includes/resources-inc/footer.html index baa24023..8461defe 100644 --- a/_includes/resources-inc/footer.html +++ b/_includes/resources-inc/footer.html @@ -3,9 +3,20 @@ {%- if page.script.first -%} {%- for js in page.script -%} - + {%- endfor -%} {%- elsif page.script -%} - + {%- endif -%} -{% if site.analytics.adobe %}{% include /providers/adobefooter.html %}{% endif %} \ No newline at end of file +{% if site.analytics.adobe %}{% include /providers/adobefooter.html %}{% endif %} + \ No newline at end of file diff --git a/_includes/resources-inc/head.html b/_includes/resources-inc/head.html new file mode 100644 index 00000000..dbb48fb9 --- /dev/null +++ b/_includes/resources-inc/head.html @@ -0,0 +1,17 @@ + + + +{%- if page.css.first -%} + {%- for sheet in page.css -%} + {%- if sheet.first -%} + + {%- elsif sheet -%} + + {%- endif -%} + {%- endfor -%} +{%- elsif page.css -%} + +{%- endif -%} + \ No newline at end of file diff --git a/_layouts/core.html b/_layouts/core.html index 733eb196..2b906573 100644 --- a/_layouts/core.html +++ b/_layouts/core.html @@ -8,16 +8,16 @@ {%- endcapture -%} - - + + {% include license.html %} -{{ page-title }} | {{ site.title[ page.language ] }} - + {{ page-title }} | {{ site.title[ page.language ] }} + {% include metadata.html %} {% include resources-inc/head.html %} {% include analytics.html %} - - + + {%- if page.archived -%} {% include headers-includes/archive.html %} {%- endif -%} @@ -26,5 +26,5 @@ {{ content }} {% include footers/footer.html %} {% include resources-inc/footer.html %} - + \ No newline at end of file diff --git a/en/admin/config.yml b/en/admin/config.yml new file mode 100644 index 00000000..28e7299e --- /dev/null +++ b/en/admin/config.yml @@ -0,0 +1,23 @@ +backend: + name: git-gateway + branch: content # Branch to update (optional; defaults to master) +# This line should *not* be indented +media_folder: "images/uploads" # Media files will be stored in the repo under images/uploads + +collections: + - name: "blog" # Used in routes, e.g., /admin/collections/blog + label: "Blog" # Used in the UI + folder: "_posts" # The path to the folder where the documents are stored + create: true # Allow users to create new documents in this collection + slug: "{{year}}/{{month}}/{{day}}/{{slug}}" # Filename template, e.g., YYYY-MM-DD-title.md + fields: # The fields for each document, usually in front matter + - { label: "Alternate language page url", name: "altLangPage", widget: "string" } + - { label: "Title", name: "title", widget: "string" } + - { label: "Publish Date", name: "date", widget: "datetime" } + - { label: "Description", name: "description", widget: "string" } + - { label: "Featured Image", name: "thumbnail", widget: "image" } + - { label: "Body", name: "body", widget: "markdown" } + +logo_url: https://wet-boew.github.io/themes-dist/GCWeb/GCWeb/assets/sig-blk-en.svg +publish_mode: editorial_workflow +site_url: https://blog.canada.ca \ No newline at end of file diff --git a/en/admin/index.html b/en/admin/index.html new file mode 100644 index 00000000..171620a9 --- /dev/null +++ b/en/admin/index.html @@ -0,0 +1,14 @@ + + + + + + + Canada.ca Design System Content Manager + + + + + + + \ No newline at end of file