From 5cc1f9b3670f06431775e026e5f9ea334e5a1e47 Mon Sep 17 00:00:00 2001 From: MadeByMike Date: Mon, 1 Jan 2018 22:46:28 +1100 Subject: Add baseof template --- site/layouts/_default/baseof.html | 9 +++ site/layouts/_default/li.html | 5 +- site/layouts/_default/list.html | 5 +- site/layouts/_default/single.html | 9 +-- site/layouts/index.html | 6 +- site/layouts/partials/head.html | 46 +++++++-------- site/layouts/post/single.html | 6 +- site/layouts/section/contact.html | 6 +- site/layouts/section/products.html | 5 +- site/layouts/section/values.html | 6 +- yarn.lock | 114 ++++++++++++++++++------------------- 11 files changed, 106 insertions(+), 111 deletions(-) create mode 100644 site/layouts/_default/baseof.html diff --git a/site/layouts/_default/baseof.html b/site/layouts/_default/baseof.html new file mode 100644 index 0000000..c068832 --- /dev/null +++ b/site/layouts/_default/baseof.html @@ -0,0 +1,9 @@ + + + {{ partial "head" . }} + + {{ partial "nav" . }} + {{ block "main" . }}{{ end }} + {{ partial "footer" . }} + + \ No newline at end of file diff --git a/site/layouts/_default/li.html b/site/layouts/_default/li.html index e5fca8e..e3d57de 100644 --- a/site/layouts/_default/li.html +++ b/site/layouts/_default/li.html @@ -1,9 +1,6 @@ - -

- diff --git a/site/layouts/_default/list.html b/site/layouts/_default/list.html index 33d722a..c23fa0c 100644 --- a/site/layouts/_default/list.html +++ b/site/layouts/_default/list.html @@ -1,5 +1,4 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} {{ partial "jumbotron" (dict "imageUrl" "/img/blog-index.jpg" "title" "Latest stories") }} @@ -13,4 +12,4 @@ -{{ partial "footer" . }} +{{end}} \ No newline at end of file diff --git a/site/layouts/_default/single.html b/site/layouts/_default/single.html index 2126d61..159e454 100644 --- a/site/layouts/_default/single.html +++ b/site/layouts/_default/single.html @@ -1,5 +1,6 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} + {{ partial "jumbotron" (dict "imageUrl" "/img/7.jpg" "title" "This is where the heading goes" "subtitle" "This is where the subtitle goes") }} - {{ .Content }} -{{ partial "footer" . }} +{{ .Content }} + +{{ end }} diff --git a/site/layouts/index.html b/site/layouts/index.html index a21df24..d4e1902 100644 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -1,6 +1,4 @@ -{{ partial "head" . }} - -{{ partial "nav" . }} +{{ define "main" }} {{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title "subtitle" .Params.subtitle) }} @@ -12,4 +10,4 @@ {{ partial "blog" . }} -{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html index 9e75f44..f65ee56 100644 --- a/site/layouts/partials/head.html +++ b/site/layouts/partials/head.html @@ -1,31 +1,27 @@ - - - + - {{ .Title }} | Kaldi - + {{ .Title }} | Kaldi + - - - + + + - + - - - - - - - + + + + + + + - - - - - + + + + + - - - - + + \ No newline at end of file diff --git a/site/layouts/post/single.html b/site/layouts/post/single.html index 75a355f..bc34c45 100644 --- a/site/layouts/post/single.html +++ b/site/layouts/post/single.html @@ -1,5 +1,5 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} +

@@ -12,4 +12,4 @@ {{ .Content }}

-{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/section/contact.html b/site/layouts/section/contact.html index 205d92e..8b5d45c 100644 --- a/site/layouts/section/contact.html +++ b/site/layouts/section/contact.html @@ -1,6 +1,4 @@ -{{ partial "head" . }} - -{{ partial "nav" . }} +{{ define "main" }}

@@ -23,4 +21,4 @@

-{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/section/products.html b/site/layouts/section/products.html index bf430ca..6a1243b 100644 --- a/site/layouts/section/products.html +++ b/site/layouts/section/products.html @@ -1,5 +1,4 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} {{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }} @@ -29,4 +28,4 @@ {{ partial "table" .Params.pricing }} -{{ partial "footer" . }} +{{ end }} diff --git a/site/layouts/section/values.html b/site/layouts/section/values.html index 9b6fa13..93913e5 100644 --- a/site/layouts/section/values.html +++ b/site/layouts/section/values.html @@ -1,5 +1,5 @@ -{{ partial "head" . }} -{{ partial "nav" . }} +{{ define "main" }} + {{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }}

@@ -14,4 +14,4 @@

-{{ partial "footer" . }} +{{ end }} diff --git a/yarn.lock b/yarn.lock index 81b14dc..e36c7b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2241,6 +2241,10 @@ exec-sh@^0.2.0: dependencies: merge "^1.1.3" +exenv@^1.2.0: + version "1.2.2" + resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" + exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" @@ -2473,17 +2477,9 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" -focus-trap-react@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/focus-trap-react/-/focus-trap-react-3.0.5.tgz#8fb381b92eafe075c2406297d1da618650d37143" - dependencies: - focus-trap "^2.0.1" - -focus-trap@^2.0.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-2.3.1.tgz#f4fb86cfe6da38dc652b373e9f42ba476eab1c14" - dependencies: - tabbable "^1.0.3" +focus-group@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/focus-group/-/focus-group-0.3.1.tgz#e0f32ed86b0dabdd6ffcebdf898ecb32e47fedce" for-in@^1.0.1: version "1.0.2" @@ -3143,7 +3139,7 @@ hoek@4.x.x: version "4.2.0" resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d" -hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0: +hoist-non-react-statics@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb" @@ -4237,10 +4233,6 @@ markdown-table@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-1.1.1.tgz#4b3dd3a133d1518b8ef0dbc709bf2a1b4824bc8c" -material-design-icons@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/material-design-icons/-/material-design-icons-3.0.1.tgz#9a71c48747218ebca51e51a66da682038cdcb7bf" - math-expression-evaluator@^1.2.14: version "1.2.17" resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" @@ -4446,44 +4438,45 @@ negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" -netlify-cms@^0.7.6: - version "0.7.6" - resolved "https://registry.yarnpkg.com/netlify-cms/-/netlify-cms-0.7.6.tgz#7862caf7ea5e431985a803d7a8ada4fccd5ec91a" +netlify-cms@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/netlify-cms/-/netlify-cms-1.0.3.tgz#444dde9d70c33e06a169439514d74ea7f604cd7c" dependencies: classnames "^2.2.5" create-react-class "^15.6.0" - focus-trap-react "^3.0.3" fuzzy "^0.1.1" gotrue-js "^0.9.15" gray-matter "^3.0.6" history "^4.7.2" immutable "^3.7.6" + is-hotkey "^0.1.1" js-base64 "^2.1.9" js-yaml "^3.10.0" jwt-decode "^2.1.0" localforage "^1.4.2" lodash "^4.13.1" - material-design-icons "^3.0.1" mdast-util-definitions "^1.2.2" mdast-util-to-string "^1.0.4" moment "^2.11.2" - normalize.css "^4.2.0" prop-types "^15.5.10" react "^16.0.0" + react-aria-menubutton "^5.1.0" react-autosuggest "^9.3.2" - react-datetime "^2.6.0" + react-datetime "^2.11.0" react-dnd "^2.5.4" react-dnd-html5-backend "^2.5.4" react-dom "^16.0.0" react-frame-component "^2.0.0" react-immutable-proptypes "^2.1.0" + react-modal "^3.1.5" react-redux "^4.4.0" react-router-dom "^4.2.2" react-router-redux "^5.0.0-alpha.8" - react-sidebar "^2.2.1" + react-scroll-sync "^0.4.0" react-sortable-hoc "^0.6.8" react-split-pane "^0.1.66" - react-toolbox "^2.0.0-beta.12" + react-textarea-autosize "^5.2.0" + react-toggled "^1.1.2" react-topbar-progress-indicator "^2.0.0" react-transition-group "^2.2.1" react-waypoint "^7.1.0" @@ -4513,6 +4506,7 @@ netlify-cms@^0.7.6: unist-util-visit-parents "^1.1.1" url "^0.11.0" uuid "^3.1.0" + what-input "^5.0.3" optionalDependencies: fsevents "^1.0.14" @@ -4620,10 +4614,6 @@ normalize-url@^1.4.0: query-string "^4.1.0" sort-keys "^1.0.0" -normalize.css@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-4.2.0.tgz#21d66cc557154d4379fd1e079ec7de58a379b099" - npmlog@^4.0.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" @@ -5660,10 +5650,6 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -ramda@^0.23.0: - version "0.23.0" - resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.23.0.tgz#ccd13fff73497a93974e3e86327bfd87bd6e8e2b" - randomatic@^1.1.3: version "1.1.7" resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" @@ -5684,6 +5670,14 @@ rc@^1.1.7: minimist "^1.2.0" strip-json-comments "~2.0.1" +react-aria-menubutton@^5.1.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/react-aria-menubutton/-/react-aria-menubutton-5.1.1.tgz#56b1f36ff43de48dfa1eab16e9f5efc1a63dc0a9" + dependencies: + focus-group "^0.3.1" + prop-types "^15.6.0" + teeny-tap "^0.2.0" + react-autosuggest@^9.3.2: version "9.3.2" resolved "https://registry.yarnpkg.com/react-autosuggest/-/react-autosuggest-9.3.2.tgz#dd8c0fbe9c25aa94afe296180353647f6ecc10a7" @@ -5700,14 +5694,7 @@ react-autowhatever@^10.1.0: react-themeable "^1.1.0" section-iterator "^2.0.0" -react-css-themr@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/react-css-themr/-/react-css-themr-2.1.2.tgz#e017514e471c232f43a754a55b49d81faf5dafb8" - dependencies: - hoist-non-react-statics "^1.2.0" - invariant "^2.2.1" - -react-datetime@^2.6.0: +react-datetime@^2.11.0: version "2.11.1" resolved "https://registry.yarnpkg.com/react-datetime/-/react-datetime-2.11.1.tgz#11d15081dd7d6729284e21c1b8ea7b975e3bdc7e" dependencies: @@ -5750,6 +5737,14 @@ react-immutable-proptypes@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.1.0.tgz#023d6f39bb15c97c071e9e60d00d136eac5fa0b4" +react-modal@^3.1.5: + version "3.1.10" + resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.1.10.tgz#8898b5cc4ebba78adbb8dea4c55a69818aa682cc" + dependencies: + exenv "^1.2.0" + prop-types "^15.5.10" + warning "^3.0.0" + react-onclickoutside@^6.5.0: version "6.7.0" resolved "https://registry.yarnpkg.com/react-onclickoutside/-/react-onclickoutside-6.7.0.tgz#997a4d533114c9a0a104913638aa26afc084f75c" @@ -5802,9 +5797,9 @@ react-router@^4.2.0: prop-types "^15.5.4" warning "^3.0.0" -react-sidebar@^2.2.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/react-sidebar/-/react-sidebar-2.3.2.tgz#ec140bea8a6f5fa3d8ea7a56479665b44cf4f9cf" +react-scroll-sync@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/react-scroll-sync/-/react-scroll-sync-0.4.0.tgz#c824f86dd1322f66f973c74a9fda9dad03fdcf11" react-sortable-hoc@^0.6.8: version "0.6.8" @@ -5831,22 +5826,21 @@ react-style-proptype@^3.0.0: dependencies: prop-types "^15.5.4" +react-textarea-autosize@^5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-5.2.1.tgz#2b78f9067180f41b08ac59f78f1581abadd61e54" + dependencies: + prop-types "^15.6.0" + react-themeable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/react-themeable/-/react-themeable-1.1.0.tgz#7d4466dd9b2b5fa75058727825e9f152ba379a0e" dependencies: object-assign "^3.0.0" -react-toolbox@^2.0.0-beta.12: - version "2.0.0-beta.12" - resolved "https://registry.yarnpkg.com/react-toolbox/-/react-toolbox-2.0.0-beta.12.tgz#1d9dd7cc41e3b35dabdce5eb100a8068eee88c45" - dependencies: - classnames "^2.2.5" - core-js "^2.4.0" - ramda "^0.23.0" - react-css-themr "^2.1.2" - react-style-proptype "^3.0.0" - react-transition-group "^1.1.3" +react-toggled@^1.1.2: + version "1.2.0" + resolved "https://registry.yarnpkg.com/react-toggled/-/react-toggled-1.2.0.tgz#4bd777c989d007d01fbeea766221477848b9c99f" react-topbar-progress-indicator@^2.0.0: version "2.0.0" @@ -7005,10 +6999,6 @@ systemjs@^0.19.46: dependencies: when "^3.7.5" -tabbable@^1.0.3: - version "1.1.1" - resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-1.1.1.tgz#88618caa0dc76e877572a678f0ad97519bba6761" - table@^3.7.8: version "3.8.3" resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f" @@ -7063,6 +7053,10 @@ tar@^2.2.1: fstream "^1.0.2" inherits "2" +teeny-tap@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/teeny-tap/-/teeny-tap-0.2.0.tgz#167e645182d06ac222d62bb2ab67947a70a58a68" + temp@^0.8.0: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" @@ -7615,6 +7609,10 @@ weinre@^2.0.0-pre-I0Z7U9OV: nopt "3.0.x" underscore "1.7.x" +what-input@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.0.3.tgz#340471c6157d592b61ac9d42a611941a110dfec2" + whatwg-fetch@>=0.10.0: version "2.0.3" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" -- cgit v1.3

{{ .Title }}

{{ .Title }}

{{.Title}}