From 8980d6b3c838f81fcf98083e5cb2ebed2db4be4a Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 16:26:18 +0200 Subject: [PATCH 01/26] Add initial fixes Signed-off-by: Antonio Gamez Diaz --- site/config.yaml | 2 +- site/themes/template/assets/scss/_base.scss | 8 +-- .../template/assets/scss/_components.scss | 54 +++++++++----- .../template/assets/scss/_variables.scss | 8 +-- .../template/layouts/_default/baseof.html | 3 +- .../layouts/partials/base-footer.html | 2 +- .../template/layouts/partials/use-cases.html | 70 ++++++++++--------- 7 files changed, 84 insertions(+), 63 deletions(-) diff --git a/site/config.yaml b/site/config.yaml index 4437316d63f..a46b8d2277b 100644 --- a/site/config.yaml +++ b/site/config.yaml @@ -17,7 +17,7 @@ markup: lineNos: false lineNumbersInTable: true noClasses: true - style: friendly + style: vs tabWidth: 4 ## Only used if use_advanced_docs=false # menu: diff --git a/site/themes/template/assets/scss/_base.scss b/site/themes/template/assets/scss/_base.scss index 340a7c0037d..f0061a85e25 100644 --- a/site/themes/template/assets/scss/_base.scss +++ b/site/themes/template/assets/scss/_base.scss @@ -88,7 +88,7 @@ p { a { font-size: 16px; text-decoration: none; - color: $blue; + color: $indigo; font-family: $metropolis-medium; } button { @@ -96,7 +96,7 @@ button { border: none; } .button { - color: $blue; + color: $indigo; font-size: 12px; font-weight: 600; background-color: $white; @@ -106,11 +106,11 @@ button { text-transform: uppercase; border: 1px solid $white; &.secondary { - background-color: $mainblue; + background-color: $indigo; color: $white; } &.tertiary { - border: 1px solid $blue; + border: 1px solid $indigo; } } .buttons { diff --git a/site/themes/template/assets/scss/_components.scss b/site/themes/template/assets/scss/_components.scss index 5aafbf161d6..e217014b911 100644 --- a/site/themes/template/assets/scss/_components.scss +++ b/site/themes/template/assets/scss/_components.scss @@ -3,7 +3,7 @@ /* Homepage Hero */ .hero { - background-color: $mainblue; + background-color: $ocean; color: $white; .text-block { @@ -106,7 +106,7 @@ grid-template-areas: "image text"; .image { - background-color: $mainblue; + background-color: $ocean; text-align: center; display: flex; align-items: center; @@ -120,7 +120,7 @@ .text { border: 1px solid $lightgrey; - padding: 30px; + padding: 1em; grid-area: text; a.button { @@ -164,7 +164,7 @@ } .team { - background-color: $navyblue; + background-color: $indigo; h2, h3, @@ -247,7 +247,7 @@ } .icon { - background-color: $mainblue; + background-color: $ocean; padding: 25px; min-height: 95px; display: flex; @@ -324,7 +324,7 @@ padding: 30px 90px 30px 30px; .author { - color: $blue; + color: $indigo; margin: 0px; } @@ -378,7 +378,7 @@ } code { - border: 2px solid #efefef; + border: 2px solid $lightgrey; color: $darkgrey; padding: 2px 8px; } @@ -386,7 +386,7 @@ pre { code { display: block; - border: 15px solid #efefef; + border: 15px solid $lightgrey; padding: 15px; margin-bottom: 30px; overflow-x: auto; @@ -437,7 +437,7 @@ .button { margin-top: 50px; - border: 1px solid $blue; + border: 1px solid $indigo; } @include breakpoint(small) { @@ -568,7 +568,7 @@ font-size: 14px; &.active { - color: $blue; + color: $indigo; } } @@ -591,7 +591,7 @@ border-radius: 5px; display: inline; padding: 10px 30px 10px 10px; - border: 1px solid $blue; + border: 1px solid $indigo; color: $black; cursor: pointer; font-size: 14px; @@ -675,8 +675,8 @@ } .algolia-docsearch-suggestion--highlight { - background-color: rgba($blue, 0.1); - color: $navyblue; + background-color: rgba($ocean, 0.1); + color: $indigo; } .algolia-docsearch-suggestion--title { @@ -709,6 +709,7 @@ width: 22%; } + // @include breakpoint(large) { width: 22%; } @@ -760,8 +761,8 @@ } code { - border: 2px solid #efefef; - color: $grey; + border: 2px solid $lightgrey; + color: $darkgrey; padding: 2px 8px; } @@ -770,7 +771,7 @@ code { display: block; - border: 15px solid #efefef; + border: 15px solid $lightgrey; padding: 15px; margin-bottom: 30px; overflow-x: auto; @@ -798,7 +799,7 @@ margin: -30px -30px 0px 0px; .right-nav-content { - background-color: #efefef; + background-color: $lightgrey; padding: 30px 30px 30px 20px; margin-right: -20px; position: sticky; @@ -877,8 +878,19 @@ .home-snippet { span { - max-width: 50vw; - overflow: auto; + // max-width: 50vw; + // overflow: auto; + } + + pre { + white-space: pre-wrap; + + code { + display: block; + border: 7px solid $lightgrey; + padding-left: 1em; + padding-right: 1em; + } } } @@ -888,4 +900,8 @@ #search { width: 80%; + + input::placeholder { + color: $darkgrey; + } } diff --git a/site/themes/template/assets/scss/_variables.scss b/site/themes/template/assets/scss/_variables.scss index 1e44c3e32c4..96fc1c821cc 100644 --- a/site/themes/template/assets/scss/_variables.scss +++ b/site/themes/template/assets/scss/_variables.scss @@ -1,10 +1,10 @@ -$blue: #0095d3; +// $blue: #0091da; $darkgrey: #333333; $lightgrey: #f2f2f2; -$darkblue: #002538; +// $darkblue: #002538; $black: #111111; -$mainblue: #0091da; -$navyblue: #1d428a; +// $mainblue: #0091da; +// $navyblue: #1d428a; // Official palette // https://www.vmware.com/brand/portal/guidelines/color.html diff --git a/site/themes/template/layouts/_default/baseof.html b/site/themes/template/layouts/_default/baseof.html index 8c0a50cd148..fba74f2d8f9 100644 --- a/site/themes/template/layouts/_default/baseof.html +++ b/site/themes/template/layouts/_default/baseof.html @@ -83,8 +83,9 @@ {{ partial "base-header" . }} - {{ block "main" . }}{{ end }} + {{ block "main" . }} {{ partial "base-getting-started" . }} + {{ end }} {{ partial "base-footer" . }} {{ if .Site.Params.docs_search }} diff --git a/site/themes/template/layouts/partials/base-footer.html b/site/themes/template/layouts/partials/base-footer.html index 5bc207f2fd2..eed6ac8ebbc 100644 --- a/site/themes/template/layouts/partials/base-footer.html +++ b/site/themes/template/layouts/partials/base-footer.html @@ -41,7 +41,7 @@ Terms of Use | Privacy Policy | Your California Privacy Rights | - Cookie Settings + Cookie Settings

diff --git a/site/themes/template/layouts/partials/use-cases.html b/site/themes/template/layouts/partials/use-cases.html index 91f4e0149bf..a9478743066 100644 --- a/site/themes/template/layouts/partials/use-cases.html +++ b/site/themes/template/layouts/partials/use-cases.html @@ -29,7 +29,7 @@

What is Kubeapps?

{{ end -}} -
+
@@ -39,13 +39,13 @@

What is Kubeapps?

Step 1: Install Kubeapps (for demo purposes)

{{ highlight ` - helm repo add bitnami https://charts.bitnami.com/bitnami + helm repo add bitnami https://charts.bitnami.com/bitnami ` "" "" }} {{ highlight ` - helm install -n kubeapps --create-namespace kubeapps bitnami/kubeapps + helm install -n kubeapps --create-namespace kubeapps bitnami/kubeapps ` "" "" }} -
+
@@ -54,55 +54,59 @@

What is Kubeapps?

Step 2: Create a demo credential with which to access Kubeapps and Kubernetes

+
{{ highlight ` - kubectl create --namespace default serviceaccount kubeapps-operator - ` "" "" }} + kubectl create --namespace default serviceaccount kubeapps-operator + ` "bash" "" }}
{{ highlight ` - kubectl create clusterrolebinding kubeapps-operator --clusterrole=cluster-admin --serviceaccount=default:kubeapps-operator - ` "" "" }} + kubectl create clusterrolebinding kubeapps-operator --clusterrole=cluster-admin --serviceaccount=default:kubeapps-operator + ` "bash" "" }}
{{ highlight ` - cat <
{{ highlight ` - kubectl get --namespace default secret kubeapps-operator-token -o go-template='{{.data.token | base64decode}}' - ` "" "" }} + kubectl get --namespace default secret kubeapps-operator-token -o go-template='{{.data.token | base64decode}}' + ` "bash" "" }}
+
-
- Business card -
-
-
-
- Icon user inside a shield +
+ Business card +
-
-

Step 3: Start the Kubeapps Dashboard

+
+
+ Icon user inside a shield +
+
+

Step 3: Start the Kubeapps Dashboard

{{ highlight ` - kubectl port-forward -n kubeapps svc/kubeapps 8080:80 + kubectl port-forward -n kubeapps svc/kubeapps 8080:80 ` "" "" }}
-

Go to localhost:8080

+

+ Go to localhost:8080 +

+
-
From cc0349b95111d6a95a5ebaf47003ac5079ea947d Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 16:26:50 +0200 Subject: [PATCH 02/26] Run prettier Signed-off-by: Antonio Gamez Diaz --- site/themes/template/assets/scss/_base.scss | 156 +++++++----- .../template/assets/scss/_components.scss | 222 +++++++++--------- site/themes/template/assets/scss/_footer.scss | 33 ++- site/themes/template/assets/scss/_header.scss | 34 +-- site/themes/template/assets/scss/_mixins.scss | 8 +- .../template/assets/scss/_variables.scss | 6 +- 6 files changed, 245 insertions(+), 214 deletions(-) diff --git a/site/themes/template/assets/scss/_base.scss b/site/themes/template/assets/scss/_base.scss index f0061a85e25..e5f3d5b0b28 100644 --- a/site/themes/template/assets/scss/_base.scss +++ b/site/themes/template/assets/scss/_base.scss @@ -1,50 +1,58 @@ @import "variables"; @import "mixins"; -$font-family-base: "Metropolis-Light", Helvetica, sans-serif; +$font-family-base: "Metropolis-Light", helvetica, sans-serif; $metropolis-light: $font-family-base; -$metropolis-light-italic: "Metropolis-LightItalic", Helvetica, sans-serif; -$metropolis-regular: "Metropolis-Regular", Helvetica, sans-serif; -$metropolis-regular-italic: "Metropolis-RegularItalic", Helvetica, sans-serif; -$metropolis-medium: "Metropolis-Medium", Helvetica, sans-serif; -$metropolis-medium-italic: "Metropolis-MediumItalic", Helvetica, sans-serif; -$metropolis-bold: "Metropolis-Bold", Helvetica, sans-serif; -$metropolis-bold-italic: "Metropolis-BoldItalic", Helvetica, sans-serif; -$metropolis-semibold: "Metropolis-SemiBold", Helvetica, sans-serif; -$metropolis-semibold-italic: "Metropolis-SemiBoldItalic", Helvetica, sans-serif; +$metropolis-light-italic: "Metropolis-LightItalic", helvetica, sans-serif; +$metropolis-regular: "Metropolis-Regular", helvetica, sans-serif; +$metropolis-regular-italic: "Metropolis-RegularItalic", helvetica, sans-serif; +$metropolis-medium: "Metropolis-Medium", helvetica, sans-serif; +$metropolis-medium-italic: "Metropolis-MediumItalic", helvetica, sans-serif; +$metropolis-bold: "Metropolis-Bold", helvetica, sans-serif; +$metropolis-bold-italic: "Metropolis-BoldItalic", helvetica, sans-serif; +$metropolis-semibold: "Metropolis-SemiBold", helvetica, sans-serif; +$metropolis-semibold-italic: "Metropolis-SemiBoldItalic", helvetica, sans-serif; body { + margin: 0; font-family: $font-family-base; - margin: 0px; line-height: 1.25; } + .wrapper { max-width: 980px; - margin: 0px auto; padding: 20px; + margin: 0 auto; + @include breakpoint(small) { max-width: 100%; } + @include breakpoint(medium) { } + &.docs { @include breakpoint(extra-large) { max-width: 80%; } } } + .clearfix { *zoom: 1; - &:before, - &:after { + + &::before, + &::after { display: table; content: ""; line-height: 0; } - &:after { + + &::after { clear: both; } } + h1, h2, h3, @@ -53,87 +61,106 @@ h5, h6 { font-weight: 300; } + h1 { font-size: 28px; } + h2 { - font-size: 22px; color: #333; + font-size: 22px; } + h3 { font-size: 20px; } + h4 { font-size: 18px; } + li { - list-style-type: none; display: inline; padding-right: 25px; font-size: 14px; line-height: 1.7em; + list-style-type: none; + &:last-of-type { - padding-right: 0px; + padding-right: 0; } } + p { - line-height: 1.7em; - font-weight: 300; - font-size: 16px; color: $darkgrey; + font-size: 16px; + font-weight: 300; + line-height: 1.7em; + &.intro { font-size: 18px; } } + a { - font-size: 16px; - text-decoration: none; color: $indigo; font-family: $metropolis-medium; + font-size: 16px; + text-decoration: none; } + button { - background-color: unset; border: none; + background-color: unset; } + .button { + min-width: 200px; + padding: 14px 10px; + border: 1px solid $white; + border-radius: 3px; + background-color: $white; color: $indigo; font-size: 12px; font-weight: 600; - background-color: $white; - border-radius: 3px; - padding: 14px 10px; - min-width: 200px; text-transform: uppercase; - border: 1px solid $white; + &.secondary { background-color: $indigo; color: $white; } + &.tertiary { border: 1px solid $indigo; } } + .buttons { margin-top: 40px; + .button:first-of-type { margin-right: 30px; + @include breakpoint(small) { - margin: 0px 0px 20px 0px; + margin: 0 0 20px; } } } + .strong { font-family: $metropolis-medium; } + .bg-grey { background-color: $lightgrey; } .grid.three { display: grid; + column-gap: 20px; grid-template-columns: 1fr 1fr 1fr; row-gap: 20px; - column-gap: 20px; + @include breakpoint(small) { grid-template-columns: 1fr; } @@ -142,6 +169,7 @@ button { .grid.two { display: grid; grid-template-columns: 1fr 1fr; + @include breakpoint(small) { grid-template-columns: 1fr; } @@ -152,116 +180,116 @@ button { } noscript { - background-color: rgba(red, 0.25); display: block; - font-size: 14px; - font-weight: bold; padding: 10px; margin: 0 20px 20px 0; + background-color: rgba(red, 0.25); + font-size: 14px; + font-weight: bold; } // Metropolis @font-face { - font-family: "Metropolis-Bold"; + font-family: Metropolis-Bold; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-Bold.eot"); src: url("/fonts/Metropolis-Bold.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-Bold.woff2") format("woff2"), url("/fonts/Metropolis-Bold.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-BoldItalic"; + font-family: Metropolis-BoldItalic; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-BoldItalic.eot"); src: url("/fonts/Metropolis-BoldItalic.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-BoldItalic.woff2") format("woff2"), url("/fonts/Metropolis-BoldItalic.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-Light"; + font-family: Metropolis-Light; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-Light.eot"); src: url("/fonts/Metropolis-Light.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-Light.woff2") format("woff2"), url("/fonts/Metropolis-Light.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-LightItalic"; + font-family: Metropolis-LightItalic; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-LightItalic.eot"); src: url("/fonts/Metropolis-LightItalic.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-LightItalic.woff2") format("woff2"), url("/fonts/Metropolis-LightItalic.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-Regular"; + font-family: Metropolis-Regular; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-Regular.eot"); src: url("/fonts/Metropolis-Regular.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-Regular.woff2") format("woff2"), url("/fonts/Metropolis-Regular.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-RegularItalic"; + font-family: Metropolis-RegularItalic; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-RegularItalic.eot"); src: url("/fonts/Metropolis-RegularItalic.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-RegularItalic.woff2") format("woff2"), url("/fonts/Metropolis-RegularItalic.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-Medium"; + font-family: Metropolis-Medium; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-Medium.eot"); src: url("/fonts/Metropolis-Medium.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-Medium.woff2") format("woff2"), url("/fonts/Metropolis-Medium.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-MediumItalic"; + font-family: Metropolis-MediumItalic; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-MediumItalic.eot"); src: url("/fonts/Metropolis-MediumItalic.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-MediumItalic.woff2") format("woff2"), url("/fonts/Metropolis-MediumItalic.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-SemiBold"; + font-family: Metropolis-SemiBold; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-SemiBold.eot"); src: url("/fonts/Metropolis-SemiBold.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-SemiBold.woff2") format("woff2"), url("/fonts/Metropolis-SemiBold.woff") format("woff"); - font-weight: normal; - font-style: normal; } @font-face { - font-family: "Metropolis-SemiBoldItalic"; + font-family: Metropolis-SemiBoldItalic; + font-style: normal; + font-weight: normal; src: url("/fonts/Metropolis-SemiBoldItalic.eot"); src: url("/fonts/Metropolis-SemiBoldItalic.eot?#iefix") format("embedded-opentype"), url("/fonts/Metropolis-SemiBoldItalic.woff2") format("woff2"), url("/fonts/Metropolis-SemiBoldItalic.woff") format("woff"); - font-weight: normal; - font-style: normal; } diff --git a/site/themes/template/assets/scss/_components.scss b/site/themes/template/assets/scss/_components.scss index e217014b911..f981596b52b 100644 --- a/site/themes/template/assets/scss/_components.scss +++ b/site/themes/template/assets/scss/_components.scss @@ -8,12 +8,12 @@ .text-block { max-width: 550px; - padding: 0px 0px 10px 0px; + padding: 0 0 10px; p { margin-bottom: 20px; - font-size: 18px; color: $white; + font-size: 18px; } h2 { @@ -22,11 +22,11 @@ } &.homepage { + padding-bottom: 80px; //background-image: url(/img/hero-image.png); background-position: center center; background-repeat: no-repeat; background-size: cover; - padding-bottom: 80px; h1 { font-size: 36px; @@ -36,7 +36,7 @@ @include breakpoint(small) { .text-block { max-width: unset; - margin-right: 0px; + margin-right: 0; } .button { @@ -60,8 +60,8 @@ position: relative; padding: 30px 20px; background-color: $white; + box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2); text-align: center; - box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.2); h3 { color: $darkgrey; @@ -77,11 +77,11 @@ .introduction { .grid.two { - column-gap: 140px; padding: 35px 20px; + column-gap: 140px; p { - margin: 0px; + margin: 0; font-size: 16px; &.strong { @@ -91,7 +91,7 @@ } @include breakpoint(small) { - padding: 0px 20px; + padding: 0 20px; .col:first-of-type { padding-bottom: 50px; @@ -101,17 +101,17 @@ .use-cases { .grid { - grid-template-columns: 220px 1fr; margin-bottom: 30px; grid-template-areas: "image text"; + grid-template-columns: 220px 1fr; .image { - background-color: $ocean; - text-align: center; display: flex; align-items: center; justify-content: center; + background-color: $ocean; grid-area: image; + text-align: center; img { justify-self: center; @@ -119,37 +119,37 @@ } .text { - border: 1px solid $lightgrey; padding: 1em; + border: 1px solid $lightgrey; grid-area: text; a.button { display: block; + min-width: unset; max-width: 138px; - text-align: center; padding: 5px 10px; - min-width: unset; + text-align: center; } } &.image-right { - grid-template-columns: 1fr 220px; grid-template-areas: "text image"; + grid-template-columns: 1fr 220px; @include breakpoint(small) { - grid-template-columns: 1fr; grid-template-areas: "image" "text"; + grid-template-columns: 1fr; } } @include breakpoint(small) { - grid-template-columns: 1fr; - grid-template-rows: minmax(160px, 1fr); grid-template-areas: "image" "text"; + grid-template-columns: 1fr; + grid-template-rows: minmax(160px, 1fr); } } @@ -183,29 +183,29 @@ } .grid.three { + margin: 40px 0; row-gap: 40px; - margin: 40px 0px; } .bio { display: grid; - grid-template-columns: 120px 1fr; column-gap: 20px; + grid-template-columns: 120px 1fr; .image img { - height: 120px; width: 120px; + height: 120px; } .info { align-self: center; p { - margin: 0px; + margin: 0; &.name { - font-size: 16px; font-family: $metropolis-medium; + font-size: 16px; } &.position { @@ -217,11 +217,11 @@ } .hero.subpage-hero { + padding-bottom: 90px; // background-image: url(/img/blog-hero-image.png); background-position: center center; background-repeat: no-repeat; background-size: cover; - padding-bottom: 90px; h1 { font-size: 46px; @@ -243,16 +243,16 @@ .experimental { .grid.three .col { - padding: 0px; + padding: 0; } .icon { - background-color: $ocean; - padding: 25px; - min-height: 95px; display: flex; + min-height: 95px; align-items: center; justify-content: center; + padding: 25px; + background-color: $ocean; } .content { @@ -275,34 +275,34 @@ } .content { - padding: 0px 20px; + padding: 0 20px; } } &.landing { - background-color: #fff; margin-top: -90px; + background-color: #fff; h3 a { font-size: 16px; } .pagination { - margin: 30px auto 50px auto; + margin: 30px auto 50px; ul { - padding: 0px; + padding: 0; text-align: center; li { - padding: 0px; + padding: 0; a { padding: 5px 10px; &.active { - background-color: $lightgrey; border-radius: 50%; + background-color: $lightgrey; } } @@ -319,18 +319,18 @@ } .blog-post { - background-color: #fff; - margin: -110px 0px 0px -30px; padding: 30px 90px 30px 30px; + margin: -110px 0 0 -30px; + background-color: #fff; .author { + margin: 0; color: $indigo; - margin: 0px; } .date { + margin: 0; color: $black; - margin: 0px; font-weight: 600; } @@ -345,17 +345,17 @@ } ul { - list-style-type: disc; padding-left: 20px; + list-style-type: disc; li { - list-style-type: unset; display: list-item; margin-bottom: 10px; - font-size: 14px; color: $darkgrey; + font-size: 14px; line-height: 1.6em; list-style-image: url(/img/arrow.svg); + list-style-type: unset; &:first-child { margin-top: 10px; @@ -365,11 +365,11 @@ ol { li { - list-style-type: decimal; display: list-item; margin-bottom: 10px; - font-size: 16px; color: $darkgrey; + font-size: 16px; + list-style-type: decimal; &:first-child { margin-top: 10px; @@ -378,16 +378,16 @@ } code { + padding: 2px 8px; border: 2px solid $lightgrey; color: $darkgrey; - padding: 2px 8px; } pre { code { display: block; - border: 15px solid $lightgrey; padding: 15px; + border: 15px solid $lightgrey; margin-bottom: 30px; overflow-x: auto; } @@ -423,21 +423,21 @@ } h2 { + margin-bottom: 0; font-size: 30px; - margin-bottom: 0px; } a { display: block; + min-width: unset; max-width: 138px; - text-align: center; padding: 10px; - min-width: unset; + text-align: center; } .button { - margin-top: 50px; border: 1px solid $indigo; + margin-top: 50px; } @include breakpoint(small) { @@ -457,30 +457,30 @@ .button { display: block; - text-align: center; max-width: unset; margin-top: 20px; + text-align: center; } } } .subpage { - background-color: #fff; + padding: 30px 30px 50px; margin-top: -90px; - padding: 30px 30px 50px 30px; + background-color: #fff; .section-header { margin-top: 3rem; - font-weight: 600; font-size: 20px; + font-weight: 600; } .embed-responsive { position: relative; - &:before { - padding-top: 56.25%; + &::before { display: block; + padding-top: 56.25%; content: ""; } @@ -503,25 +503,25 @@ .icon { display: flex; + min-height: 140px; align-items: center; justify-content: center; - min-height: 140px; } .content { - padding: 0px 20px 20px 20px; + padding: 0 20px 20px; &.plugins { padding-top: 20px; img { display: block; - margin: 0px auto 5px auto; + margin: 0 auto 5px; } } h3 { - margin-top: 0px; + margin-top: 0; text-align: center; a { @@ -545,18 +545,18 @@ } .docs { - background-color: #fff; - margin-top: -90px; - padding: 30px 30px 50px 30px; display: flex; + padding: 30px 30px 50px; + margin-top: -90px; + background-color: #fff; .side-nav { + position: relative; width: 25%; float: left; - position: relative; ul { - padding-left: 0px; + padding-left: 0; margin-bottom: 35px; li { @@ -580,23 +580,23 @@ } .dropdown { - font-size: 14px; - font-family: $metropolis-medium; margin-bottom: 10px; + font-family: $metropolis-medium; + font-size: 14px; button { - background-image: url(/img/down-arrow.svg); - background-repeat: no-repeat; - background-position: 90% center; - border-radius: 5px; display: inline; padding: 10px 30px 10px 10px; border: 1px solid $indigo; + border-radius: 5px; + margin-bottom: 10px; + background-image: url(/img/down-arrow.svg); + background-position: 90% center; + background-repeat: no-repeat; color: $black; cursor: pointer; - font-size: 14px; font-family: $metropolis-medium; - margin-bottom: 10px; + font-size: 14px; &:focus { background-color: $lightgrey; @@ -606,14 +606,14 @@ .dropdown-menu { position: absolute; + top: 35px; + left: 0; + display: none; + min-width: 100px; + padding: 10px 0; border: 1px solid $grey; border-radius: 5px; - top: 35px; - left: 0px; background-color: $white; - padding: 10px 0; - min-width: 100px; - display: none; a { display: block; @@ -625,8 +625,8 @@ } &.dropdown-menu-visible { - display: block; z-index: 1; + display: block; } } @@ -635,22 +635,22 @@ width: 100%; height: 40px; padding: 0.375rem 0.75rem; - font-size: 1.125rem; - line-height: 1.5; - color: $darkgrey; - background-color: #fff; border: 1px solid #cecece; + border-radius: 5px; + background-color: #fff; background-image: url(/img/search-icon.svg); - background-repeat: no-repeat; background-position: 95% center; - border-radius: 5px; + background-repeat: no-repeat; + color: $darkgrey; + font-size: 1.125rem; + line-height: 1.5; &:focus { outline: none; } &::-webkit-search-cancel-button { - -webkit-appearance: none; + appearance: none; } } @@ -658,10 +658,10 @@ padding: 15px 15px 0; a { - color: $darkgrey; display: inline-block; - font-family: $metropolis-light; margin-bottom: 10px; + color: $darkgrey; + font-family: $metropolis-light; div { display: inline; @@ -699,10 +699,10 @@ } .ds-dropdown-menu { - background-color: #fff; + width: 130%; border: 1px solid #cecece; border-radius: 5px; - width: 130%; + background-color: #fff; } @include breakpoint(extra-large) { @@ -728,17 +728,17 @@ } ul { - list-style-type: disc; padding-left: 20px; + list-style-type: disc; li { - list-style-type: unset; display: list-item; margin-bottom: 10px; - font-size: 16px; color: $darkgrey; + font-size: 16px; line-height: 1.6em; list-style-image: url(/img/arrow.svg); + list-style-type: unset; &:first-child { margin-top: 10px; @@ -748,11 +748,11 @@ ol { li { - list-style-type: decimal; display: list-item; margin-bottom: 10px; - font-size: 16px; color: $darkgrey; + font-size: 16px; + list-style-type: decimal; &:first-child { margin-top: 10px; @@ -761,9 +761,9 @@ } code { + padding: 2px 8px; border: 2px solid $lightgrey; color: $darkgrey; - padding: 2px 8px; } pre { @@ -771,8 +771,8 @@ code { display: block; - border: 15px solid $lightgrey; padding: 15px; + border: 15px solid $lightgrey; margin-bottom: 30px; overflow-x: auto; } @@ -795,37 +795,37 @@ .right-nav { width: 20%; + margin: -30px -30px 0 0; float: right; - margin: -30px -30px 0px 0px; .right-nav-content { - background-color: $lightgrey; - padding: 30px 30px 30px 20px; - margin-right: -20px; position: sticky; top: 0; + padding: 30px 30px 30px 20px; + margin-right: -20px; + background-color: $lightgrey; } .buttons { - margin-top: 0px; + margin-top: 0; li { - margin-bottom: 0px; - padding: 8px 0px; display: inline-block; + padding: 8px 0; + margin-bottom: 0; &:first-of-type { - border-right: 1px solid #ddd; padding-right: 5px; + border-right: 1px solid #ddd; } a { - text-transform: uppercase; font-size: 14px; + text-transform: uppercase; img { - vertical-align: middle; width: 22px; + vertical-align: middle; } } } @@ -836,12 +836,12 @@ } ul { - padding-left: 0px; - margin-bottom: 0px; + padding-left: 0; + margin-bottom: 0; li { display: block; - padding-right: 0px; + padding-right: 0; margin-bottom: 7px; a { @@ -887,9 +887,9 @@ code { display: block; - border: 7px solid $lightgrey; - padding-left: 1em; padding-right: 1em; + padding-left: 1em; + border: 7px solid $lightgrey; } } } diff --git a/site/themes/template/assets/scss/_footer.scss b/site/themes/template/assets/scss/_footer.scss index 5c514fbf3bd..32eefa4fc41 100644 --- a/site/themes/template/assets/scss/_footer.scss +++ b/site/themes/template/assets/scss/_footer.scss @@ -4,8 +4,8 @@ footer { .top-links { - min-height: 52px; display: flex; + min-height: 52px; align-items: center; justify-content: space-between; } @@ -15,19 +15,19 @@ footer { } .left-links { - padding: 0px; + padding: 0; li { img { - vertical-align: bottom; margin-right: 10px; + vertical-align: bottom; } a { color: $darkgrey; - font-weight: 300; - font-size: 12px; font-family: $metropolis-light; + font-size: 12px; + font-weight: 300; } } @@ -38,34 +38,33 @@ footer { .right-links { p { - margin: 0px; + margin: 0; } .copywrite { - font-size: 12px; padding-right: 10px; + font-size: 12px; a { - font-size: 12px; color: $darkgrey; font-family: $metropolis-light; + font-size: 12px; } } a { vertical-align: middle; } - } .bottom-links { - margin: 10px 0px 30px 0px; + margin: 10px 0 30px; p { - font-size: 12px; display: flex; - justify-content: space-between; flex-wrap: wrap; + justify-content: space-between; + font-size: 12px; .ot-sdk-show-settings { cursor: pointer; @@ -73,14 +72,14 @@ footer { } a { - font-size: 12px; font-family: $metropolis-light; + font-size: 12px; } img { max-width: 75px; - vertical-align: middle; margin-left: 30px; + vertical-align: middle; } } @@ -93,8 +92,8 @@ footer { } .left-links { + margin: 10px 0; float: none; - margin: 10px 0px; .desktop { display: none; @@ -112,13 +111,13 @@ footer { } .bottom-links { - margin: 10px 0px 20px 0px; + margin: 10px 0 20px; float: none; img { - margin-left: 0px; display: block; margin-top: 10px; + margin-left: 0; } } } diff --git a/site/themes/template/assets/scss/_header.scss b/site/themes/template/assets/scss/_header.scss index 1a43e121b35..e14db436dec 100644 --- a/site/themes/template/assets/scss/_header.scss +++ b/site/themes/template/assets/scss/_header.scss @@ -4,11 +4,11 @@ header { .wrapper { - padding: 10px 20px; - min-height: 52px; display: flex; + min-height: 52px; align-items: center; justify-content: space-between; + padding: 10px 20px; } .kubeapps-header-logo { @@ -16,7 +16,7 @@ header { } .desktop-links { - padding-left: 0px; + padding-left: 0; } a { @@ -29,8 +29,8 @@ header { } li img { - vertical-align: bottom; margin-right: 10px; + vertical-align: bottom; } .mobile { @@ -46,7 +46,7 @@ header { @include breakpoint(small) { .expanded-icon { display: none; - padding: 11px 3px 0px 0px; + padding: 11px 3px 0 0; } .collapsed-icon { @@ -86,43 +86,43 @@ header { } ul { - padding-left: 0px; + padding-left: 0; li { display: block; - margin: 20px 0px; + margin: 20px 0; } } .mobile-menu { position: absolute; - background-color: #fff; - width: 100%; + z-index: 10; top: 70px; - left: 0px; - padding-bottom: 20px; + left: 0; display: none; - z-index: 10; + width: 100%; + padding-bottom: 20px; + background-color: #fff; .header-links { - margin: 0px 20px; + margin: 0 20px; } .social { - margin: 0px 20px; padding-top: 20px; + margin: 0 20px; img { - vertical-align: middle; padding-right: 10px; + vertical-align: middle; } a { - font-size: 14px; padding-right: 35px; + font-size: 14px; &:last-of-type { - padding-right: 0px; + padding-right: 0; } } } diff --git a/site/themes/template/assets/scss/_mixins.scss b/site/themes/template/assets/scss/_mixins.scss index 8a605e4ede4..9db907f8aee 100644 --- a/site/themes/template/assets/scss/_mixins.scss +++ b/site/themes/template/assets/scss/_mixins.scss @@ -32,13 +32,15 @@ @mixin clearfix { *zoom: 1; - &:before, - &:after { + + &::before, + &::after { display: table; content: ""; line-height: 0; } - &:after { + + &::after { clear: both; } } diff --git a/site/themes/template/assets/scss/_variables.scss b/site/themes/template/assets/scss/_variables.scss index 96fc1c821cc..3d9c0bb6e52 100644 --- a/site/themes/template/assets/scss/_variables.scss +++ b/site/themes/template/assets/scss/_variables.scss @@ -1,8 +1,10 @@ // $blue: #0091da; -$darkgrey: #333333; +$darkgrey: #333; $lightgrey: #f2f2f2; + // $darkblue: #002538; -$black: #111111; +$black: #111; + // $mainblue: #0091da; // $navyblue: #1d428a; From 7eaf9b23caa226927e6974e52905f9a1f92d7fd8 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 18:52:26 +0200 Subject: [PATCH 03/26] Fix a11y issue Signed-off-by: Antonio Gamez Diaz --- .../themes/template/layouts/shortcodes/resource-item.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/site/themes/template/layouts/shortcodes/resource-item.html b/site/themes/template/layouts/shortcodes/resource-item.html index 72214460fef..53be5f8da4f 100644 --- a/site/themes/template/layouts/shortcodes/resource-item.html +++ b/site/themes/template/layouts/shortcodes/resource-item.html @@ -2,9 +2,8 @@

{{ ( .Get "title") }}

{{ ( .Get "date") }}

-
+ {{- if eq (.Get "type") "video" -}} -
{{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} {{- if not $pc.Disable -}} @@ -20,7 +19,7 @@
{{ else }}
- +
{{ end }}
@@ -28,8 +27,7 @@ {{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} {{- $id := .Get "videoID" | default (.Get 0) -}} -

{{ (.Get "text") - }}. +

{{ (.Get "text")}}. {{ else }}

{{ (.Get "text") }}. {{ end }} From 42f06aa65d9cc3962da4492c0358231642709c94 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 18:53:27 +0200 Subject: [PATCH 04/26] Run prettier Signed-off-by: Antonio Gamez Diaz --- site/config.yaml | 1 - .../template/layouts/_default/baseof.html | 166 +++++++++--------- .../template/layouts/_default/docs.html | 26 +-- .../template/layouts/_default/list.html | 22 +-- .../template/layouts/_default/plugins.html | 22 +-- .../template/layouts/_default/posts.html | 26 +-- .../template/layouts/_default/section.html | 9 +- .../template/layouts/_default/single.html | 52 +++--- .../template/layouts/_default/summary.html | 2 +- .../themes/template/layouts/_default/tag.html | 26 +-- .../template/layouts/_default/versions.html | 35 ++-- .../template/layouts/partials/plugins.html | 22 +-- .../template/layouts/shortcodes/youtube.html | 2 +- 13 files changed, 205 insertions(+), 206 deletions(-) diff --git a/site/config.yaml b/site/config.yaml index a46b8d2277b..66451e034f1 100644 --- a/site/config.yaml +++ b/site/config.yaml @@ -37,7 +37,6 @@ params: docs_versioning: true github_base_url: "https://github.com/vmware-tanzu/kubeapps" github_url: "https://github.com/vmware-tanzu/kubeapps/" - googleSiteVerification: xxxx gtmId: GTM-PGL7FMT oneTrustId: b9039ff0-42be-4f63-bc78-e2ecbbed5f06 sitename: Kubeapps diff --git a/site/themes/template/layouts/_default/baseof.html b/site/themes/template/layouts/_default/baseof.html index fba74f2d8f9..9c72c921e2b 100644 --- a/site/themes/template/layouts/_default/baseof.html +++ b/site/themes/template/layouts/_default/baseof.html @@ -1,7 +1,8 @@ + - + @@ -16,89 +17,92 @@ + + {{ if .Title }} + {{ .Title }} + {{ else }} + Documentation + {{ end }} + + {{ with .Site.Params.description }} - - - - - {{ if .Title }}{{ .Title }}{{ else }}Documentation{{ end }} - {{ with .Site.Params.description }} - {{ end }} - {{ with .Site.Params.author }} - {{ end }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{ $options := (dict "targetPath" "css/style.css" "outputStyle" "compressed" "enableSourceMap" true "includePaths" (slice "node_modules/myscss")) }} -{{ $style := resources.Get "scss/site.scss" | resources.ToCSS $options }} - - - - - - - - - - - -{{ with .OutputFormats.Get "RSS" -}} - {{ printf `` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }} -{{- end }} + + + + {{ end }} + {{ with .Site.Params.author }} + {{ end }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ $options := (dict "targetPath" "css/style.css" "outputStyle" "compressed" "enableSourceMap" true "includePaths" (slice "node_modules/myscss")) }} + {{ $style := resources.Get "scss/site.scss" | resources.ToCSS $options }} + + + + + + + + + + + + {{ with .OutputFormats.Get "RSS" -}} + {{ printf `` .Rel .MediaType.Type .RelPermalink $.Site.Title | safeHTML }} + {{- end }} + - {{ partial "base-header" . }} - {{ block "main" . }} - {{ partial "base-getting-started" . }} + {{ partial "base-header" . }} + {{ block "main" . }} + {{ partial "base-getting-started" . }} + {{ end }} + {{ partial "base-footer" . }} + {{ if .Site.Params.docs_search }} + + + {{ end }} - {{ partial "base-footer" . }} - {{ if .Site.Params.docs_search }} - - - - {{ end }} + diff --git a/site/themes/template/layouts/_default/docs.html b/site/themes/template/layouts/_default/docs.html index e2ff115c3dc..8140239a1fd 100644 --- a/site/themes/template/layouts/_default/docs.html +++ b/site/themes/template/layouts/_default/docs.html @@ -1,16 +1,16 @@ {{ define "main" }} -

-
-
-

Documentation

-
+
+
+
+

Documentation

-
- {{ partial "docs-sidebar.html" . }} -
- {{ .Content }} -
- {{ partial "docs-right-bar.html" . }} +
+
+ {{ partial "docs-sidebar.html" . }} +
+ {{ .Content }}
-
-{{ end }} \ No newline at end of file + {{ partial "docs-right-bar.html" . }} +
+
+{{ end }} diff --git a/site/themes/template/layouts/_default/list.html b/site/themes/template/layouts/_default/list.html index fe3cc0e4a63..ee5c5adf459 100644 --- a/site/themes/template/layouts/_default/list.html +++ b/site/themes/template/layouts/_default/list.html @@ -1,14 +1,14 @@ {{ define "main" }} -
- {{ if or .Title .Content }} -
- {{ with .Title }}

{{ . }}

{{ end }} - {{ with .Content }}
{{ . }}
{{ end }} -
- {{ end }} +
+ {{ if or .Title .Content }} +
+ {{ with .Title }}

{{ . }}

{{ end }} + {{ with .Content }}
{{ . }}
{{ end }} +
+ {{ end }} - {{ range .Paginator.Pages }} - {{ .Render "summary" }} - {{ end }} -
+ {{ range .Paginator.Pages }} + {{ .Render "summary" }} + {{ end }} +
{{ end }} diff --git a/site/themes/template/layouts/_default/plugins.html b/site/themes/template/layouts/_default/plugins.html index a8238901531..bb090491285 100644 --- a/site/themes/template/layouts/_default/plugins.html +++ b/site/themes/template/layouts/_default/plugins.html @@ -1,13 +1,13 @@ {{ define "main" }} -
-
-
-

Plugins

-
+
+
+
+

Plugins

-
- {{ .Content }} - {{ partial "plugins.html" . }} -
-
-{{ end }} \ No newline at end of file +
+
+ {{ .Content }} + {{ partial "plugins.html" . }} +
+
+{{ end }} diff --git a/site/themes/template/layouts/_default/posts.html b/site/themes/template/layouts/_default/posts.html index 299a8726a07..1e627b207f5 100644 --- a/site/themes/template/layouts/_default/posts.html +++ b/site/themes/template/layouts/_default/posts.html @@ -1,17 +1,17 @@ {{ define "main" }} -
-
-
-

Blog

-
+
+
+
+

Blog

-
-
- {{ range (.Paginator 9).Pages.ByDate }} - {{ partial "blog-post-card.html" . }} - {{ end }} -
- {{ partial "pagination.html" . }} +
+
+
+ {{ range (.Paginator 9).Pages.ByDate }} + {{ partial "blog-post-card.html" . }} + {{ end }}
-
+ {{ partial "pagination.html" . }} +
+
{{ end }} diff --git a/site/themes/template/layouts/_default/section.html b/site/themes/template/layouts/_default/section.html index 560a0253a49..cf2e2739240 100644 --- a/site/themes/template/layouts/_default/section.html +++ b/site/themes/template/layouts/_default/section.html @@ -1,8 +1,5 @@ {{ define "main" }} -
- {{ .Content }} -
+
+ {{ .Content }} +
{{ end }} - - - diff --git a/site/themes/template/layouts/_default/single.html b/site/themes/template/layouts/_default/single.html index eb8e402a49b..877c78d28b3 100644 --- a/site/themes/template/layouts/_default/single.html +++ b/site/themes/template/layouts/_default/single.html @@ -1,30 +1,30 @@ {{ define "main" }} -
-
-
-
-

Blog

-
+
+
+
+
+

Blog

-
-
-

{{ .Title }}

-

- {{ .Params.author }} -

-

{{ dateFormat "Jan 2, 2006" .Date }}

- {{ .Content }} -
-

Related Content

-
- {{ $related := (where (.Site.RegularPages.Related .) "Type" "posts") | first 3 }} - {{ with $related }} - {{ range . }} - {{ partial "blog-post-card.html" . }} - {{ end }} - {{ end }} -
+
+
+
+

{{ .Title }}

+

+ {{ .Params.author }} +

+

{{ dateFormat "Jan 2, 2006" .Date }}

+ {{ .Content }}
-
-
+

Related Content

+
+ {{ $related := (where (.Site.RegularPages.Related .) "Type" "posts") | first 3 }} + {{ with $related }} + {{ range . }} + {{ partial "blog-post-card.html" . }} + {{ end }} + {{ end }} +
+
+
+
{{ end }} diff --git a/site/themes/template/layouts/_default/summary.html b/site/themes/template/layouts/_default/summary.html index 9acf43418a0..a92b243001c 100644 --- a/site/themes/template/layouts/_default/summary.html +++ b/site/themes/template/layouts/_default/summary.html @@ -7,7 +7,7 @@

{{ .Title }}

{{ .Summary }} {{ if .Truncated }} - Read more... + Read more... {{ end }}
diff --git a/site/themes/template/layouts/_default/tag.html b/site/themes/template/layouts/_default/tag.html index 6d6c931f319..168585fdf9d 100644 --- a/site/themes/template/layouts/_default/tag.html +++ b/site/themes/template/layouts/_default/tag.html @@ -1,16 +1,16 @@ {{ define "main" }} -
-
-
-

Blog Posts by {{ .Title }}

-
+
+
+
+

Blog Posts by {{ .Title }}

-
-
- {{ range .Pages.ByDate }} - {{ partial "blog-post-card.html" . }} - {{ end }} -
+
+
+
+ {{ range .Pages.ByDate }} + {{ partial "blog-post-card.html" . }} + {{ end }}
-
-{{ end }} \ No newline at end of file +
+
+{{ end }} diff --git a/site/themes/template/layouts/_default/versions.html b/site/themes/template/layouts/_default/versions.html index 8b139649f6d..f5cc73e053f 100644 --- a/site/themes/template/layouts/_default/versions.html +++ b/site/themes/template/layouts/_default/versions.html @@ -1,22 +1,21 @@ {{ if .Site.Params.Use_advanced_docs }} -
- {{ if .Site.Params.docs_versioning }} - - - {{ else }} - {{ .Site.Params.docs_latest }} +
+ {{ if .Site.Params.docs_versioning }} + + + {{ else }} + {{ .Site.Params.docs_latest }} + {{ end }} +
{{ end }} diff --git a/site/themes/template/layouts/partials/plugins.html b/site/themes/template/layouts/partials/plugins.html index adbc19b0726..863054fb097 100644 --- a/site/themes/template/layouts/partials/plugins.html +++ b/site/themes/template/layouts/partials/plugins.html @@ -3,38 +3,38 @@ {{ $pages := sort (.Site.GetPage "/plugins/list").Resources "Name" }} {{ if gt $limit 0 }} - {{ $pages = first $limit $pages }} + {{ $pages = first $limit $pages }} {{ end }} {{ range $index, $page := $pages }}
{{ if .Params.link }} -

{{ .Title }}

+

{{ .Title }}

{{ else }} -

{{ .Title }}

+

{{ .Title }}

{{ end }}

{{ .Content }}

{{ if .Params.objectStorage }} - + {{ end }} {{ if .Params.volumesnapshotter }} - + {{ end }} {{ if .Params.localStorage }} - + {{ end }} {{ if .Params.supportedByVeleroTeam }} - + {{ end }} {{ if .Params.BackupItemAction }} - + {{ end }} {{ if .Params.RestoreItemAction }} - + {{ end }} {{ if .Params.beta }} - + {{ end }}
@@ -45,4 +45,4 @@

{{ .Title }}

{{ end }} {{ end }} -
\ No newline at end of file +
diff --git a/site/themes/template/layouts/shortcodes/youtube.html b/site/themes/template/layouts/shortcodes/youtube.html index 0a2fc2e1698..cee86d49916 100644 --- a/site/themes/template/layouts/shortcodes/youtube.html +++ b/site/themes/template/layouts/shortcodes/youtube.html @@ -11,5 +11,5 @@ {{- $title := .Get "title" | default "YouTube Video" }}
-
+
{{ end -}} From eeed2f9238c3b3bb3a1e7d2f7f785b6dc35a4b68 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 19:37:38 +0200 Subject: [PATCH 05/26] Fix indentation consistency Signed-off-by: Antonio Gamez Diaz --- site/content/community/_index.html | 90 +++++++------------ site/content/resources/_index.html | 17 ++-- .../_default/_markup/render-heading.html | 2 +- .../_default/_markup/render-image.html | 12 +-- .../layouts/_default/_markup/render-link.html | 50 +++++------ .../template/layouts/_default/docs.html | 24 ++--- .../template/layouts/_default/list.html | 18 ++-- .../template/layouts/_default/plugins.html | 18 ++-- .../template/layouts/_default/posts.html | 26 +++--- .../template/layouts/_default/section.html | 2 +- .../template/layouts/_default/single.html | 52 +++++------ .../template/layouts/_default/summary.html | 22 ++--- .../themes/template/layouts/_default/tag.html | 20 ++--- .../template/layouts/_default/versions.html | 32 +++---- .../layouts/partials/base-footer.html | 37 ++++---- .../layouts/partials/base-header.html | 58 ++++++------ .../layouts/partials/blog-post-card.html | 18 ++-- .../layouts/partials/docs-right-bar.html | 28 +++--- .../layouts/partials/docs-sidebar.html | 56 ++++++------ .../layouts/partials/home-contributors.html | 33 +++---- .../layouts/partials/home-grey-block.html | 16 ++-- .../template/layouts/partials/pagination.html | 24 ++--- .../template/layouts/partials/plugins.html | 82 ++++++++--------- .../layouts/shortcodes/resource-item.html | 64 ++++++------- .../template/layouts/shortcodes/youtube.html | 2 +- 25 files changed, 386 insertions(+), 417 deletions(-) diff --git a/site/content/community/_index.html b/site/content/community/_index.html index 9932d12a272..e744ba3c99a 100644 --- a/site/content/community/_index.html +++ b/site/content/community/_index.html @@ -13,43 +13,31 @@

Do you want to help build Kubeapps?

- Github logo + GitHub logo

- Check out Github + + Check out GitHub +

You can follow the work we do, be part of on-going discussions, and examine our improvement ideas on the - GitHub project page. + + GitHub project page + .

-

- If you are a newcomer, check out the - good first issue label - in the repository. +

If you are a newcomer, check out the good first issue label + + in the repository + .

- If you are ready to jump in and add code, tests, or help with - documentation, follow the guidelines in the - contributing documentation. + If you are ready to jump in and add code, tests, or help with documentation, follow the guidelines in the + + contributing documentation + .

@@ -59,30 +47,20 @@

- Join our Slack channel + + Join our Slack channel +

Join the - #kubeapps channel - on the Kubernetes Slack and talk to us and over 400 other community - members. + + #kubeapps channel + + on the Kubernetes Slack and talk to us and over 400 other community members.

- If you aren't already a member on the Kubernetes Slack workspace, - please - request an invitation. + If you aren't already a member on the Kubernetes Slack workspace, please + request an invitation.

We love discussing various Kubernetes workflows, patterns, helping @@ -96,24 +74,20 @@

- Bi-weekly meetings + + Bi-weekly meetings +

Kubeapps Community Meetings are held every two Mondays at 10:30AM UTC

Add the - ics invitation + + ics invitation + to your calendar.

diff --git a/site/content/resources/_index.html b/site/content/resources/_index.html index 34165151716..9c7c117e320 100644 --- a/site/content/resources/_index.html +++ b/site/content/resources/_index.html @@ -4,16 +4,15 @@ ---
-
-

Resources

-
+
+

Resources

+
-

- Some useful external resources about Kubeapps, such as videos, workshops, - and community articles. -

-
+

+ Some useful external resources about Kubeapps, such as videos, workshops, and community articles. +

+
{{< resource-item type="video" videoID="rkci46GFlQA" @@ -175,5 +174,5 @@

url="https://blog.bitnami.com/2018/08/automating-packaging.html" text="Self-service Apps - Automating the Packaging-to-publishing Experience for Kubernetes with Bitnami Stacksmith and Kubeapps " >}} -

+
diff --git a/site/themes/template/layouts/_default/_markup/render-heading.html b/site/themes/template/layouts/_default/_markup/render-heading.html index bc0b8dc06fc..50bcac53aae 100644 --- a/site/themes/template/layouts/_default/_markup/render-heading.html +++ b/site/themes/template/layouts/_default/_markup/render-heading.html @@ -1 +1 @@ -{{ .Text | safeHTML }} \ No newline at end of file +{{ .Text | safeHTML }} diff --git a/site/themes/template/layouts/_default/_markup/render-image.html b/site/themes/template/layouts/_default/_markup/render-image.html index 696e21f7146..2dd25d19f15 100644 --- a/site/themes/template/layouts/_default/_markup/render-image.html +++ b/site/themes/template/layouts/_default/_markup/render-image.html @@ -1,11 +1,11 @@ {{ $link := .Destination }} {{ if not (strings.HasPrefix $link "http") }} - {{ if strings.HasSuffix .Page.Parent.RelPermalink "docs/" }} - {{ $link = printf "%s%s" .Page.RelPermalink .Destination }} - {{ else }} - {{ $link = printf "%s%s" .Page.Parent.RelPermalink .Destination }} - {{ end }} + {{ if strings.HasSuffix .Page.Parent.RelPermalink "docs/" }} + {{ $link = printf "%s%s" .Page.RelPermalink .Destination }} + {{ else }} + {{ $link = printf "%s%s" .Page.Parent.RelPermalink .Destination }} + {{ end }} {{ end }}

- {{ .Text }} + {{ .Text }}

diff --git a/site/themes/template/layouts/_default/_markup/render-link.html b/site/themes/template/layouts/_default/_markup/render-link.html index ed8c1ba2af4..516c969fde2 100644 --- a/site/themes/template/layouts/_default/_markup/render-link.html +++ b/site/themes/template/layouts/_default/_markup/render-link.html @@ -1,32 +1,32 @@ {{ $link := .Destination }} {{ $isRemote := strings.HasPrefix $link "http" }} {{- if not $isRemote -}} - - {{- if in .Page.RelPermalink "/docs/latest/project/" }} - - {{- if in .Destination "/docs/" }} - {{ $link = printf "../../../../%s" (replace (replace (replace (replace .Destination "docs/" "docs/latest/") ".md" "") "/README" "") "_" "-" | lower ) }} - {{- end }} - - {{- if in .Destination "/chart/kubeapps/" }} - {{ $link = printf "../%s" (replace (replace (replace .Destination "/chart/kubeapps/" "/chart-readme/") ".md" "") "/README" "" | lower ) }} - {{- end }} - - - {{- if in .Destination "_" }} - {{ $link = printf "../%s" (replace (replace $link "_" "-") ".md" "" | lower ) }} - {{- end }} + + {{- if in .Page.RelPermalink "/docs/latest/project/" }} + + {{- if in .Destination "/docs/" }} + {{ $link = printf "../../../../%s" (replace (replace (replace (replace .Destination "docs/" "docs/latest/") ".md" "") "/README" "") "_" "-" | lower ) }} {{- end }} - - {{ $url := urls.Parse .Destination }} - {{- if $url.Path -}} - {{ $fragment := "" }} - {{- with $url.Fragment }} - {{ $fragment = printf "#%s" . }} - {{ end -}} - {{- with .Page.GetPage $url.Path }} - {{ $link = printf "%s%s" .RelPermalink $fragment }} - {{ end }} + + {{- if in .Destination "/chart/kubeapps/" }} + {{ $link = printf "../%s" (replace (replace (replace .Destination "/chart/kubeapps/" "/chart-readme/") ".md" "") "/README" "" | lower ) }} + {{- end }} + + + {{- if in .Destination "_" }} + {{ $link = printf "../%s" (replace (replace $link "_" "-") ".md" "" | lower ) }} + {{- end }} + {{- end }} + + {{ $url := urls.Parse .Destination }} + {{- if $url.Path -}} + {{ $fragment := "" }} + {{- with $url.Fragment }} + {{ $fragment = printf "#%s" . }} {{ end -}} + {{- with .Page.GetPage $url.Path }} + {{ $link = printf "%s%s" .RelPermalink $fragment }} + {{ end }} + {{ end -}} {{- end -}} {{ .Text | safeHTML }} diff --git a/site/themes/template/layouts/_default/docs.html b/site/themes/template/layouts/_default/docs.html index 8140239a1fd..89764d9cf62 100644 --- a/site/themes/template/layouts/_default/docs.html +++ b/site/themes/template/layouts/_default/docs.html @@ -1,16 +1,16 @@ {{ define "main" }}
-
-
-

Documentation

-
-
-
- {{ partial "docs-sidebar.html" . }} -
- {{ .Content }} -
- {{ partial "docs-right-bar.html" . }} -
+
+
+

Documentation

+
+
+
+ {{ partial "docs-sidebar.html" . }} +
+ {{ .Content }} +
+ {{ partial "docs-right-bar.html" . }} +
{{ end }} diff --git a/site/themes/template/layouts/_default/list.html b/site/themes/template/layouts/_default/list.html index ee5c5adf459..5fa71424891 100644 --- a/site/themes/template/layouts/_default/list.html +++ b/site/themes/template/layouts/_default/list.html @@ -1,14 +1,14 @@ {{ define "main" }}
- {{ if or .Title .Content }} -
- {{ with .Title }}

{{ . }}

{{ end }} - {{ with .Content }}
{{ . }}
{{ end }} -
- {{ end }} + {{ if or .Title .Content }} +
+ {{ with .Title }}

{{ . }}

{{ end }} + {{ with .Content }}
{{ . }}
{{ end }} +
+ {{ end }} - {{ range .Paginator.Pages }} - {{ .Render "summary" }} - {{ end }} + {{ range .Paginator.Pages }} + {{ .Render "summary" }} + {{ end }}
{{ end }} diff --git a/site/themes/template/layouts/_default/plugins.html b/site/themes/template/layouts/_default/plugins.html index bb090491285..29ecb36cae1 100644 --- a/site/themes/template/layouts/_default/plugins.html +++ b/site/themes/template/layouts/_default/plugins.html @@ -1,13 +1,13 @@ {{ define "main" }}
-
-
-

Plugins

-
-
-
- {{ .Content }} - {{ partial "plugins.html" . }} -
+
+
+

Plugins

+
+
+
+ {{ .Content }} + {{ partial "plugins.html" . }} +
{{ end }} diff --git a/site/themes/template/layouts/_default/posts.html b/site/themes/template/layouts/_default/posts.html index 1e627b207f5..87d4d71ea4b 100644 --- a/site/themes/template/layouts/_default/posts.html +++ b/site/themes/template/layouts/_default/posts.html @@ -1,17 +1,17 @@ {{ define "main" }}
-
-
-

Blog

-
-
-
-
- {{ range (.Paginator 9).Pages.ByDate }} - {{ partial "blog-post-card.html" . }} - {{ end }} -
- {{ partial "pagination.html" . }} -
+
+
+

Blog

+
+
+
+
+ {{ range (.Paginator 9).Pages.ByDate }} + {{ partial "blog-post-card.html" . }} + {{ end }} +
+ {{ partial "pagination.html" . }} +
{{ end }} diff --git a/site/themes/template/layouts/_default/section.html b/site/themes/template/layouts/_default/section.html index cf2e2739240..b46fd90ddd7 100644 --- a/site/themes/template/layouts/_default/section.html +++ b/site/themes/template/layouts/_default/section.html @@ -1,5 +1,5 @@ {{ define "main" }}
- {{ .Content }} + {{ .Content }}
{{ end }} diff --git a/site/themes/template/layouts/_default/single.html b/site/themes/template/layouts/_default/single.html index 877c78d28b3..ecc82a53bb8 100644 --- a/site/themes/template/layouts/_default/single.html +++ b/site/themes/template/layouts/_default/single.html @@ -1,30 +1,30 @@ {{ define "main" }}
-
-
-
-

Blog

-
-
-
-
-

{{ .Title }}

-

- {{ .Params.author }} -

-

{{ dateFormat "Jan 2, 2006" .Date }}

- {{ .Content }} -
-

Related Content

-
- {{ $related := (where (.Site.RegularPages.Related .) "Type" "posts") | first 3 }} - {{ with $related }} - {{ range . }} - {{ partial "blog-post-card.html" . }} - {{ end }} - {{ end }} -
-
-
+
+
+
+

Blog

+
+
+
+
+

{{ .Title }}

+

+ {{ .Params.author }} +

+

{{ dateFormat "Jan 2, 2006" .Date }}

+ {{ .Content }} +
+

Related Content

+
+ {{ $related := (where (.Site.RegularPages.Related .) "Type" "posts") | first 3 }} + {{ with $related }} + {{ range . }} + {{ partial "blog-post-card.html" . }} + {{ end }} + {{ end }} +
+
+
{{ end }} diff --git a/site/themes/template/layouts/_default/summary.html b/site/themes/template/layouts/_default/summary.html index a92b243001c..8a09dd268c0 100644 --- a/site/themes/template/layouts/_default/summary.html +++ b/site/themes/template/layouts/_default/summary.html @@ -1,13 +1,13 @@
-

{{ .Title }}

- - {{ range .Params.tags }} - {{ . }} - {{ end }} -
- {{ .Summary }} - {{ if .Truncated }} - Read more... - {{ end }} -
+

{{ .Title }}

+ + {{ range .Params.tags }} + {{ . }} + {{ end }} +
+ {{ .Summary }} + {{ if .Truncated }} + Read more... + {{ end }} +
diff --git a/site/themes/template/layouts/_default/tag.html b/site/themes/template/layouts/_default/tag.html index 168585fdf9d..7ec155da1a3 100644 --- a/site/themes/template/layouts/_default/tag.html +++ b/site/themes/template/layouts/_default/tag.html @@ -1,16 +1,16 @@ {{ define "main" }}
-
-
-

Blog Posts by {{ .Title }}

-
+
+
+

Blog Posts by {{ .Title }}

-
-
- {{ range .Pages.ByDate }} - {{ partial "blog-post-card.html" . }} - {{ end }} -
+
+
+
+ {{ range .Pages.ByDate }} + {{ partial "blog-post-card.html" . }} + {{ end }}
+
{{ end }} diff --git a/site/themes/template/layouts/_default/versions.html b/site/themes/template/layouts/_default/versions.html index f5cc73e053f..c06bf4c3901 100644 --- a/site/themes/template/layouts/_default/versions.html +++ b/site/themes/template/layouts/_default/versions.html @@ -1,21 +1,21 @@ {{ if .Site.Params.Use_advanced_docs }}
- {{ if .Site.Params.docs_versioning }} - - - {{ else }} - {{ .Site.Params.docs_latest }} + {{ if .Site.Params.docs_versioning }} + + + {{ else }} + {{ .Site.Params.docs_latest }} + {{ end }}
{{ end }} diff --git a/site/themes/template/layouts/partials/base-footer.html b/site/themes/template/layouts/partials/base-footer.html index eed6ac8ebbc..f5b267be0b1 100644 --- a/site/themes/template/layouts/partials/base-footer.html +++ b/site/themes/template/layouts/partials/base-footer.html @@ -3,26 +3,31 @@

- + + +

@@ -38,10 +43,10 @@ - Terms of Use | - Privacy Policy | - Your California Privacy Rights | - Cookie Settings + Terms of Use | + Privacy Policy | + Your California Privacy Rights | + Cookie Settings

diff --git a/site/themes/template/layouts/partials/base-header.html b/site/themes/template/layouts/partials/base-header.html index 72f72564a7a..8713ae7d4a0 100644 --- a/site/themes/template/layouts/partials/base-header.html +++ b/site/themes/template/layouts/partials/base-header.html @@ -1,31 +1,33 @@ {{ $latest := (cond (.Site.Params.docs_versioning) .Site.Params.docs_latest "") }}
-
- - - - -
+
+ + + + + + +
diff --git a/site/themes/template/layouts/partials/blog-post-card.html b/site/themes/template/layouts/partials/blog-post-card.html index bdda6613d37..eff55ec5aed 100644 --- a/site/themes/template/layouts/partials/blog-post-card.html +++ b/site/themes/template/layouts/partials/blog-post-card.html @@ -1,9 +1,11 @@
-
- {{ .Title }} -
-
-

{{ .Title }}

-

{{ .Params.Excerpt }}

-
-
\ No newline at end of file +
+ {{ .Title }} +
+
+

+ {{ .Title }} +

+

{{ .Params.Excerpt }}

+
+
diff --git a/site/themes/template/layouts/partials/docs-right-bar.html b/site/themes/template/layouts/partials/docs-right-bar.html index e693cfece9b..9a4e0ad61f5 100644 --- a/site/themes/template/layouts/partials/docs-right-bar.html +++ b/site/themes/template/layouts/partials/docs-right-bar.html @@ -1,18 +1,18 @@ {{ if .Site.Params.docs_right_sidebar }}
-
-
    - {{ if (or .IsNode .IsPage) }} - {{ $issueTitle := printf "[Docs] ADD-A-TITLE" }} - {{ $issueBody := printf "#### On Page: [%s](%s)\n\n Describe the issue" .RelPermalink .Permalink | htmlEscape }} - {{ $issueQuery := (querify "body" $issueBody "title" $issueTitle) }} -
  • Report Issues
    • - {{ end }} -
- {{ if ne .TableOfContents "" }} -

On this page:

- {{ .TableOfContents }} - {{ end }} -
+
+
    + {{ if (or .IsNode .IsPage) }} + {{ $issueTitle := printf "[Docs] ADD-A-TITLE" }} + {{ $issueBody := printf "#### On Page: [%s](%s)\n\n Describe the issue" .RelPermalink .Permalink | htmlEscape }} + {{ $issueQuery := (querify "body" $issueBody "title" $issueTitle) }} +
  • Report Issues
    • + {{ end }} +
+ {{ if ne .TableOfContents "" }} +

On this page:

+ {{ .TableOfContents }} + {{ end }} +
{{ end }} diff --git a/site/themes/template/layouts/partials/docs-sidebar.html b/site/themes/template/layouts/partials/docs-sidebar.html index 2bbebc70bd6..c2805943160 100644 --- a/site/themes/template/layouts/partials/docs-sidebar.html +++ b/site/themes/template/layouts/partials/docs-sidebar.html @@ -1,33 +1,33 @@
- {{ if .Site.Params.use_advanced_docs }} - - {{ $version := .CurrentSection.Params.version }} - {{ .Render "versions" }} - {{ .Render "search" }} - {{ if $version }} - {{ $tocTemplateName := index (index $.Site.Data.docs "toc-mapping") $version }} - {{ if not $tocTemplateName }} - {{ $tocTemplateName = "default" }} - {{ end }} - {{ $toc := (index $.Site.Data "docs" $tocTemplateName).toc }} - {{ range $toc }} -

{{ .title }}

-
    - {{ range .subfolderitems }} -
  • - {{ $url := (index (print "/docs/" $version .url "/")) }} - {{ .page }} -
    • - {{ end }} -
- {{ end }} - {{ end }} - {{ else }} + {{ if .Site.Params.use_advanced_docs }} + + {{ $version := .CurrentSection.Params.version }} + {{ .Render "versions" }} + {{ .Render "search" }} + {{ if $version }} + {{ $tocTemplateName := index (index $.Site.Data.docs "toc-mapping") $version }} + {{ if not $tocTemplateName }} + {{ $tocTemplateName = "default" }} + {{ end }} + {{ $toc := (index $.Site.Data "docs" $tocTemplateName).toc }} + {{ range $toc }} +

{{ .title }}

    - {{ $currentPage := . }} - {{ range .Site.Menus.docs }} -
  • {{ .Name }}
    • - {{ end }} + {{ range .subfolderitems }} +
  • + {{ $url := (index (print "/docs/" $version .url "/")) }} + {{ .page }} +
    • + {{ end }}
+ {{ end }} {{ end }} + {{ else }} +
    + {{ $currentPage := . }} + {{ range .Site.Menus.docs }} +
  • {{ .Name }}
    • + {{ end }} +
+ {{ end }}
diff --git a/site/themes/template/layouts/partials/home-contributors.html b/site/themes/template/layouts/partials/home-contributors.html index c7272eb4998..f6810898155 100644 --- a/site/themes/template/layouts/partials/home-contributors.html +++ b/site/themes/template/layouts/partials/home-contributors.html @@ -6,19 +6,12 @@

Meet the Kubeapps team:

$contributors.Resources }}
- {{ .Params.full_name }} + {{ .Params.full_name }}

- {{ .Params.full_name }} + + {{ .Params.full_name }}

{{ .Params.role }}

@@ -28,19 +21,17 @@

Meet the Kubeapps team:

Contributing

- Kubeapps is released as open-source software and provides community - support through our GitHub project page. If you encounter an issue or have - a question, feel free to reach out on the - GitHub issues page for Kubeapps. + Kubeapps is released as open-source software and provides community support through our GitHub project page. If + you encounter an issue or have a question, feel free to reach out on the + + GitHub issues page for Kubeapps + .

- The Kubeapps project team welcomes contributions from the community — - please have a look at our - contributing documentation. + The Kubeapps project team welcomes contributions from the community — please have a look at our + + contributing documentation + .

diff --git a/site/themes/template/layouts/partials/home-grey-block.html b/site/themes/template/layouts/partials/home-grey-block.html index 48cfa5ff587..069bc8abfd7 100644 --- a/site/themes/template/layouts/partials/home-grey-block.html +++ b/site/themes/template/layouts/partials/home-grey-block.html @@ -3,16 +3,12 @@

Kubeapps Community Meeting

- We hold bi-weekly on Mondays at 10:30 AM UTC. We use these meetings to - share project updates, solicit feedback, and demo new upcoming features. - Add - the invitation + We hold bi-weekly on Mondays at 10:30 AM UTC. We use these meetings to share project updates, solicit feedback, + and demo new upcoming features. Add + + the invitation + in your calendar and come by!

diff --git a/site/themes/template/layouts/partials/pagination.html b/site/themes/template/layouts/partials/pagination.html index 9c90baf2fc5..a15282a1b0b 100644 --- a/site/themes/template/layouts/partials/pagination.html +++ b/site/themes/template/layouts/partials/pagination.html @@ -1,16 +1,16 @@ {{ $paginator := .Paginator }} {{ if gt $paginator.TotalPages 1 }} -{{ end }} \ No newline at end of file +{{ end }} diff --git a/site/themes/template/layouts/partials/plugins.html b/site/themes/template/layouts/partials/plugins.html index 863054fb097..eb4a6d89d1d 100644 --- a/site/themes/template/layouts/partials/plugins.html +++ b/site/themes/template/layouts/partials/plugins.html @@ -1,48 +1,48 @@
- {{ $limit := int (.Scratch.Get "limit") }} - {{ $pages := sort (.Site.GetPage "/plugins/list").Resources "Name" }} + {{ $limit := int (.Scratch.Get "limit") }} + {{ $pages := sort (.Site.GetPage "/plugins/list").Resources "Name" }} - {{ if gt $limit 0 }} - {{ $pages = first $limit $pages }} - {{ end }} + {{ if gt $limit 0 }} + {{ $pages = first $limit $pages }} + {{ end }} - {{ range $index, $page := $pages }} -
-
- {{ if .Params.link }} -

{{ .Title }}

- {{ else }} -

{{ .Title }}

- {{ end }} -

{{ .Content }}

- {{ if .Params.objectStorage }} - - {{ end }} - {{ if .Params.volumesnapshotter }} - - {{ end }} - {{ if .Params.localStorage }} - - {{ end }} - {{ if .Params.supportedByVeleroTeam }} - - {{ end }} - {{ if .Params.BackupItemAction }} - - {{ end }} - {{ if .Params.RestoreItemAction }} - - {{ end }} - {{ if .Params.beta }} - - {{ end }} -
+ {{ range $index, $page := $pages }} +
+
+ {{ if .Params.link }} +

{{ .Title }}

+ {{ else }} +

{{ .Title }}

+ {{ end }} +

{{ .Content }}

+ {{ if .Params.objectStorage }} + + {{ end }} + {{ if .Params.volumesnapshotter }} + + {{ end }} + {{ if .Params.localStorage }} + + {{ end }} + {{ if .Params.supportedByVeleroTeam }} + + {{ end }} + {{ if .Params.BackupItemAction }} + + {{ end }} + {{ if .Params.RestoreItemAction }} + + {{ end }} + {{ if .Params.beta }} + + {{ end }}
- {{ $currentIndex := add $index 1 }} - {{ $row := mod $currentIndex 3 }} - {{ if eq $row 0 }} +
+ {{ $currentIndex := add $index 1 }} + {{ $row := mod $currentIndex 3 }} + {{ if eq $row 0 }}
- {{ end }} - {{ end }} + {{ end }} + {{ end }}
diff --git a/site/themes/template/layouts/shortcodes/resource-item.html b/site/themes/template/layouts/shortcodes/resource-item.html index 53be5f8da4f..315f4ffdd9d 100644 --- a/site/themes/template/layouts/shortcodes/resource-item.html +++ b/site/themes/template/layouts/shortcodes/resource-item.html @@ -1,36 +1,36 @@
-
-

{{ ( .Get "title") }}

-

{{ ( .Get "date") }}

+
+

{{ ( .Get "title") }}

+

{{ ( .Get "date") }}

+
+ {{- if eq (.Get "type") "video" -}} +
+ {{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} + {{- if not $pc.Disable -}} + {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} + {{- $id := .Get "videoID" | default (.Get 0) -}} + {{- $class := .Get "class" | default (.Get 1) -}} + {{- $title := .Get "text" | default "YouTube Video" }} +
+
+ {{ end -}} +
+ {{ else }} +
+ +
+ {{ end }} +
{{- if eq (.Get "type") "video" -}} -
- {{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} - {{- if not $pc.Disable -}} - {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} - {{- $id := .Get "videoID" | default (.Get 0) -}} - {{- $class := .Get "class" | default (.Get 1) -}} - {{- $title := .Get "text" | default "YouTube Video" }} -
- -
- {{ end -}} -
- {{ else }} -
- -
- {{ end }} -
- {{- if eq (.Get "type") "video" -}} - {{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} - {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} - {{- $id := .Get "videoID" | default (.Get 0) -}} -

{{ (.Get "text")}}. - {{ else }} -

{{ (.Get "text") }}. - {{ end }} -

-
+ {{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} + {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} + {{- $id := .Get "videoID" | default (.Get 0) -}} +

{{ (.Get "text")}}. + {{ else }} +

{{ (.Get "text") }}. + {{ end }} +

+
diff --git a/site/themes/template/layouts/shortcodes/youtube.html b/site/themes/template/layouts/shortcodes/youtube.html index cee86d49916..7e8fd6a814b 100644 --- a/site/themes/template/layouts/shortcodes/youtube.html +++ b/site/themes/template/layouts/shortcodes/youtube.html @@ -10,6 +10,6 @@ {{- $class := .Get "class" | default (.Get 1) -}} {{- $title := .Get "title" | default "YouTube Video" }}
- +
{{ end -}} From b4806cf1dc6edd11fee9f4b715ce94d8050887a1 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 19:43:34 +0200 Subject: [PATCH 06/26] improve 404 page Signed-off-by: Antonio Gamez Diaz --- site/themes/template/layouts/404.html | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/site/themes/template/layouts/404.html b/site/themes/template/layouts/404.html index 0abc1493af3..814328e7b64 100644 --- a/site/themes/template/layouts/404.html +++ b/site/themes/template/layouts/404.html @@ -1,14 +1,17 @@ {{ define "main"}} -
-
-
-
-

Page not found

-
- Go home -
+
+
+

Page not found

+
+
+
+

The page you requested was not found

+
+
+
+ Go home
-
+
{{ end }} From 11d2c8d5fc9b5e1bdfe8c5ea53ccd380c8cd590f Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Tue, 11 Oct 2022 20:33:15 +0200 Subject: [PATCH 07/26] Minor css fixes Signed-off-by: Antonio Gamez Diaz --- site/content/resources/_index.html | 230 +++++++++--------- site/themes/template/assets/scss/_base.scss | 4 +- .../template/assets/scss/_components.scss | 70 +++--- 3 files changed, 145 insertions(+), 159 deletions(-) diff --git a/site/content/resources/_index.html b/site/content/resources/_index.html index 9c7c117e320..6a545029be3 100644 --- a/site/content/resources/_index.html +++ b/site/content/resources/_index.html @@ -4,175 +4,175 @@ ---
-
-

Resources

-
+
+

Resources

+
-

- Some useful external resources about Kubeapps, such as videos, workshops, and community articles. -

-
- {{< resource-item - type="video" - videoID="rkci46GFlQA" - date="Jun 2022" - title="Tanzu Hispano meetup" - text="Kubeapps, una interfaz para gestionarlos a todos (in Spanish)" +

+ Some useful external resources about Kubeapps, such as videos, workshops, and community articles. +

+
+ {{< resource-item + type="video" + videoID="rkci46GFlQA" + date="Jun 2022" + title="Tanzu Hispano meetup" + text="Kubeapps, una interfaz para gestionarlos a todos (in Spanish)" >}} - {{< resource-item - type="video" - videoID="rS2AhcIPQEs" - date="Nov 2021" - title="Tanzu Tuesday video" - text="Carvel support in Kubeapps - New pluggable gRPC-based architecture" + {{< resource-item + type="video" + videoID="rS2AhcIPQEs" + date="Nov 2021" + title="Tanzu Tuesday video" + text="Carvel support in Kubeapps - New pluggable gRPC-based architecture" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Nov 2021" - title="Tanzu Developer Center post" - url="https://tanzu.vmware.com/developer/blog/kubeapps-meets-tanzu-kubernetes-grid-a-new-release-is-out/" - text="Kubeapps Meets Tanzu Kubernetes Grid: a New Release is out" + type="link" + icon="kubeapps-icon.svg" + date="Nov 2021" + title="Tanzu Developer Center post" + url="https://tanzu.vmware.com/developer/blog/kubeapps-meets-tanzu-kubernetes-grid-a-new-release-is-out/" + text="Kubeapps Meets Tanzu Kubernetes Grid: a New Release is out" >}} {{< resource-item - type="video" - videoID="ICEGPvHAiYY" - date="Nov 2021" - title="Demo video" - text="WIP flux and carvel support" + type="video" + videoID="ICEGPvHAiYY" + date="Nov 2021" + title="Demo video" + text="WIP flux and carvel support" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Sep 2021" - title="Tanzu Developer Center post" - url="https://tanzu.vmware.com/developer/blog/kubeapps-2.3.4-easier-deployment-in-vmware-tanzu-kubernetes-grid-clusters/" - text="Kubeapps 2.3.4 - Easier Deployment in VMware Tanzu™ Kubernetes Grid Clusters" + type="link" + icon="kubeapps-icon.svg" + date="Sep 2021" + title="Tanzu Developer Center post" + url="https://tanzu.vmware.com/developer/blog/kubeapps-2.3.4-easier-deployment-in-vmware-tanzu-kubernetes-grid-clusters/" + text="Kubeapps 2.3.4 - Easier Deployment in VMware Tanzu™ Kubernetes Grid Clusters" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Jun 2021" - title="Tanzu Developer Center post" - url="https://tanzu.vmware.com/developer/blog/kubeapps-meets-tanzu-kubernetes-grid-a-new-release-is-out/" - text="Kubeapps Meets Tanzu Kubernetes Grid: a New Release is out" + type="link" + icon="kubeapps-icon.svg" + date="Jun 2021" + title="Tanzu Developer Center post" + url="https://tanzu.vmware.com/developer/blog/kubeapps-meets-tanzu-kubernetes-grid-a-new-release-is-out/" + text="Kubeapps Meets Tanzu Kubernetes Grid: a New Release is out" >}} {{< resource-item - type="video" - videoID="DGMWRZ7SyqY" - date="Feb 2021" - title="Demo video" - text="Kubeapps on Tanzu Mission Control with Pinniped" + type="video" + videoID="DGMWRZ7SyqY" + date="Feb 2021" + title="Demo video" + text="Kubeapps on Tanzu Mission Control with Pinniped" >}} {{< resource-item - type="video" - videoID="d4WnWvQZmuE" - date="Feb 2021" - title="Demo video" - text="Kubeapps running on Tanzu Mission Control" + type="video" + videoID="d4WnWvQZmuE" + date="Feb 2021" + title="Demo video" + text="Kubeapps running on Tanzu Mission Control" >}} {{< resource-item - type="video" - videoID="btGJh99bsdA" - date="Dec 2020" - title="Demo video" - text="How to Install Kubeapps Using vSphere with Tanzu and Tanzu Kubernetes Clusters" + type="video" + videoID="btGJh99bsdA" + date="Dec 2020" + title="Demo video" + text="How to Install Kubeapps Using vSphere with Tanzu and Tanzu Kubernetes Clusters" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Oct 2020" - title="Bitnami Blog post" - url="https://blog.bitnami.com/2020/10/Kubeapps-2.0.html" - text="Kubeapps 2.0: Empowering Kubernetes users with a new UI and multi cluster support" + type="link" + icon="kubeapps-icon.svg" + date="Oct 2020" + title="Bitnami Blog post" + url="https://blog.bitnami.com/2020/10/Kubeapps-2.0.html" + text="Kubeapps 2.0: Empowering Kubernetes users with a new UI and multi cluster support" >}} {{< resource-item - type="video" - videoID="pzVMZGTK0vU" - date="Sep 2020" - title="Demo video" - text="Multi-cluster Kubeapps running on VMware Tanzu Kubernetes Grid" + type="video" + videoID="pzVMZGTK0vU" + date="Sep 2020" + title="Demo video" + text="Multi-cluster Kubeapps running on VMware Tanzu Kubernetes Grid" >}} {{< resource-item - type="video" - videoID="KIoW4zZDtdY" - date="Jul 2020" - title="Demo video" - text="Kubeapps multicluster preview" + type="video" + videoID="KIoW4zZDtdY" + date="Jul 2020" + title="Demo video" + text="Kubeapps multicluster preview" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Apr 2020" - title="Tanzu Developer Center guide" - url="https://tanzu.vmware.com/developer/guides/kubeapps-gs/" - text="Getting Started with Kubeapps" + type="link" + icon="kubeapps-icon.svg" + date="Apr 2020" + title="Tanzu Developer Center guide" + url="https://tanzu.vmware.com/developer/guides/kubeapps-gs/" + text="Getting Started with Kubeapps" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="May 2020" - title="Tanzu Developer Center guide" - url="https://tanzu.vmware.com/developer/guides/kubernetes/kubeapps-private-repo/" - text="Deploy from a Private Helm Repository Using Kubeapps" + type="link" + icon="kubeapps-icon.svg" + date="May 2020" + title="Tanzu Developer Center guide" + url="https://tanzu.vmware.com/developer/guides/kubernetes/kubeapps-private-repo/" + text="Deploy from a Private Helm Repository Using Kubeapps" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="May 2020" - title="Bitnami Blog post" - url="https://blog.bitnami.com/2020/05/kubeapps-now-supports-private-docker-registries.html" - text="Kubeapps Now Supports Private Helm and Docker Registries" + type="link" + icon="kubeapps-icon.svg" + date="May 2020" + title="Bitnami Blog post" + url="https://blog.bitnami.com/2020/05/kubeapps-now-supports-private-docker-registries.html" + text="Kubeapps Now Supports Private Helm and Docker Registries" >}} {{< resource-item - type="video" - videoID="g8uDC3mG1E0" - date="Apr 2020" - title="Demo video" - text="Kubeapps support for Private Docker Registries" + type="video" + videoID="g8uDC3mG1E0" + date="Apr 2020" + title="Demo video" + text="Kubeapps support for Private Docker Registries" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Apr 2020" - title="Bitnami Blog post" - url="https://blog.bitnami.com/2020/04/kubeapps-extends-its-catalog-support-operators.html" - text="Kubeapps Extends its Catalog with Support for Operators" + type="link" + icon="kubeapps-icon.svg" + date="Apr 2020" + title="Bitnami Blog post" + url="https://blog.bitnami.com/2020/04/kubeapps-extends-its-catalog-support-operators.html" + text="Kubeapps Extends its Catalog with Support for Operators" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Oct 2019" - title="Bitnami Blog post" - url="https://blog.bitnami.com/2019/10/kubeapps-v160-is-out.html" - text="Kubeapps v1.6.0 is out!" + type="link" + icon="kubeapps-icon.svg" + date="Oct 2019" + title="Bitnami Blog post" + url="https://blog.bitnami.com/2019/10/kubeapps-v160-is-out.html" + text="Kubeapps v1.6.0 is out!" >}} {{< resource-item - type="link" - icon="kubeapps-icon.svg" - date="Ago 2018" - title="Bitnami Blog post" - url="https://blog.bitnami.com/2018/08/automating-packaging.html" - text="Self-service Apps - Automating the Packaging-to-publishing Experience for Kubernetes with Bitnami Stacksmith and Kubeapps " + type="link" + icon="kubeapps-icon.svg" + date="Ago 2018" + title="Bitnami Blog post" + url="https://blog.bitnami.com/2018/08/automating-packaging.html" + text="Self-service Apps - Automating the Packaging-to-publishing Experience for Kubernetes with Bitnami Stacksmith and Kubeapps " >}} -
+
diff --git a/site/themes/template/assets/scss/_base.scss b/site/themes/template/assets/scss/_base.scss index e5f3d5b0b28..39de123c10e 100644 --- a/site/themes/template/assets/scss/_base.scss +++ b/site/themes/template/assets/scss/_base.scss @@ -157,9 +157,9 @@ button { .grid.three { display: grid; - column-gap: 20px; + column-gap: 1em; grid-template-columns: 1fr 1fr 1fr; - row-gap: 20px; + row-gap: 1em; @include breakpoint(small) { grid-template-columns: 1fr; diff --git a/site/themes/template/assets/scss/_components.scss b/site/themes/template/assets/scss/_components.scss index f981596b52b..ba7158be5f9 100644 --- a/site/themes/template/assets/scss/_components.scss +++ b/site/themes/template/assets/scss/_components.scss @@ -7,30 +7,29 @@ color: $white; .text-block { - max-width: 550px; - padding: 0 0 10px; + max-width: 66%; + padding: 0 0 0.5em; p { - margin-bottom: 20px; color: $white; font-size: 18px; } + h1 { + font-size: 36px; + } + h2 { font-size: 36px; } } &.homepage { - padding-bottom: 80px; - //background-image: url(/img/hero-image.png); + padding-bottom: 5em; // same as .grid-container margin-top background-position: center center; background-repeat: no-repeat; background-size: cover; - h1 { - font-size: 36px; - } } @include breakpoint(small) { @@ -51,14 +50,14 @@ } .grid-container { - margin-top: -80px; + margin-top: -5em; .grid.three { - padding-bottom: 20px; + padding-bottom: 1em; .card { position: relative; - padding: 30px 20px; + padding: 1.5em 1em; background-color: $white; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2); text-align: center; @@ -77,8 +76,7 @@ .introduction { .grid.two { - padding: 35px 20px; - column-gap: 140px; + padding: 2em; p { margin: 0; @@ -91,19 +89,15 @@ } @include breakpoint(small) { - padding: 0 20px; - - .col:first-of-type { - padding-bottom: 50px; - } + padding: 0 1em; } } .use-cases { .grid { - margin-bottom: 30px; + margin-bottom: 1em; grid-template-areas: "image text"; - grid-template-columns: 220px 1fr; + grid-template-columns: 20% 1fr; .image { display: flex; @@ -118,23 +112,9 @@ } } - .text { - padding: 1em; - border: 1px solid $lightgrey; - grid-area: text; - - a.button { - display: block; - min-width: unset; - max-width: 138px; - padding: 5px 10px; - text-align: center; - } - } - &.image-right { grid-template-areas: "text image"; - grid-template-columns: 1fr 220px; + grid-template-columns: 1fr 20%; @include breakpoint(small) { grid-template-areas: @@ -144,6 +124,12 @@ } } + .text { + padding: 1em; + border: 1px solid $lightgrey; + grid-area: text; + } + @include breakpoint(small) { grid-template-areas: "image" @@ -158,7 +144,7 @@ } p.strong { - color: #1b3951; + color: $darkgrey; font-size: 16px; } } @@ -183,18 +169,18 @@ } .grid.three { - margin: 40px 0; - row-gap: 40px; + margin: 1em 0; + row-gap: 1.5em; } .bio { display: grid; - column-gap: 20px; - grid-template-columns: 120px 1fr; + column-gap: 1em; + grid-template-columns: 7em 1fr; .image img { - width: 120px; - height: 120px; + width: 7em; + height: 7em; } .info { From 6ee0292016a1ce9fdb904ee53c2a4466091c4a78 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 01:07:44 +0200 Subject: [PATCH 08/26] Generate md link titles Signed-off-by: Antonio Gamez Diaz --- .../layouts/_default/_markup/render-link.html | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/site/themes/template/layouts/_default/_markup/render-link.html b/site/themes/template/layouts/_default/_markup/render-link.html index 516c969fde2..1e6d8b2b11f 100644 --- a/site/themes/template/layouts/_default/_markup/render-link.html +++ b/site/themes/template/layouts/_default/_markup/render-link.html @@ -29,4 +29,20 @@ {{ end }} {{ end -}} {{- end -}} -{{ .Text | safeHTML }} + + +{{ $title := "" }} +{{- if .Title }} + + {{ $title = .Title }} +{{- else }} + + {{- if in .Text ">" }} + {{ $title = (urls.Parse .Destination).Host }} + {{- else }} + + {{ $title = .Text }} + {{- end }} +{{- end }} + +{{ .Text | safeHTML }} From bf8242378e4e8907169578e781816934a6d96320 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 01:27:08 +0200 Subject: [PATCH 09/26] Add links to anchors Signed-off-by: Antonio Gamez Diaz --- .../template/layouts/_default/_markup/render-heading.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/site/themes/template/layouts/_default/_markup/render-heading.html b/site/themes/template/layouts/_default/_markup/render-heading.html index 50bcac53aae..e3d3f0e4a61 100644 --- a/site/themes/template/layouts/_default/_markup/render-heading.html +++ b/site/themes/template/layouts/_default/_markup/render-heading.html @@ -1 +1,5 @@ -{{ .Text | safeHTML }} +{{ .Text | safeHTML }} + + ¶ + + From bf7be16df56f09f49b031f17414b8ff084839f6c Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 01:36:37 +0200 Subject: [PATCH 10/26] Add title in links with img Signed-off-by: Antonio Gamez Diaz --- .../layouts/_default/_markup/render-heading.html | 2 +- .../template/layouts/partials/base-footer.html | 10 +++++----- .../template/layouts/partials/base-header.html | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/site/themes/template/layouts/_default/_markup/render-heading.html b/site/themes/template/layouts/_default/_markup/render-heading.html index e3d3f0e4a61..551e28eeeb0 100644 --- a/site/themes/template/layouts/_default/_markup/render-heading.html +++ b/site/themes/template/layouts/_default/_markup/render-heading.html @@ -1,5 +1,5 @@ {{ .Text | safeHTML }} - + diff --git a/site/themes/template/layouts/partials/base-footer.html b/site/themes/template/layouts/partials/base-footer.html index f5b267be0b1..ee096771378 100644 --- a/site/themes/template/layouts/partials/base-footer.html +++ b/site/themes/template/layouts/partials/base-footer.html @@ -3,20 +3,20 @@

- +

@@ -38,7 +38,7 @@ A VMware-backed project. - + diff --git a/site/themes/template/layouts/partials/base-header.html b/site/themes/template/layouts/partials/base-header.html index 8713ae7d4a0..a27423c01d1 100644 --- a/site/themes/template/layouts/partials/base-header.html +++ b/site/themes/template/layouts/partials/base-header.html @@ -1,7 +1,7 @@ {{ $latest := (cond (.Site.Params.docs_versioning) .Site.Params.docs_latest "") }}
- +
From c95c710e5de2a5c11251aab6c06f0bf38e5218ee Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 02:33:45 +0200 Subject: [PATCH 11/26] Add more a11y fixes Signed-off-by: Antonio Gamez Diaz --- site/themes/template/assets/scss/_components.scss | 5 +++-- .../template/layouts/_default/_markup/render-link.html | 3 +++ site/themes/template/layouts/partials/home-hero.html | 5 ++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/site/themes/template/assets/scss/_components.scss b/site/themes/template/assets/scss/_components.scss index ba7158be5f9..dba430b0eca 100644 --- a/site/themes/template/assets/scss/_components.scss +++ b/site/themes/template/assets/scss/_components.scss @@ -7,12 +7,13 @@ color: $white; .text-block { - max-width: 66%; + max-width: 65%; padding: 0 0 0.5em; p { color: $white; - font-size: 18px; + font-size: 19px; + font-weight: bold; } h1 { diff --git a/site/themes/template/layouts/_default/_markup/render-link.html b/site/themes/template/layouts/_default/_markup/render-link.html index 1e6d8b2b11f..dfa1ee59eb5 100644 --- a/site/themes/template/layouts/_default/_markup/render-link.html +++ b/site/themes/template/layouts/_default/_markup/render-link.html @@ -45,4 +45,7 @@ {{- end }} {{- end }} + +{{- if not (or (in $link "netlify.com") (in $link "circleci") )}} {{ .Text | safeHTML }} +{{- end }} diff --git a/site/themes/template/layouts/partials/home-hero.html b/site/themes/template/layouts/partials/home-hero.html index 2fe9d7d9628..45bc7f35c87 100644 --- a/site/themes/template/layouts/partials/home-hero.html +++ b/site/themes/template/layouts/partials/home-hero.html @@ -3,9 +3,8 @@

Your Application Dashboard for Kubernetes

- Kubeapps is an in-cluster web-based application that enables users with - a one-time installation to deploy, manage, and upgrade applications on a - Kubernetes cluster.. + Kubeapps is an in-cluster web-based application that enables users with a one-time installation to deploy, + manage, and upgrade applications on a Kubernetes cluster

Getting started From 381d38f41499354e4d6a3769273d6cfadde981b8 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 11:35:05 +0200 Subject: [PATCH 12/26] Increase heading --- .../template/layouts/_default/_markup/render-heading.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/site/themes/template/layouts/_default/_markup/render-heading.html b/site/themes/template/layouts/_default/_markup/render-heading.html index 551e28eeeb0..2cc62fd4a12 100644 --- a/site/themes/template/layouts/_default/_markup/render-heading.html +++ b/site/themes/template/layouts/_default/_markup/render-heading.html @@ -1,5 +1,9 @@ -{{ .Text | safeHTML }} +{{ $level := .Level }} +{{- if not (eq .Level 6) }} + {{ $level = add $level 1 }} +{{- end }} +{{ .Text | safeHTML }} - + From 6a05bc01107089d53f1702c027143937e5ecea6d Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 11:35:36 +0200 Subject: [PATCH 13/26] Remove unused version selector (via param) Signed-off-by: Antonio Gamez Diaz --- site/config.yaml | 1 + site/themes/template/layouts/_default/versions.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/site/config.yaml b/site/config.yaml index 66451e034f1..d9115fa742b 100644 --- a/site/config.yaml +++ b/site/config.yaml @@ -44,6 +44,7 @@ params: twitter: vmwmarketplace twitter_url: "https://twitter.com/vmwmarketplace" use_advanced_docs: true + display_version_selector: false docs_versions: - latest privacy: diff --git a/site/themes/template/layouts/_default/versions.html b/site/themes/template/layouts/_default/versions.html index c06bf4c3901..378098cffe4 100644 --- a/site/themes/template/layouts/_default/versions.html +++ b/site/themes/template/layouts/_default/versions.html @@ -1,4 +1,4 @@ -{{ if .Site.Params.Use_advanced_docs }} +{{ if and .Site.Params.display_version_selector .Site.Params.use_advanced_docs }}
{{ if .Site.Params.docs_versioning }}
diff --git a/site/themes/template/layouts/partials/docs-right-bar.html b/site/themes/template/layouts/partials/docs-right-bar.html index 6b05b95f5b3..e4d263448cf 100644 --- a/site/themes/template/layouts/partials/docs-right-bar.html +++ b/site/themes/template/layouts/partials/docs-right-bar.html @@ -6,7 +6,10 @@ {{ $issueTitle := printf "[Docs] ADD-A-TITLE" }} {{ $issueBody := printf "#### On Page: [%s](%s)\n\n Describe the issue" .RelPermalink .Permalink | htmlEscape }} {{ $issueQuery := (querify "body" $issueBody "title" $issueTitle) }} -
  • Report Issues
    • +
  • + Report Issues +
    • {{ end }} {{ if ne .TableOfContents "" }} diff --git a/site/themes/template/layouts/partials/home-contributors.html b/site/themes/template/layouts/partials/home-contributors.html index 2fffeb40e1c..f24e490177a 100644 --- a/site/themes/template/layouts/partials/home-contributors.html +++ b/site/themes/template/layouts/partials/home-contributors.html @@ -10,7 +10,8 @@

    Meet the Kubeapps team:

    - + {{ .Params.full_name }}

    {{ .Params.role }}

    @@ -22,7 +23,8 @@

    Contributing

    Kubeapps is released as open-source software and provides community support through our GitHub project page. If you encounter an issue or have a question, feel free to reach out on the - + GitHub issues page for Kubeapps.

    diff --git a/site/themes/template/layouts/partials/home-grey-block.html b/site/themes/template/layouts/partials/home-grey-block.html index 1b40198be1e..0254f5aa211 100644 --- a/site/themes/template/layouts/partials/home-grey-block.html +++ b/site/themes/template/layouts/partials/home-grey-block.html @@ -6,6 +6,7 @@ We hold bi-weekly on Mondays at 10:30 AM UTC. We use these meetings to share project updates, solicit feedback, and demo new upcoming features. Add the invitation in your calendar and come by! diff --git a/site/themes/template/layouts/partials/use-cases.html b/site/themes/template/layouts/partials/use-cases.html index a125ca37841..ac730100e4a 100644 --- a/site/themes/template/layouts/partials/use-cases.html +++ b/site/themes/template/layouts/partials/use-cases.html @@ -104,8 +104,10 @@

    What is Kubeapps?

    kubectl port-forward -n kubeapps svc/kubeapps 8080:80 ` "" "" }}
    -

    - Go to localhost:8080

    +

    + Go to localhost:8080 +

    diff --git a/site/themes/template/layouts/shortcodes/resource-item.html b/site/themes/template/layouts/shortcodes/resource-item.html index 315f4ffdd9d..f6e349e9f02 100644 --- a/site/themes/template/layouts/shortcodes/resource-item.html +++ b/site/themes/template/layouts/shortcodes/resource-item.html @@ -27,9 +27,9 @@ {{- $pc := .Page.Site.Config.Privacy.YouTube | default true -}} {{- $ytHost := cond $pc.PrivacyEnhanced "www.youtube-nocookie.com" "www.youtube.com" -}} {{- $id := .Get "videoID" | default (.Get 0) -}} -

    {{ (.Get "text")}}. +

    {{ (.Get "text")}}. {{ else }} -

    {{ (.Get "text") }}. +

    {{ (.Get "text") }}. {{ end }}

    From a6da5d37a0f367980071596708ff3a15b8929d53 Mon Sep 17 00:00:00 2001 From: Antonio Gamez Diaz Date: Wed, 12 Oct 2022 19:42:41 +0200 Subject: [PATCH 26/26] Add title to anchor links Signed-off-by: Antonio Gamez Diaz --- .../template/layouts/_default/_markup/render-heading.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/themes/template/layouts/_default/_markup/render-heading.html b/site/themes/template/layouts/_default/_markup/render-heading.html index d11d8401269..5cd0f8bed8e 100644 --- a/site/themes/template/layouts/_default/_markup/render-heading.html +++ b/site/themes/template/layouts/_default/_markup/render-heading.html @@ -2,6 +2,6 @@ {{- if not (eq .Level 6) }} {{ $level = add $level 1 }} {{- end }} - + {{ .Text | safeHTML }} ¶