diff --git a/frontend/src/app/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs index 181890907..86b79e0f4 100644 --- a/frontend/src/app/main/ui/workspace/colorpalette.cljs +++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs @@ -156,8 +156,7 @@ [:div.color-sample (for [[idx color] (map-indexed vector (take 7 (reverse recent-colors))) ] [:& cb/color-bullet {:key (str "color-" idx) - :color color}])]] - ]] + :color color}])]]]] [:div.color-palette-actions {:on-click #(swap! state assoc :show-menu true)} diff --git a/frontend/src/app/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs index 06d3b986c..617386201 100644 --- a/frontend/src/app/main/ui/workspace/sidebar.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar.cljs @@ -19,6 +19,7 @@ [app.main.ui.workspace.sidebar.options :refer [options-toolbox]] [app.main.ui.workspace.sidebar.sitemap :refer [sitemap]] [app.util.dom :as dom] + [app.util.i18n :refer [tr]] [app.util.object :as obj] [rumext.alpha :as mf])) @@ -54,12 +55,12 @@ [:& tab-container {:on-change-tab #(st/emit! (dw/go-to-layout %)) :selected section} - [:& tab-element {:id :layers :title "Layers"} + [:& tab-element {:id :layers :title (tr "workspace.sidebar.layers")} [:div.layers-tab [:& sitemap {:layout layout}] [:& layers-toolbox]]] - [:& tab-element {:id :assets :title "Library"} + [:& tab-element {:id :assets :title (tr "workspace.toolbar.assets")} [:& assets-toolbox]]]]])) ;; --- Right Sidebar (Component) diff --git a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs index cbc66fdc7..56ed2bf76 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs @@ -225,6 +225,4 @@ [:div.resize-area {:on-pointer-down on-pointer-down :on-lost-pointer-capture on-lost-pointer-capture - :on-mouse-move on-mouse-move}] - - ])) + :on-mouse-move on-mouse-move}]])) diff --git a/frontend/src/app/main/ui/workspace/viewport/guides.cljs b/frontend/src/app/main/ui/workspace/viewport/guides.cljs index 03b7a3bdb..2a179628c 100644 --- a/frontend/src/app/main/ui/workspace/viewport/guides.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/guides.cljs @@ -29,6 +29,11 @@ (def guide-pill-corner-radius 4) (def guide-active-area 16) +(def guide-creation-margin-left 8) +(def guide-creation-margin-top 28) +(def guide-creation-width 16) +(def guide-creation-height 24) + (defn use-guide "Hooks to support drag/drop for existing guides and new guides" [on-guide-change get-hover-frame zoom {:keys [position axis frame-id]}] @@ -220,15 +225,15 @@ (defn guide-creation-area [vbox zoom axis] (if (= axis :x) - {:x (+ (:x vbox) (/ 8 zoom)) + {:x (+ (:x vbox) (/ guide-creation-margin-left zoom)) :y (:y vbox) - :width (/ 16 zoom) + :width (/ guide-creation-width zoom) :height (:height vbox)} - {:x (+ (:x vbox) (+ 28 zoom)) + {:x (+ (:x vbox) (+ guide-creation-margin-top zoom)) :y (:y vbox) :width (:width vbox) - :height (/ 24 zoom)})) + :height (/ guide-creation-height zoom)})) (defn is-guide-inside-frame? [guide frame] diff --git a/frontend/src/app/main/ui/workspace/viewport/rules.cljs b/frontend/src/app/main/ui/workspace/viewport/rules.cljs index fa533c195..eac032403 100644 --- a/frontend/src/app/main/ui/workspace/viewport/rules.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/rules.cljs @@ -17,11 +17,16 @@ (def rules-pos 15) (def rules-size 4) (def rules-width 1) - (def rule-area-size 22) (def rule-area-half-size (/ rule-area-size 2)) - (def rules-background "var(--color-gray-50)") +(def selection-area-color "var(--color-primary)") +(def selection-area-opacity 0.3) +(def over-number-size 50) +(def over-number-opacity 0.7) + +(def font-size 13) +(def font-family "sourcesanspro") ;; ---------------- ;; RULES @@ -141,8 +146,8 @@ :text-anchor "middle" :dominant-baseline "middle" :transform (when (= axis :y) (str "rotate(-90 " text-x "," text-y ")")) - :style {:font-size (/ 13 zoom) - :font-family "sourcesanspro" + :style {:font-size (/ font-size zoom) + :font-family font-family :fill colors/gray-30}} (str (mth/round step-val))] @@ -154,11 +159,6 @@ :style {:stroke colors/gray-30 :stroke-width rules-width}}]])))]])) -(def selection-area-color "var(--color-primary)") -(def selection-area-opacity 0.3) -(def over-number-size 50) -(def over-number-opacity 0.7) - (mf/defc selection-area [{:keys [vbox zoom selection-rect]}] [:g.selection-area @@ -181,8 +181,8 @@ :y (+ (:y vbox) (/ 12 zoom)) :text-anchor "end" :dominant-baseline "middle" - :style {:font-size (/ 13 zoom) - :font-family "sourcesanspro" + :style {:font-size (/ font-size zoom) + :font-family font-family :fill selection-area-color}} (str (mth/round (:x1 selection-rect)))] @@ -197,8 +197,8 @@ :y (+ (:y vbox) (/ 12 zoom)) :text-anchor "start" :dominant-baseline "middle" - :style {:font-size (/ 13 zoom) - :font-family "sourcesanspro" + :style {:font-size (/ font-size zoom) + :font-family font-family :fill selection-area-color}} (str (mth/round (:x2 selection-rect)))]] @@ -231,8 +231,8 @@ :y center-y :text-anchor "end" :dominant-baseline "middle" - :style {:font-size (/ 13 zoom) - :font-family "sourcesanspro" + :style {:font-size (/ font-size zoom) + :font-family font-family :fill selection-area-color}} (str (mth/round (:y2 selection-rect)))] @@ -240,8 +240,8 @@ :y center-y :text-anchor "start" :dominant-baseline "middle" - :style {:font-size (/ 13 zoom) - :font-family "sourcesanspro" + :style {:font-size (/ font-size zoom) + :font-family font-family :fill selection-area-color}} (str (mth/round (:y1 selection-rect)))]])]) diff --git a/frontend/translations/ca.po b/frontend/translations/ca.po index af16177e5..9976f5e04 100644 --- a/frontend/translations/ca.po +++ b/frontend/translations/ca.po @@ -3127,7 +3127,7 @@ msgstr "Historial (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Capes (%s)" +msgstr "Capes" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -3143,7 +3143,7 @@ msgstr "Mapa del lloc" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Recursos (%s)" +msgstr "Recursos" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/de.po b/frontend/translations/de.po index f9389599f..beafaf131 100644 --- a/frontend/translations/de.po +++ b/frontend/translations/de.po @@ -3032,7 +3032,7 @@ msgstr "Verlauf (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Ebenen (%s)" +msgstr "Ebenen" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -3048,7 +3048,7 @@ msgstr "Sitemap" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Assets (%s)" +msgstr "Assets" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/el.po b/frontend/translations/el.po index 8ad56d4db..f3100b1c4 100644 --- a/frontend/translations/el.po +++ b/frontend/translations/el.po @@ -2163,7 +2163,7 @@ msgstr "Ιστορικό (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "στρώσεις (%s)" +msgstr "στρώσεις" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -2179,7 +2179,7 @@ msgstr "Χάρτης ιστοτόπου" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Στοιχεία (%s)" +msgstr "Στοιχεία" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 7d62a8244..7dbf326b7 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -3244,7 +3244,7 @@ msgstr "History (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Layers (%s)" +msgstr "Layers" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -3260,7 +3260,7 @@ msgstr "Sitemap" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Assets (%s)" +msgstr "Assets" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/es.po b/frontend/translations/es.po index 512bae548..ba784e405 100644 --- a/frontend/translations/es.po +++ b/frontend/translations/es.po @@ -3257,7 +3257,7 @@ msgstr "Historial (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Capas (%s)" +msgstr "Capas" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -3273,7 +3273,7 @@ msgstr "Mapa del sitio" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Recursos (%s)" +msgstr "Recursos" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/fr.po b/frontend/translations/fr.po index 70f85c1fe..eb704a5ac 100644 --- a/frontend/translations/fr.po +++ b/frontend/translations/fr.po @@ -2535,7 +2535,7 @@ msgstr "Historique (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Calques (%s)" +msgstr "Calques" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -2551,7 +2551,7 @@ msgstr "Plan du site" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Ressources (%s)" +msgstr "Ressources" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/he.po b/frontend/translations/he.po index 01956021b..eaa620b49 100644 --- a/frontend/translations/he.po +++ b/frontend/translations/he.po @@ -3078,7 +3078,7 @@ msgstr "היסטוריה (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "שכבות (%s)" +msgstr "שכבות" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -3094,7 +3094,7 @@ msgstr "מפת אתר" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "משאבים (%s)" +msgstr "משאבים" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/pt_BR.po b/frontend/translations/pt_BR.po index cfdf4e320..cd0442519 100644 --- a/frontend/translations/pt_BR.po +++ b/frontend/translations/pt_BR.po @@ -1844,7 +1844,7 @@ msgstr "Histórico (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Camadas (%s)" +msgstr "Camadas" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" diff --git a/frontend/translations/ro.po b/frontend/translations/ro.po index a16acbce5..26c1f7e93 100644 --- a/frontend/translations/ro.po +++ b/frontend/translations/ro.po @@ -2417,7 +2417,7 @@ msgstr "Istoric (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Layere (%s)" +msgstr "Layere" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -2433,7 +2433,7 @@ msgstr "Harta site-ului" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Obiecte (%s)" +msgstr "Obiecte" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/tr.po b/frontend/translations/tr.po index 523f8cbd3..ff4cb091f 100644 --- a/frontend/translations/tr.po +++ b/frontend/translations/tr.po @@ -3112,7 +3112,7 @@ msgstr "Geçmiş (%s)" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "Katmanlar (%s)" +msgstr "Katmanlar" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -3128,7 +3128,7 @@ msgstr "Site haritası" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "Varlıklar(%s)" +msgstr "Varlıklar" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette" diff --git a/frontend/translations/zh_CN.po b/frontend/translations/zh_CN.po index c01314468..43cfecabd 100644 --- a/frontend/translations/zh_CN.po +++ b/frontend/translations/zh_CN.po @@ -2527,7 +2527,7 @@ msgstr "历史（%s）" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.sidebar.layers" -msgstr "图层（%s）" +msgstr "图层" #: src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.cljs, src/app/main/ui/handoff/attributes/svg.cljs msgid "workspace.sidebar.options.svg-attrs.title" @@ -2543,7 +2543,7 @@ msgstr "站点地图" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.assets" -msgstr "素材（%s）" +msgstr "素材" #: src/app/main/ui/workspace/left_toolbar.cljs msgid "workspace.toolbar.color-palette"