diff --git a/docs/_config.yml b/docs/_config.yml index daf2e1e..db4c542 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -25,7 +25,7 @@ description: >- # this means to ignore newlines until "baseurl:" baseurl: "/nhs-notify-web-cms" # the subpath of your site, e.g. /blog url: "https://nhsdigital.github.io" # the base hostname & protocol for your site, e.g. http://example.com -collections_dir: _collections +collections_dir: collections collections: notify-repos: diff --git a/docs/_layouts/nhs-notify-default.html b/docs/_layouts/default.html similarity index 100% rename from docs/_layouts/nhs-notify-default.html rename to docs/_layouts/default.html diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html new file mode 100644 index 0000000..e6686fb --- /dev/null +++ b/docs/_layouts/home.html @@ -0,0 +1,7 @@ +--- +layout: default +--- + +

{{page.site_title}}

+ +{{ content }} diff --git a/docs/_layouts/nhs-notify-home.html b/docs/_layouts/nhs-notify-home.html deleted file mode 100644 index dabf5fc..0000000 --- a/docs/_layouts/nhs-notify-home.html +++ /dev/null @@ -1,5 +0,0 @@ ---- -layout: nhs-notify-default ---- - -Message: {{ content }} diff --git a/docs/_layouts/nhs-notify-page.html b/docs/_layouts/nhs-notify-page.html deleted file mode 100644 index 15ed7b2..0000000 --- a/docs/_layouts/nhs-notify-page.html +++ /dev/null @@ -1,20 +0,0 @@ ---- -layout: nhs-notify-default ---- - -
-
-
-
- {%- if page.permalink contains "resources" %} - - {% endif -%} -

{{ page.title }}

- {{ content }} -
-
-
-
-
diff --git a/docs/_layouts/page.html b/docs/_layouts/page.html new file mode 100644 index 0000000..b72df29 --- /dev/null +++ b/docs/_layouts/page.html @@ -0,0 +1,7 @@ +--- +layout: default +--- + +

{{page.title}}

+ +{{ content }} diff --git a/docs/_sass/color_schemes/nhs.scss b/docs/_sass/color_schemes/nhs.scss index 5b45b8f..ac5c521 100644 --- a/docs/_sass/color_schemes/nhs.scss +++ b/docs/_sass/color_schemes/nhs.scss @@ -1,18 +1,37 @@ @import "./color_schemes/light"; + +@font-face { + font-family: "Frutiger W01"; + font-style: normal; + src: url("https://assets.nhs.uk/fonts/FrutigerLTW01-55Roman.woff2") format('woff2'); +} + +@font-face { + font-family: "Frutiger W01"; + font-weight: 800; + font-style: normal; + src: url("https://assets.nhs.uk/fonts/FrutigerLTW01-65Bold.woff2") format('woff2'); +} + + // Typography // prettier-ignore -$body-font-family: "Frutiger W01", Arial, Sans-serif; -$mono-font-family: "Frutiger W01", Arial, Sans-serif; +$body-font-family: Frutiger W01,Arial,Sans-serif; +$mono-font-family: Frutiger W01,Arial,Sans-serif; $blue-000: #005eb8; $grey-dk-000: #d8dde0; $grey-dk-100: #f0f4f5; -$sidebar-color: $grey-dk-000; +$grey-dk-300: #212B32; +$sidebar-color: $grey-dk-100; $body-background-color: $grey-dk-100; $link-color: $blue-000; $font-size-7: 1.25rem; +$font-size-6: 2rem; +$font-size-8: 3rem; +//$font-size-5: 1.188rem; // h3 diff --git a/docs/_sass/custom/custom.scss b/docs/_sass/custom/custom.scss new file mode 100644 index 0000000..803fb08 --- /dev/null +++ b/docs/_sass/custom/custom.scss @@ -0,0 +1,60 @@ +// Totally custom here. + +.nav-category { + text-transform: none; + color: $grey-dk-300; + @include fs-4; + font-weight: 600; +} + +.main-content { + ul > { + li::before { + color: $grey-dk-300; + } + } +} + +.site-title { + font-weight: 600; + font-size: 1.2rem !important; +} + +.nav-list { + .nav-list-item { + @include fs-4; + font-weight: 400; + -webkit-font-smoothing: antialiased; + } +} + +body { + color: $grey-dk-300; + font-size: 1.2rem !important; + //line-height: 28px; + //@include fs-5; +} + +@media (min-width: 31.25rem) { + h1, + .text-alpha { + font-size: 3rem !important; + font-weight: 600; + } +} + +@media (min-width: 31.25rem) { + h2, + .text-alpha { + font-size: 2rem !important; + font-weight: 600; + } +} + +@media (min-width: 31.25rem) { + h3, + .text-alpha { + font-size: 1.5rem !important; + font-weight: 600; + } +} diff --git a/docs/_collections/.gitkeep b/docs/collections/.gitkeep similarity index 100% rename from docs/_collections/.gitkeep rename to docs/collections/.gitkeep diff --git a/docs/_posts/.gitkeep b/docs/collections/_posts/.gitkeep similarity index 100% rename from docs/_posts/.gitkeep rename to docs/collections/_posts/.gitkeep diff --git a/docs/index.md b/docs/index.md deleted file mode 100644 index 5c3a18d..0000000 --- a/docs/index.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -# Feel free to add content and custom Front Matter to this file. -# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults - -layout: nhs-notify-home -title: Home -nav_order: 1 ---- - -## NHS Notify diff --git a/docs/404.html b/docs/pages/404.html similarity index 100% rename from docs/404.html rename to docs/pages/404.html diff --git a/docs/content/about.md b/docs/pages/about.md similarity index 85% rename from docs/content/about.md rename to docs/pages/about.md index 358a79f..42aee6e 100644 --- a/docs/content/about.md +++ b/docs/pages/about.md @@ -2,10 +2,9 @@ # Feel free to add content and custom Front Matter to this file. # To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults -layout: nhs-notify-page +layout: page title: About nav_order: 2 has_children: true +permalink: /about/ --- - -## About diff --git a/docs/content/about/about-child.md b/docs/pages/about/about-child.md similarity index 82% rename from docs/content/about/about-child.md rename to docs/pages/about/about-child.md index dd146dc..fa0a924 100644 --- a/docs/content/about/about-child.md +++ b/docs/pages/about/about-child.md @@ -2,9 +2,10 @@ # Feel free to add content and custom Front Matter to this file. # To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults -layout: nhs-notify-page +layout: page title: About Child parent: About nav_order: 1 +permalink: /about/child-about --- -## About Child + diff --git a/docs/pages/index.md b/docs/pages/index.md new file mode 100644 index 0000000..ffe2219 --- /dev/null +++ b/docs/pages/index.md @@ -0,0 +1,43 @@ +--- +# Feel free to add content and custom Front Matter to this file. +# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults + +layout: home +title: Home +site_title: NHS Notify CMS +nav_order: 1 +permalink: / +--- + +Convallis aenean et tortor at. Sagittis nisl rhoncus mattis rhoncus. Odio eu feugiat pretium nibh ipsum. Sit amet venenatis urna cursus eget. Aliquet nec ullamcorper sit amet risus nullam eget felis. + +## Lorem ipsum dolor sit amet + +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Praesent semper feugiat nibh sed pulvinar proin gravida hendrerit. + +- Cras pulvinar mattis nunc sed blandit libero volutpat sed +- Morbi tristique senectus et netus +- Tristique sollicitudin nibh sit amet commodo nulla facilisi +- Est lorem ipsum dolor sit amet consectetur adipiscing elit + +Purus in massa tempor nec feugiat nisl pretium. Ut morbi tincidunt augue interdum. Urna et pharetra pharetra massa massa ultricies mi quis hendrerit. Convallis aenean et tortor at. Sagittis nisl rhoncus mattis rhoncus. Odio eu feugiat pretium nibh ipsum. Sit amet venenatis urna cursus eget. Aliquet nec ullamcorper sit amet risus nullam eget felis. + +## Ullamcorper a lacus vestibulum + +Ullamcorper a lacus vestibulum sed arcu non odio. Turpis egestas pretium aenean pharetra magna ac placerat. Dui nunc mattis enim ut tellus elementum sagittis vitae. Faucibus vitae aliquet nec ullamcorper sit amet. Fringilla ut morbi tincidunt augue. Id donec ultrices tincidunt arcu non. A iaculis at erat pellentesque adipiscing commodo elit at imperdiet. Risus sed vulputate odio ut enim blandit. Nulla facilisi etiam dignissim diam quis enim lobortis. Interdum velit laoreet id donec ultrices tincidunt arcu non sodales. Phasellus vestibulum lorem sed risus ultricies tristique. Consectetur a erat nam at. Eget magna fermentum iaculis eu non diam phasellus. Vitae sapien pellentesque habitant morbi tristique senectus et. Morbi tincidunt augue interdum velit euismod in pellentesque massa. Nibh venenatis cras sed felis eget velit aliquet sagittis id. Molestie a iaculis at erat pellentesque adipiscing commodo. Pharetra et ultrices neque ornare aenean euismod. + +## Odio ut sem nulla pharetra + +Odio ut sem nulla pharetra. Tincidunt arcu non sodales neque sodales ut. Auctor neque vitae tempus quam pellentesque nec. Mattis molestie a iaculis at erat pellentesque adipiscing. + +### Donec adipiscing tristique risus nec feugiat in + +Donec adipiscing tristique risus nec feugiat in. Faucibus et molestie ac feugiat sed lectus vestibulum. Condimentum lacinia quis vel eros donec ac odio tempor orci. Proin libero nunc consequat interdum varius sit amet mattis. Id eu nisl nunc mi ipsum faucibus vitae. Sed elementum tempus egestas sed. Dolor morbi non arcu risus quis varius quam quisque. Facilisis mauris sit amet massa vitae tortor. Iaculis eu non diam phasellus vestibulum lorem sed risus. + +### Non diam phasellus vestibulum lorem sed + +Non diam phasellus vestibulum lorem sed. Imperdiet nulla malesuada pellentesque elit. Odio aenean sed adipiscing diam donec. Diam donec adipiscing tristique risus nec feugiat in fermentum. Bibendum neque egestas congue quisque egestas diam in arcu cursus. Egestas sed tempus urna et pharetra pharetra massa massa ultricies. Porta nibh venenatis cras sed felis. Et magnis dis parturient montes nascetur ridiculus. Commodo nulla facilisi nullam vehicula ipsum a arcu. Fringilla urna porttitor rhoncus dolor purus non enim praesent. Auctor augue mauris augue neque gravida. Faucibus purus in massa tempor nec feugiat nisl pretium. + +## Sed felis eget velit aliquet sagittis + +Sed felis eget velit aliquet sagittis. Sem integer vitae justo eget magna fermentum iaculis eu non. Dui sapien eget mi proin sed libero enim sed. Dis parturient montes nascetur ridiculus mus mauris. Massa sapien faucibus et molestie ac feugiat sed. Et ligula ullamcorper malesuada proin libero nunc. At in tellus integer feugiat scelerisque varius morbi enim. Turpis egestas integer eget aliquet nibh praesent tristique. Quisque egestas diam in arcu cursus euismod quis viverra nibh. Nunc mi ipsum faucibus vitae. Dui accumsan sit amet nulla facilisi morbi tempus. diff --git a/project.code-workspace b/project.code-workspace deleted file mode 100644 index ff84143..0000000 --- a/project.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "name": "NHS Notify Repo Template", - "path": "." - } - ] -}