From 4e1968bbab61ae07e6cf60b680468ef718ad2c33 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 28 Apr 2026 00:01:46 +0200
Subject: [PATCH 1/2] :paperclip: Add updated version of github cli to devenv

---
 docker/devenv/Dockerfile   | 29 ++++++++++++++++++++++++++---
 docker/devenv/files/bashrc |  2 +-
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index b83ff6a79d..de8bd3a4f7 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -184,7 +184,8 @@ FROM base AS setup-utils
 ENV CLJKONDO_VERSION=2026.04.15 \
     BABASHKA_VERSION=1.12.208 \
     CLJFMT_VERSION=0.16.4 \
-    PIXI_VERSION=0.67.2
+    PIXI_VERSION=0.67.2 \
+    GITHUB_CLI_VERSION=2.91.0
 
 RUN set -ex; \
     ARCH="$(dpkg --print-architecture)"; \
@@ -267,6 +268,28 @@ RUN set -ex; \
     tar -xf /tmp/cljfmt.tar.gz; \
     rm -rf /tmp/cljfmt.tar.gz;
 
+
+RUN set -ex; \
+    ARCH="$(dpkg --print-architecture)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         BINARY_URL="https://github.com/cli/cli/releases/download/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_arm64.tar.gz"; \
+         ;; \
+       amd64|x86_64) \
+         BINARY_URL="https://github.com/cli/cli/releases/download/v${GITHUB_CLI_VERSION}/gh_${GITHUB_CLI_VERSION}_linux_amd64.tar.gz"; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    cd /tmp; \
+    curl -LfsSo /tmp/gh.tar.gz ${BINARY_URL}; \
+    mkdir /opt/gh; \
+    cd /opt/gh; \
+    tar -xf /tmp/gh.tar.gz; \
+    rm -rf /tmp/gh.tar.gz;
+
 # Install minio client
 RUN set -ex; \
     ARCH="$(dpkg --print-architecture)"; \
@@ -310,7 +333,6 @@ RUN set -ex; \
       nginx \
       fd-find \
       bat \
-      gh \
       \
       fontconfig \
       woff-tools \
@@ -399,13 +421,14 @@ ENV LANG='C.UTF-8' \
     JAVA_HOME="/opt/jdk" \
     CARGO_HOME="/opt/cargo" \
     RUSTUP_HOME="/opt/rustup" \
-    PATH="/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
+    PATH="/opt/jdk/bin:/opt/gh/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
 
 COPY --from=penpotapp/imagemagick:7.1.2-13 /opt/imagick /opt/imagick
 COPY --from=setup-jvm /opt/jdk /opt/jdk
 COPY --from=setup-jvm /opt/clojure /opt/clojure
 COPY --from=setup-node /opt/node /opt/node
 COPY --from=setup-utils /opt/utils /opt/utils
+COPY --from=setup-utils /opt/gh /opt/gh
 COPY --from=setup-rust /opt/cargo /opt/cargo
 COPY --from=setup-rust /opt/rustup /opt/rustup
 COPY --from=setup-rust /opt/emsdk /opt/emsdk
diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc
index 98fc4a96dc..dc016b3481 100644
--- a/docker/devenv/files/bashrc
+++ b/docker/devenv/files/bashrc
@@ -2,7 +2,7 @@
 
 EMSDK_QUIET=1 . /opt/emsdk/emsdk_env.sh;
 
-export PATH="/home/penpot/.cargo/bin:/opt/jdk/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
+export PATH="/home/penpot/.cargo/bin:/opt/jdk/bin:/opt/gh/bin:/opt/utils/bin:/opt/clojure/bin:/opt/node/bin:/opt/imagick/bin:/opt/cargo/bin:$PATH"
 export CARGO_HOME="/home/penpot/.cargo"
 
 alias l='ls --color -GFlh'

From a35b61ee0c7618acaa9e03cdef5c9241b8e05919 Mon Sep 17 00:00:00 2001
From: Luis de Dios <luis.dedios@kaleidos.net>
Date: Tue, 28 Apr 2026 09:26:15 +0200
Subject: [PATCH 2/2] :bug: Fix put onboarding modals of top of libraries &
 templates panel (#9178)

---
 frontend/src/app/main/ui/dashboard/templates.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/app/main/ui/dashboard/templates.scss b/frontend/src/app/main/ui/dashboard/templates.scss
index 5d58ac4fea..f3323c58f2 100644
--- a/frontend/src/app/main/ui/dashboard/templates.scss
+++ b/frontend/src/app/main/ui/dashboard/templates.scss
@@ -27,7 +27,7 @@
   transition: bottom 300ms;
   width: calc(100% - $sz-12);
   pointer-events: none;
-  z-index: var(--z-index-set);
+  z-index: var(--z-index-panels);
 
   &.collapsed {
     inset-block-end: calc(-1 * px2rem(228));