Fix typography merge conflict

This commit is contained in:
Chi Vinh Le
2018-08-27 14:39:18 +02:00
parent d1d993d0b7
commit b7208cfa44
+3 -3
View File
@@ -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 {