github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-08-27 07:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Fix CI

Browse Source
This commit is contained in:
Eva Marco 2026-07-29 12:19:32 +02:00
parent 8e485d4fa6
commit d5d2bc6eaf
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
frontend/src/app/main/ui/settings/restore_shortcuts_modal.cljs
View File

@ -105,38 +105,38 @@
[:tbody {:class (stl/css :shortcuts-list-body)} [:tbody {:class (stl/css :shortcuts-list-body)}
(for [context [:workspace :dashboard :viewer] (for [context [:workspace :dashboard :viewer]
shortcut-key (keys (get custom-shortcuts context {}))] shortcut-key (keys (get custom-shortcuts context {}))]
(let [[default-last-element (let [[default-last-element
default-short-char-list default-short-char-list
current-last-element current-last-element
current-command current-command
current-short-char-list current-short-char-list
customized?] (extract-shortcut-keys shortcut-key custom-shortcuts context) customized?] (extract-shortcut-keys shortcut-key custom-shortcuts context)
current-penultimate (last current-short-char-list) current-penultimate (last current-short-char-list)
default-penultimate (last default-short-char-list) default-penultimate (last default-short-char-list)
command-class (if customized? (stl/css :customized-command) (stl/css :default-command))] command-class (if customized? (stl/css :customized-command) (stl/css :default-command))]
[:tr {:key (dm/str (name context) "-" (name shortcut-key)) [:tr {:key (dm/str (name context) "-" (name shortcut-key))
:class (stl/css :shortcuts-list-item)} :class (stl/css :shortcuts-list-item)}
[:td {:class (stl/css :shortcut-name)} [:td {:class (stl/css :shortcut-name)}
(ss/translation-keyname :sc shortcut-key)] (ss/translation-keyname :sc shortcut-key)]
[:td {:class (stl/css :shortcut-command)} [:td {:class (stl/css :shortcut-command)}
(if (str/blank? current-command) (if (str/blank? current-command)
[:span {:class (stl/css :shortcut-empty)} "-"] [:span {:class (stl/css :shortcut-empty)} "-"]
(for [chars current-short-char-list] (for [chars current-short-char-list]
[:* {:key (str/join chars)} [:* {:key (str/join chars)}
(for [char chars] (for [char chars]
[:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key)) [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key))
:char char :char char
:class command-class :class command-class
:command shortcut-key}]) :command shortcut-key}])
(when (not= chars current-penultimate) [:span {:class (stl/css :space)} ","])])) (when (not= chars current-penultimate) [:span {:class (stl/css :space)} ","])]))
(when (not= current-last-element current-penultimate) (when (not= current-last-element current-penultimate)
[:* [:*
[:span {:class (stl/css :space)} (tr "shortcuts.or")] [:span {:class (stl/css :space)} (tr "shortcuts.or")]
(for [char current-last-element] (for [char current-last-element]
[:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key)) [:> ss/converted-chars* {:key (dm/str char "-" (name shortcut-key))
:char char :char char
:class command-class :class command-class
:command shortcut-key}])])] :command shortcut-key}])])]
[:td {:class (stl/css :shortcut-command)} [:td {:class (stl/css :shortcut-command)}
(for [chars default-short-char-list] (for [chars default-short-char-list]

1
frontend/src/app/main/ui/settings/shortcuts.scss
View File

@ -203,7 +203,6 @@
bottom: 0; bottom: 0;
background-color: var(--app-background); background-color: var(--app-background);
min-inline-size: px2rem(590); min-inline-size: px2rem(590);
} }
.shortcuts-info { .shortcuts-info {