From d5d2bc6eaffed9ac80e6728841b35f29e5aea064 Mon Sep 17 00:00:00 2001 From: Eva Marco Date: Wed, 29 Jul 2026 12:19:32 +0200 Subject: [PATCH] :recycle: Fix CI --- .../ui/settings/restore_shortcuts_modal.cljs | 60 +++++++++---------- .../src/app/main/ui/settings/shortcuts.scss | 1 - 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs b/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs index b35bf2d639..f200bdd052 100644 --- a/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs +++ b/frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs @@ -105,38 +105,38 @@ [:tbody {:class (stl/css :shortcuts-list-body)} (for [context [:workspace :dashboard :viewer] shortcut-key (keys (get custom-shortcuts context {}))] - (let [[default-last-element - default-short-char-list - current-last-element - current-command - current-short-char-list - customized?] (extract-shortcut-keys shortcut-key custom-shortcuts context) - current-penultimate (last current-short-char-list) - default-penultimate (last default-short-char-list) - command-class (if customized? (stl/css :customized-command) (stl/css :default-command))] + (let [[default-last-element + default-short-char-list + current-last-element + current-command + current-short-char-list + customized?] (extract-shortcut-keys shortcut-key custom-shortcuts context) + current-penultimate (last current-short-char-list) + default-penultimate (last default-short-char-list) + command-class (if customized? (stl/css :customized-command) (stl/css :default-command))] [:tr {:key (dm/str (name context) "-" (name shortcut-key)) :class (stl/css :shortcuts-list-item)} - [:td {:class (stl/css :shortcut-name)} - (ss/translation-keyname :sc shortcut-key)] - [:td {:class (stl/css :shortcut-command)} - (if (str/blank? current-command) - [:span {:class (stl/css :shortcut-empty)} "-"] - (for [chars current-short-char-list] - [:* {:key (str/join chars)} - (for [char chars] - [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key)) - :char char - :class command-class - :command shortcut-key}]) - (when (not= chars current-penultimate) [:span {:class (stl/css :space)} ","])])) - (when (not= current-last-element current-penultimate) - [:* - [:span {:class (stl/css :space)} (tr "shortcuts.or")] - (for [char current-last-element] - [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key)) - :char char - :class command-class - :command shortcut-key}])])] + [:td {:class (stl/css :shortcut-name)} + (ss/translation-keyname :sc shortcut-key)] + [:td {:class (stl/css :shortcut-command)} + (if (str/blank? current-command) + [:span {:class (stl/css :shortcut-empty)} "-"] + (for [chars current-short-char-list] + [:* {:key (str/join chars)} + (for [char chars] + [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key)) + :char char + :class command-class + :command shortcut-key}]) + (when (not= chars current-penultimate) [:span {:class (stl/css :space)} ","])])) + (when (not= current-last-element current-penultimate) + [:* + [:span {:class (stl/css :space)} (tr "shortcuts.or")] + (for [char current-last-element] + [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key)) + :char char + :class command-class + :command shortcut-key}])])] [:td {:class (stl/css :shortcut-command)} (for [chars default-short-char-list] diff --git a/frontend/src/app/main/ui/settings/shortcuts.scss b/frontend/src/app/main/ui/settings/shortcuts.scss index 1c153cfcb6..a3bfa3df78 100644 --- a/frontend/src/app/main/ui/settings/shortcuts.scss +++ b/frontend/src/app/main/ui/settings/shortcuts.scss @@ -203,7 +203,6 @@ bottom: 0; background-color: var(--app-background); min-inline-size: px2rem(590); - } .shortcuts-info {