From d73ed95719b84df613eb610708dfa31ef4e65420 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 25 Mar 2022 13:20:46 +0100 Subject: [PATCH 1/2] :bug: Fix export multiple styles --- frontend/resources/styles/main/partials/modal.scss | 3 ++- frontend/src/app/main/ui/export.cljs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/resources/styles/main/partials/modal.scss b/frontend/resources/styles/main/partials/modal.scss index 242b5c846..94c5a1e88 100644 --- a/frontend/resources/styles/main/partials/modal.scss +++ b/frontend/resources/styles/main/partials/modal.scss @@ -1464,7 +1464,8 @@ } } - & .unchecked { + & .intermediate, + .unchecked { svg { background-color: $color-gray-10; } diff --git a/frontend/src/app/main/ui/export.cljs b/frontend/src/app/main/ui/export.cljs index b96b8eab9..1b2a02617 100644 --- a/frontend/src/app/main/ui/export.cljs +++ b/frontend/src/app/main/ui/export.cljs @@ -76,7 +76,7 @@ (cond all-checked? [:span.checked i/checkbox-checked] all-unchecked? [:span.unchecked i/checkbox-unchecked] - :else [:span i/checkbox-intermediate])] + :else [:span.intermediate i/checkbox-intermediate])] [:div.field.title (tr "dashboard.export-multiple.selected" (c (count enabled-exports)) (c (count all-exports)))]] From 927dbbfe82b33b8a49b834c89d53f266022e6a5a Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Fri, 25 Mar 2022 13:37:38 +0100 Subject: [PATCH 2/2] :bug: Fix precission on export modal --- frontend/src/app/main/ui/export.cljs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/main/ui/export.cljs b/frontend/src/app/main/ui/export.cljs index 1b2a02617..f6c17187e 100644 --- a/frontend/src/app/main/ui/export.cljs +++ b/frontend/src/app/main/ui/export.cljs @@ -18,6 +18,7 @@ [app.main.ui.workspace.shapes :refer [shape-wrapper]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr c]] + [app.util.strings :as ust] [cuerdas.core :as str] [rumext.alpha :as mf])) @@ -107,8 +108,8 @@ [:div.field.name (cond-> (:name shape) suffix (str suffix))] (when (:scale export) - [:div.field.scale (dm/str (* width (:scale export)) "x" - (* height (:scale export)) "px ")]) + [:div.field.scale (dm/str (ust/format-precision (* width (:scale export)) 2) "x" + (ust/format-precision (* height (:scale export)) 2) "px ")]) (when (:type export) [:div.field.extension (-> export :type d/name str/upper)])]))]