From b7208cfa44bbd1a98739dc0ef8a4e686a73e3031 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Mon, 27 Aug 2018 14:39:18 +0200 Subject: [PATCH] Fix typography merge conflict --- src/core/client/ui/shared/typography.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/client/ui/shared/typography.css b/src/core/client/ui/shared/typography.css index ba367cc44..7f99ddf39 100644 --- a/src/core/client/ui/shared/typography.css +++ b/src/core/client/ui/shared/typography.css @@ -137,9 +137,9 @@ color: var(--palette-common-black); font-family: var(--font-family-sans-serif); font-weight: var(--font-weight-medium); - font-size: calc(14rem / var(--rem-base)); - line-height: calc(20em / 16); - letter-spacing: calc(0.2em / 16); + font-size: calc(16rem / var(--rem-base)); + line-height: calc(16em / 16); + letter-spacing: calc(-0.1em / 16); } .inputText {