From 80c138259398241085de8a1eae204ca973082aa2 Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Mon, 19 Oct 2020 13:33:34 +0200 Subject: [PATCH] fix text sizes --- frontend/resources/styles/common/base.scss | 1 - frontend/resources/styles/main/partials/context-menu.scss | 2 +- .../resources/styles/main/partials/viewer-header.scss | 4 ++-- .../resources/styles/main/partials/workspace-header.scss | 6 +++--- frontend/resources/styles/main/partials/workspace.scss | 2 +- frontend/resources/styles/main/partials/zoom-widget.scss | 8 ++++---- frontend/src/app/main/ui/workspace/rules.cljs | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/frontend/resources/styles/common/base.scss b/frontend/resources/styles/common/base.scss index 1b3e7f696..a9fcacdee 100644 --- a/frontend/resources/styles/common/base.scss +++ b/frontend/resources/styles/common/base.scss @@ -10,7 +10,6 @@ body { color: $color-gray-20; display: flex; flex-direction: column; - // font-family: "sourcesanspro", sans-serif; font-family: 'worksans', sans-serif; height: 100vh; overflow: hidden; diff --git a/frontend/resources/styles/main/partials/context-menu.scss b/frontend/resources/styles/main/partials/context-menu.scss index 8d2e7cdca..7a585c7fd 100644 --- a/frontend/resources/styles/main/partials/context-menu.scss +++ b/frontend/resources/styles/main/partials/context-menu.scss @@ -36,7 +36,7 @@ .context-menu-action { color: $color-black; display: block; - font-size: $fs12; + font-size: $fs14; padding: $size-2 $size-4; text-align: left; white-space: nowrap; diff --git a/frontend/resources/styles/main/partials/viewer-header.scss b/frontend/resources/styles/main/partials/viewer-header.scss index 20fda06d5..4ee97975e 100644 --- a/frontend/resources/styles/main/partials/viewer-header.scss +++ b/frontend/resources/styles/main/partials/viewer-header.scss @@ -112,7 +112,7 @@ .options-zone { align-items: center; display: flex; - width: 365px; + width: 384px; justify-content: flex-end; position: relative; @@ -248,7 +248,7 @@ } .zoom-dropdown { - left : 150px; + left : 116px; top: 45px; } diff --git a/frontend/resources/styles/main/partials/workspace-header.scss b/frontend/resources/styles/main/partials/workspace-header.scss index fa3c42de3..b80b52f80 100644 --- a/frontend/resources/styles/main/partials/workspace-header.scss +++ b/frontend/resources/styles/main/partials/workspace-header.scss @@ -88,7 +88,7 @@ .zoom-dropdown { top: 45px; - left: -40px; + left: 48px; } } @@ -138,7 +138,7 @@ position: absolute; top: 40px; left: 40px; - width: 230px; + width: 270px; z-index: 12; @include animation(0,.2s,fadeInDown); @@ -148,7 +148,7 @@ li { cursor: pointer; - font-size: $fs12; + font-size: $fs14; padding: $small $x-small; display: flex; justify-content: space-between; diff --git a/frontend/resources/styles/main/partials/workspace.scss b/frontend/resources/styles/main/partials/workspace.scss index 74bfa41d4..add203878 100644 --- a/frontend/resources/styles/main/partials/workspace.scss +++ b/frontend/resources/styles/main/partials/workspace.scss @@ -16,7 +16,7 @@ left: 740px; position: absolute; top: 40px; - width: 216px; + width: 240px; z-index: 12; padding: $x-small 0; diff --git a/frontend/resources/styles/main/partials/zoom-widget.scss b/frontend/resources/styles/main/partials/zoom-widget.scss index 8bd3ebdb2..4e68d8807 100644 --- a/frontend/resources/styles/main/partials/zoom-widget.scss +++ b/frontend/resources/styles/main/partials/zoom-widget.scss @@ -17,7 +17,7 @@ .zoom-dropdown { position: absolute; z-index: 12; - width: 160px; + width: 210px; background-color: $color-white; border-radius: $br-small; @@ -26,13 +26,13 @@ li { color: $color-gray-60; cursor: pointer; - font-size: $fs12; + font-size: $fs14; display: flex; padding: $small; span { - color: $color-gray-40; - font-size: $fs12; + color: $color-gray-20; + font-size: $fs14; margin-left: auto; } diff --git a/frontend/src/app/main/ui/workspace/rules.cljs b/frontend/src/app/main/ui/workspace/rules.cljs index cf5644fe8..04db2ae6e 100644 --- a/frontend/src/app/main/ui/workspace/rules.cljs +++ b/frontend/src/app/main/ui/workspace/rules.cljs @@ -43,7 +43,7 @@ (.translate dctx txfm 0) (.translate dctx 0 txfm)) - (obj/set! dctx "font" "12px sourcesanspro") + (obj/set! dctx "font" "12px worksans") (obj/set! dctx "fillStyle" "#7B7D85") (obj/set! dctx "strokeStyle" "#7B7D85") (obj/set! dctx "textAlign" "center")