From ad869dda90bebb2ba162840a04e9fd6fecd19e84 Mon Sep 17 00:00:00 2001 From: Philipp Rudloff Date: Fri, 3 Nov 2023 10:34:37 +0100 Subject: [PATCH 1/5] chore: set shell in Makefile Signed-off-by: Philipp Rudloff --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 33fbab850..891ada06b 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +SHELL := /usr/bin/env bash + define newline From a3d609f2a7f638468dd8b027c4f407f1e3fe2811 Mon Sep 17 00:00:00 2001 From: Philipp Rudloff Date: Fri, 3 Nov 2023 11:21:28 +0100 Subject: [PATCH 2/5] chore: add missing set_flag_values_prefix in jekyll-dev.yml Signed-off-by: Philipp Rudloff --- jekyll-dev.yml | 7 +++++++ jekyll.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/jekyll-dev.yml b/jekyll-dev.yml index cc240a1c2..7835d14e7 100644 --- a/jekyll-dev.yml +++ b/jekyll-dev.yml @@ -74,6 +74,13 @@ mesh_product_name_path: kuma mesh_namespace: kuma-system mesh_cp_name: kuma-control-plane mesh_base_url: https://kuma.io +# Prefix for the values of "--set" flag for "kumactl install [...]" or +# "helm install [...]" commands. +# It's useful for projects based on Kuma, which expects Kuma options +# to be prefixed with for example "kuma." +# kumactl install control-plane \ +# --set "{{site.set_flag_values_prefix}}experimental.ebpf.enabled=true" +set_flag_values_prefix: "" # Helm commands mesh_helm_repo: kuma/kuma diff --git a/jekyll.yml b/jekyll.yml index 46d9881af..98cd2da04 100644 --- a/jekyll.yml +++ b/jekyll.yml @@ -72,11 +72,11 @@ include: - installer.sh - robots.txt +# Product name variables mesh_product_name: Kuma mesh_product_name_path: kuma mesh_namespace: kuma-system mesh_cp_name: kuma-control-plane -# Product name variables # Prefix for the values of "--set" flag for "kumactl install [...]" or # "helm install [...]" commands. # It's useful for projects based on Kuma, which expects Kuma options From 3886e5ae857faf3e6bc1211d9a39f57532e0238a Mon Sep 17 00:00:00 2001 From: Philipp Rudloff Date: Fri, 3 Nov 2023 14:54:03 +0100 Subject: [PATCH 3/5] chore: adds kill-ports command to Makefile Signed-off-by: Philipp Rudloff --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 891ada06b..7ef517338 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ endif # Installs npm packages and gems. install: ruby-version-check - npm install -g netlify-cli + npm install -g netlify-cli@16.5.1 yarn install bundle install @@ -35,3 +35,7 @@ serve: clean: -rm -rf dist -rm -rf app/.jekyll-cache + +kill-ports: + @JEKYLL_PROCESS=$$(lsof -ti:4000) && kill -9 $$JEKYLL_PROCESS || true + @VITE_PROCESS=$$(lsof -ti:3036) && kill -9 $$VITE_PROCESS || true From 79190d0ba30fb4f41811d85bfdbe235f45afd32b Mon Sep 17 00:00:00 2001 From: Philipp Rudloff Date: Fri, 3 Nov 2023 15:03:29 +0100 Subject: [PATCH 4/5] chore: update make clean command Signed-off-by: Philipp Rudloff --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 7ef517338..aca9db391 100644 --- a/Makefile +++ b/Makefile @@ -35,6 +35,8 @@ serve: clean: -rm -rf dist -rm -rf app/.jekyll-cache + -rm -rf app/.jekyll-metadata + -rm -rf .jekyll-cache/vite kill-ports: @JEKYLL_PROCESS=$$(lsof -ti:4000) && kill -9 $$JEKYLL_PROCESS || true From 970927d36753a67cd5833c3722ed2f3fbf5cfad4 Mon Sep 17 00:00:00 2001 From: Philipp Rudloff Date: Fri, 3 Nov 2023 11:19:07 +0100 Subject: [PATCH 5/5] fix: sidebar being too tall to scroll properly Signed-off-by: Philipp Rudloff --- .../styles/custom/components/_sidebar.scss | 45 +++++-------------- app/_assets/styles/vuepress-core/sidebar.scss | 2 - 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/app/_assets/styles/custom/components/_sidebar.scss b/app/_assets/styles/custom/components/_sidebar.scss index 68eed2ab1..78a283e3d 100644 --- a/app/_assets/styles/custom/components/_sidebar.scss +++ b/app/_assets/styles/custom/components/_sidebar.scss @@ -1,6 +1,6 @@ -// +// // Sidebarm, sidebar button -// +// $sidebar-width: $sidebarWidth; // comes from VuePress core styles $sidebar-top-spacing: $navbar-height-large; @@ -13,36 +13,20 @@ $sidebar-button-left-spacing: 1.5rem; // Sidebar -.sidebar-wrapper { - position: relative; - - &:after { - position: absolute; - top: 0; right: 0; bottom: 0; - z-index: 0; - display: block; - height: 100%; - width: 100vw; - content: ""; - background-color: $gray-1; - } -} - .sidebar { position: fixed; top: 0; + bottom: 0; + overflow-y: auto; left: auto; - overflow-x: visible !important; background: none; - // background-color: #fff; font-size: $base-font-size; width: $sidebar-width; - padding-top: $sidebar-top-spacing; .nav-item { margin: 0; - - > a { + + >a { padding: 1rem; } } @@ -61,10 +45,6 @@ $sidebar-button-left-spacing: 1.5rem; } } -.sidebar-links { - -} - a.sidebar-link { &:hover { @@ -80,7 +60,7 @@ a.sidebar-link { // Sidebar button .sidebar-button { - top: calc( (#{$navbarHeight} / 2) - (#{$sidebar-button-size} / 2) ); + top: calc((#{$navbarHeight} / 2) - (#{$sidebar-button-size} / 2)); left: $sidebar-button-left-spacing; display: none; padding: 0; @@ -105,14 +85,9 @@ a.sidebar-link { @media (min-width: $MQNarrowMid + 1) { .sidebar { position: sticky; - // top: $navbarHeight; - left: auto; - bottom: auto; - // padding-top: $navbarHeight; - } - - .page { - // padding-left: 15rem; + top: $navbarHeight; + bottom: 0; + height: calc(100vh - #{$navbarHeight}); } .theme-container.no-sidebar .sidebar { diff --git a/app/_assets/styles/vuepress-core/sidebar.scss b/app/_assets/styles/vuepress-core/sidebar.scss index 1ba59d24a..6be9cc5ee 100644 --- a/app/_assets/styles/vuepress-core/sidebar.scss +++ b/app/_assets/styles/vuepress-core/sidebar.scss @@ -23,8 +23,6 @@ } & > .sidebar-links { padding: 1.5rem 0; - overflow-y: scroll; - height: 100vh; & > li > a.sidebar-link { font-size: 1.1em;