From b4c87ad0b9642527d9cacbf26abb69c2bd0f1e40 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 24 Feb 2022 11:45:56 +0100 Subject: [PATCH] :bug: Fix font for guides and rulese --- frontend/src/app/main/ui/workspace/viewport/guides.cljs | 8 ++++---- frontend/src/app/main/ui/workspace/viewport/rules.cljs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/viewport/guides.cljs b/frontend/src/app/main/ui/workspace/viewport/guides.cljs index 6aebf468a..7bfde052a 100644 --- a/frontend/src/app/main/ui/workspace/viewport/guides.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/guides.cljs @@ -196,13 +196,13 @@ (if (= axis :x) {:rect-x (- pos (/ guide-pill-width 2)) - :rect-y (+ (:y vbox) rules-pos (- (/ guide-pill-width 2)) (/ 2 zoom)) + :rect-y (+ (:y vbox) rules-pos (- (/ guide-pill-width 2)) (/ 3 zoom)) :rect-width guide-pill-width :rect-height guide-pill-height :text-x pos :text-y (+ (:y vbox) rules-pos (- (/ 3 zoom)))} - {:rect-x (+ (:x vbox) rules-pos (- (/ guide-pill-height 2)) (- (/ 5 zoom))) + {:rect-x (+ (:x vbox) rules-pos (- (/ guide-pill-height 2)) (- (/ 4 zoom))) :rect-y (- pos (/ guide-pill-width 2)) :rect-width guide-pill-height :rect-height guide-pill-width @@ -363,8 +363,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 (/ rules/font-size zoom) + :font-family rules/font-family :fill colors/black}} (str (mth/round pos))]]))]))) diff --git a/frontend/src/app/main/ui/workspace/viewport/rules.cljs b/frontend/src/app/main/ui/workspace/viewport/rules.cljs index eac032403..57a27c106 100644 --- a/frontend/src/app/main/ui/workspace/viewport/rules.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/rules.cljs @@ -25,8 +25,8 @@ (def over-number-size 50) (def over-number-opacity 0.7) -(def font-size 13) -(def font-family "sourcesanspro") +(def font-size 12) +(def font-family "worksans") ;; ---------------- ;; RULES