From 35bae341cdeb5231010b4c620a71a6ce0ef2d952 Mon Sep 17 00:00:00 2001 From: MAHDTech Date: Wed, 20 Dec 2023 19:09:10 +1100 Subject: [PATCH] fix: Fonts (#26) * test: Fonts * fix: Cleanup * docs: Update contact form * fix: Fonts * chore: Update changelog --- .devenv.flake.nix | 80 ----------- assets/images/logo.webp | Bin 0 -> 1744 bytes config/_default/hugo.yaml | 37 ++--- config/_default/params.yaml | 4 +- content/changelog/_index.md | 18 +++ hugo.toml | 34 +++-- layouts/_default/contact.html | 2 +- layouts/index.html | 56 +++++--- layouts/partials/components/feedback.html | 85 ------------ layouts/partials/components/search-modal.html | 131 ------------------ layouts/partials/default.html | 95 ------------- layouts/partials/essentials/footer.html | 42 ------ layouts/partials/essentials/head.html | 47 ------- layouts/partials/essentials/header.html | 80 ----------- layouts/partials/essentials/script.html | 81 ----------- layouts/partials/essentials/style.html | 52 ------- 16 files changed, 103 insertions(+), 741 deletions(-) delete mode 100644 .devenv.flake.nix create mode 100644 assets/images/logo.webp mode change 100644 => 100755 hugo.toml delete mode 100644 layouts/partials/components/feedback.html delete mode 100644 layouts/partials/components/search-modal.html delete mode 100644 layouts/partials/default.html delete mode 100644 layouts/partials/essentials/footer.html delete mode 100644 layouts/partials/essentials/head.html delete mode 100644 layouts/partials/essentials/header.html delete mode 100644 layouts/partials/essentials/script.html delete mode 100644 layouts/partials/essentials/style.html diff --git a/.devenv.flake.nix b/.devenv.flake.nix deleted file mode 100644 index 8fc7c4a..0000000 --- a/.devenv.flake.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - inputs = { - pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - devenv.url = "github:cachix/devenv?dir=src/modules"; - } // (if builtins.pathExists ./.devenv/flake.json - then builtins.fromJSON (builtins.readFile ./.devenv/flake.json) - else {}); - - outputs = { nixpkgs, ... }@inputs: - let - devenv = if builtins.pathExists ./.devenv/devenv.json - then builtins.fromJSON (builtins.readFile ./.devenv/devenv.json) - else {}; - getOverlays = inputName: inputAttrs: - map (overlay: let - input = inputs.${inputName} or (throw "No such input `${inputName}` while trying to configure overlays."); - in input.overlays.${overlay} or (throw "Input `${inputName}` has no overlay called `${overlay}`. Supported overlays: ${nixpkgs.lib.concatStringsSep ", " (builtins.attrNames input.overlays)}")) - inputAttrs.overlays or []; - overlays = nixpkgs.lib.flatten (nixpkgs.lib.mapAttrsToList getOverlays (devenv.inputs or {})); - pkgs = import nixpkgs { - system = "x86_64-linux"; - config = { - allowUnfree = devenv.allowUnfree or false; - }; - inherit overlays; - }; - lib = pkgs.lib; - importModule = path: - if lib.hasPrefix "./" path - then ./. + (builtins.substring 1 255 path) + "/devenv.nix" - else if lib.hasPrefix "../" path - then throw "devenv: ../ is not supported for imports" - else let - paths = lib.splitString "/" path; - name = builtins.head paths; - input = inputs.${name} or (throw "Unknown input ${name}"); - subpath = "/${lib.concatStringsSep "/" (builtins.tail paths)}"; - devenvpath = "${input}" + subpath + "/devenv.nix"; - in if builtins.pathExists devenvpath - then devenvpath - else throw (devenvpath + " file does not exist for input ${name}."); - project = pkgs.lib.evalModules { - specialArgs = inputs // { inherit inputs pkgs; }; - modules = [ - (inputs.devenv.modules + /top-level.nix) - { devenv.cliVersion = "0.6.2"; } - ] ++ (map importModule (devenv.imports or [])) ++ [ - ./devenv.nix - (devenv.devenv or {}) - (if builtins.pathExists ./devenv.local.nix then ./devenv.local.nix else {}) - ]; - }; - config = project.config; - - options = pkgs.nixosOptionsDoc { - options = builtins.removeAttrs project.options [ "_module" ]; - # Unpack Nix types, e.g. literalExpression, mDoc. - transformOptions = - let isDocType = v: builtins.elem v [ "literalDocBook" "literalExpression" "literalMD" "mdDoc" ]; - in lib.attrsets.mapAttrs (_: v: - if v ? _type && isDocType v._type then - v.text - else if v ? _type && v._type == "derivation" then - v.name - else - v - ); - }; - in { - packages."x86_64-linux" = { - optionsJSON = options.optionsJSON; - inherit (config) info procfileScript procfileEnv procfile; - ci = config.ciDerivation; - }; - devenv.containers = config.containers; - devShell."x86_64-linux" = config.shell; - }; -} diff --git a/assets/images/logo.webp b/assets/images/logo.webp new file mode 100644 index 0000000000000000000000000000000000000000..09b57cfe2959bb5c135d73ce93453fa7ca5bd960 GIT binary patch literal 1744 zcmV;>1~2(iNk&G<1^@t8MM6+kP&il$0000G0001*001Na06|PpNZA7b00E$eZQI#M zyOR#qwr$(CZQHhO+qP}n_HfOvQNH(w^i7)G>9Ic}f|1)cj_B2w}-c}0HB=OF8wSC>zH9J3P)HOI|tD-*Qz!e(;so~Q!m$2 zMA%6Qr99U1IH)Uo#GSF4dU-`%SJj9rd>u{5@`#Ew!!KWke}Rgxdi>?}@g7n21-!JK zRDp_v`p1#!X0tWZGF0=J`iJpb;HD;FRrGz}x&JJrBa=)|vZY}kc>GT@T2MT{_*{^V zUccXA#cR{fn=0WK{%WQGh0X|ftKVGq?4?*klYQH%3kG=nReNq}7>8xgIAUIR<^+M#MLeokdjN)M=HF2af z!br^rPc=1MV^u(1qU~g#5g?z2n84~Ox0646M~CNuRkUATz41N8cn|e91<}2K)4D`* z#%q$|=AKYNcTb?2o4*e4eJ!|4mFsQ7T+5T?1j+Bax_VrV)B_R%NEFU@(Y!ruuqLhL z08397KPJLFx+(yc+85J8CJPeI`0TBjkR<6~8Hekt{o zg&GLe=ABy5N!)si-;iPs3V)|ZL@hHIsCm_*5y!^!s{blM(tW(RT=^IP@X|X^VnR28 zgI)X({Vd({Qdy#BUtto9q^1EERG|ERJ4t72$df)G5XVgW3dL8TiF%IqLN<@Lbyt%l z(y#d;ibg>vw`tE!(_?}k|M-1!{Gb7@i>*BQ^dvJ6aa<|*0!G=DDg;z>xQQM&Zt4!rvqjdE>^B>&#s-ATR&`{_CWZ5g)tl`1~ub^!~T-u!}~lep3bg zn8@@WY=0(2Ub)-Iyl{}(Q7MelzY;aetJKmyd_a!peszE7KUlx2OCO5(EJoKcVe9R@ z^8Vo|8mF22-LkNKI&lWZ7P-{TUaY&-eVX+Y<^wS;!#k{RNOw9q6)2$5D#_FW!C zF$4R9)8s4(9mVrIS`RiL%a%(|@>%z3OQ~8c@B~R(%9U0nD1ZTuX&31ozNv;B93N#E zAU99`cAslt!}E|?l>1!5j4YB1e+;^prTjl+`)a3!9}ZsAK~8gr_RFf>!zNr)v(?MC z%UkY{xU;x0Y@Tg*yFh}k^17_6XnL36k7vivN_*4Sb>t>SsvUg!MFHgDP{IH+Yw~bT znWNctZwzl)DNxeV$RtWG2g~IHRFxM_zvm@m(Bmii2D5HN_I-snRI2O*qbiBq2_n=I zv5XtmFb@S^WV+vT5%Btj=Q&A&T@cQH!Z40vfA^~Y;zZMA2c@&DQh)q7{}qY;1p4$U z=>O-xXy@NVQt?ZnRXcef*+nY+#VBUmur!T8-3O-jW=#!HbLoIbqhYbY(Rq4M<`J!p z9RIP5{UIN)ZxPAgvs{{)d>k*=U`hC{cF+4>Bx}j=zCZbb{{V10GYz*|9{~s09kO~Z zewh}tFtR@z#*pwC!1^7TFk!7YkM14O`(4JrF=15!%}3J_XXq&8AO}7e0g&jK^uo8o mwtoe<(C__Dc$*8Zu}y}5cq0;byn4@console.log("Preloading salt...")' +custom_script: '' table_of_content: true copyright: Copyleft by Salt Labs diff --git a/content/changelog/_index.md b/content/changelog/_index.md index be215dd..b4503b0 100644 --- a/content/changelog/_index.md +++ b/content/changelog/_index.md @@ -12,6 +12,24 @@ draft: false 🔮 +### November 2023 + +Added an awesome Carvel YouTube video from Thomas Vitale. + +{{< changelog "Added" >}} + +- Added link to YouTube video _Supercharge your Kubernetes Platform with Carvel by Thomas Vitale_ + +{{}} + +{{< changelog "Changed" >}} + +- Update Theme version +- Update NodeJS dependencies +- Updated Go module dependencies + +{{}} + ### July 2023 Added carvel tutorial and `kapp-controller` deployment option draft diagrams. diff --git a/hugo.toml b/hugo.toml old mode 100644 new mode 100755 index 2a143ff..2a8ffe6 --- a/hugo.toml +++ b/hugo.toml @@ -1,32 +1,41 @@ +######################### # DON'T REMOVE THIS FILE. +######################### + # This file is for render site varibles and plugins -# # The actual configuration files are stored in the `config/_default/` folder. ######################### site variables ############################## -# customize your color and font from here. + [params.variables] color_primary = "#710793" -text_color = "#333" + +text_color = "#555" text_dark = "#222" text_light = "#999" + body_color = "#fff" border_color = "#E2E2E2" + black = "#000" white = "#fff" light = "#FBFBFB" -# go to https://fonts.google.com/ to find the font you want to use. select your font and copy only the bold part from the URL. and paste it here. +# go to https://fonts.google.com/ to find the font you want to use. +# select your font and copy only the bold part from the URL. and paste it here. # example: "Work+Sans:wght@400;500;600" -font_icon = "Font Awesome 6 Free" # https://fontawesome.com/v6/icons -font_primary = "Poppins:wght@300;400;500;600;700;800" -font_primary_type = "sans-serif" # [serif/sans-serif] -font_secondary = "" -font_secondary_type = "" # [serif/sans-serif] + +font_icon = "Font Awesome 6 Free" # https://fontawesome.com/v6/icons + +font_primary = "Poppins:wght@300;400;500;600;700;800" +font_primary_type = "sans-serif" + +font_secondary = "Roboto:wght@300;400;500;600;700;800" +font_secondary_type = "sans-serif" # font variable -# base font size for full website, +# base font size for full website, font_size = "16px" # default is 16px ############################# Plugins ############################## @@ -34,17 +43,22 @@ font_size = "16px" # default is 16px # CSS Plugins [[params.plugins.css]] link = "plugins/font-awesome/v6/brands.css" + [[params.plugins.css]] link = "plugins/font-awesome/v6/solid.css" + [[params.plugins.css]] link = "plugins/font-awesome/v6/icons.css" # JS Plugins [[params.plugins.js]] link = "plugins/glightbox.js" + [[params.plugins.js]] link = "plugins/webfont/webfont-loader-2.js" + [[params.plugins.js]] link = "plugins/masonry/masonry.min.js" + [[params.plugins.js]] link = "plugins/cookie.js" diff --git a/layouts/_default/contact.html b/layouts/_default/contact.html index c206bcb..c875ae5 100644 --- a/layouts/_default/contact.html +++ b/layouts/_default/contact.html @@ -51,7 +51,7 @@

{{ .Title }}

name="reason" required > - + diff --git a/layouts/index.html b/layouts/index.html index 8e395ea..5e8da9f 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -8,20 +8,38 @@

{{ .title | markdownify }}

{{ .subtitle | markdownify }}

{{ end }} -
+
{{ with .Params.banner_button }} - {{.label}} + {{.label}} {{ end }} -
+ - - + +
- {{ partial "image.html" (dict "Src" .Params.banner.image "Alt" "illustration") }} + {{ partial "image.html" (dict "Src" .Params.banner.image "Alt" + "illustration") }}
@@ -36,13 +54,17 @@

{{ i18n `topics`}}

-

{{ .Title }}

+

+ {{ .Title }} +

- {{ i18n "details" }} + {{ i18n "details" }}
@@ -66,8 +88,7 @@

{{ .Title }}

-{{ if .Params.call_to_action.enable }} -{{ with .Params.call_to_action }} +{{ if .Params.call_to_action.enable }} {{ with .Params.call_to_action }}
@@ -77,17 +98,16 @@

{{ .Title }}

{{ .title | markdownify }}

{{ .content | markdownify }}

- {{ if .button.enable }} - {{ with .button }} - {{ .label }} - {{ end }} - {{ end }} + {{ if .button.enable }} {{ with .button }} + {{ .label }} + {{ end }} {{ end }}
-{{ end }} -{{ end }} +{{ end }} {{ end }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/partials/components/feedback.html b/layouts/partials/components/feedback.html deleted file mode 100644 index 2b1c848..0000000 --- a/layouts/partials/components/feedback.html +++ /dev/null @@ -1,85 +0,0 @@ - -{{ if site.Params.feedback }} {{ with site.Params.feedback }} - -{{ end }} {{ end }} - diff --git a/layouts/partials/components/search-modal.html b/layouts/partials/components/search-modal.html deleted file mode 100644 index d3a651f..0000000 --- a/layouts/partials/components/search-modal.html +++ /dev/null @@ -1,131 +0,0 @@ - - - diff --git a/layouts/partials/default.html b/layouts/partials/default.html deleted file mode 100644 index 89e2e41..0000000 --- a/layouts/partials/default.html +++ /dev/null @@ -1,95 +0,0 @@ -{{ "" | safeHTML }} -
-
-
-
-
    - {{ $currentNode := . }} {{range .Site.Home.Sections.ByWeight}} - - {{ $numberOfMainPages := len .Pages }} {{ if eq $numberOfMainPages 0 - }} {{ else }} - - {{ template "section-tree-nav" dict "sect" . "currentnode" - $currentNode}} {{ end }} {{ end }} -
-
-
-
-

{{ .Title }}

- {{ if .Content }} -
{{.Content}}
- {{ else }} -
    - {{ range .Data.Pages }} -
  • {{.Title}}
    • - {{end}} -
- {{ end }} - - - {{ if .Params.Feedback }} {{ partial "components/feedback.html" . }} - {{ end }} -
-
-
-
-
-{{ "" | safeHTML }} - - -{{ define "section-tree-nav" }} {{ $showvisitedlinks := .showvisitedlinks }} {{ -$currentNode := .currentnode }} {{with .sect}} {{safeHTML .Params.head}} {{ -$fileUniqueID := "" }} {{ with .File }}{{ $fileUniqueID = .UniqueID }}{{ end }} -{{ $currentNodeFileUniqueID := "" }} {{ with $currentNode.File }}{{ -$currentNodeFileUniqueID = .UniqueID }}{{ end }} -
  • - {{.Title }} - {{ $numberOfPages := (add (len .Pages) (len .Sections)) }} {{ if ne - $numberOfPages 0 }} -
      - {{ $currentNode.Scratch.Set "pages" .Pages }} {{ if .Sections}} {{ - $currentNode.Scratch.Set "pages" (.Pages | union .Sections) }} {{end}} {{ - $pages := ($currentNode.Scratch.Get "pages") }} {{ range $pages.ByWeight }} - {{ template "section-tree-nav" dict "sect" . "currentnode" $currentNode }} - {{end}} -
    -
    • -{{ end }} {{ end }} {{ end }} diff --git a/layouts/partials/essentials/footer.html b/layouts/partials/essentials/footer.html deleted file mode 100644 index d0e22a9..0000000 --- a/layouts/partials/essentials/footer.html +++ /dev/null @@ -1,42 +0,0 @@ -
    -
    -
    -
    -
      - {{ range site.Menus.footer }} -
    • - {{ .Name }} -
      • - {{ end }} -
    -
    -
    - - {{ partial "logo.html" }} - -
    -
    - -
    -
    -
    - - {{ site.Params.copyright | markdownify }} {{ if - site.Params.theme_copyright }} | Theme by - GetHugoThemes - {{ end }} - -
    -
    -
    diff --git a/layouts/partials/essentials/head.html b/layouts/partials/essentials/head.html deleted file mode 100644 index 21079ff..0000000 --- a/layouts/partials/essentials/head.html +++ /dev/null @@ -1,47 +0,0 @@ - -{{ .Title | default site.Title }} - - - - - - - - -{{ partialCached "favicon" . }} - - -{{ partialCached "manifest" . }} - - -{{ partialCached "site-verifications.html" . }} - - -{{ partial "basic-seo.html" . }} - - -{{ partialCached "custom-script.html" . }} - - -{{ template "_internal/google_analytics.html" . }} - - -{{ partialCached "gtm.html" . }} - - -{{ partialCached "matomo-analytics.html" . }} - - -{{ partialCached "baidu-analytics.html" . }} - - -{{ partialCached "plausible-analytics.html" . }} - - -{{ partialCached "counter-analytics.html" . }} - - -{{ partialCached "crisp-chat.html" . }} diff --git a/layouts/partials/essentials/header.html b/layouts/partials/essentials/header.html deleted file mode 100644 index e643f91..0000000 --- a/layouts/partials/essentials/header.html +++ /dev/null @@ -1,80 +0,0 @@ -{{ "" | safeHTML }} -
    -
    - - -
    -
    -{{ "" | safeHTML }} {{ partial "components/search-modal" . -}} diff --git a/layouts/partials/essentials/script.html b/layouts/partials/essentials/script.html deleted file mode 100644 index 6346a30..0000000 --- a/layouts/partials/essentials/script.html +++ /dev/null @@ -1,81 +0,0 @@ - -{{ $bootstrap := resources.Get "js/bootstrap.js" }} {{ $params := dict }} {{ -$sourceMap := cond hugo.IsProduction "" "inline" }} {{ $opts := dict "sourceMap" -$sourceMap "target" "es2018" "params" $params }} {{ $bootstrap = $bootstrap | -js.Build $opts }} {{ if hugo.IsProduction }} {{ $bootstrap = $bootstrap | -fingerprint "sha512" }} {{ end }} - - - -{{ $scripts := slice }} {{ range site.Params.plugins.js }} {{ if findRE "^http" -.link }} - -{{ else }} {{ $scripts = $scripts | append (resources.Get .link) }} {{ end }} {{ -end }} - - -{{ $scripts = $scripts | append (resources.Get "js/script.js") }} {{ $scripts = -$scripts | resources.Concat "js/scripts.js" }} {{ if hugo.IsProduction }} {{ -$scripts = $scripts | fingerprint "sha512" }} {{ end }} - - - -{{ $pf:= site.Params.variables.font_primary }} {{ $sf:= -site.Params.variables.font_secondary }} - - - -{{ partialCached "pwa.html" . }} - - -{{ partialCached "cookie-consent.html" . }} - - -{{ partialCached "adsense-script.html" . }} diff --git a/layouts/partials/essentials/style.html b/layouts/partials/essentials/style.html deleted file mode 100644 index f5a21b3..0000000 --- a/layouts/partials/essentials/style.html +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -{{ $styles := slice }} {{ range site.Params.plugins.css }} {{ if findRE "^http" -.link }} - -{{ else }} {{ $styles = $styles | append (resources.Get .link) }} {{ end }} {{ -end }} {{ $styles := $styles | append (resources.Get "scss/style.scss" | -resources.ExecuteAsTemplate "style.scss" . | toCSS) }} {{ $styles := $styles | -resources.Concat "/css/style.css" }} - - -{{ if and hugo.IsProduction site.Params.purge_css }} {{ $styles = $styles | -resources.PostCSS | fingerprint "sha256" }} {{ $styles = $styles | -resources.PostProcess }} {{ end }} - - - -