From 2182cfa2000eb5e2ac3e84dad4288c49da16a252 Mon Sep 17 00:00:00 2001 From: Jori Lallo Date: Fri, 14 Oct 2016 13:23:02 -0700 Subject: [PATCH] Reduced font sizes --- frontend/components/Tree/Tree.scss | 4 ---- .../components/Sidebar/Sidebar.scss | 2 +- frontend/styles/base.scss | 19 ++++++++++--------- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/frontend/components/Tree/Tree.scss b/frontend/components/Tree/Tree.scss index 9a8a0d6a..22c70218 100644 --- a/frontend/components/Tree/Tree.scss +++ b/frontend/components/Tree/Tree.scss @@ -64,10 +64,6 @@ border: 1px dashed #1385e5; } - .inner { - font-size: 14px; - } - .nodeLabel { display: inline-block; width: 100%; diff --git a/frontend/scenes/DocumentScene/components/Sidebar/Sidebar.scss b/frontend/scenes/DocumentScene/components/Sidebar/Sidebar.scss index 07f98a3f..dc46e94e 100644 --- a/frontend/scenes/DocumentScene/components/Sidebar/Sidebar.scss +++ b/frontend/scenes/DocumentScene/components/Sidebar/Sidebar.scss @@ -4,6 +4,7 @@ position: relative; width: 250px; border-right: 1px solid #eee; + font-size: 13px; } .sidebarToggle { @@ -44,7 +45,6 @@ background-color: #fff; padding: 10px 20px; height: 40px; - font-size: 14px; } .action { diff --git a/frontend/styles/base.scss b/frontend/styles/base.scss index 0018ec2b..8bf0740a 100644 --- a/frontend/styles/base.scss +++ b/frontend/styles/base.scss @@ -21,6 +21,7 @@ html, body, .viewport { body { font-family: 'Atlas Grotesk', -apple-system, 'Helvetica Neue', Helvetica, sans-serif; + font-size: 15px; line-height: 1.5; margin: 0; color: $textColor; @@ -51,12 +52,12 @@ h4, h5, h6 { margin-top: 1em; margin-bottom: .5em; } -h1 { font-size: 2rem } -h2 { font-size: 1.5rem } -h3 { font-size: 1.25rem } -h4 { font-size: 1rem } -h5 { font-size: .875rem } -h6 { font-size: .75rem } +h1 { font-size: 2em } +h2 { font-size: 1.5em } +h3 { font-size: 1.25em } +h4 { font-size: 1em } +h5 { font-size: .875em } +h6 { font-size: .75em } p, dl, ol, ul, pre, blockquote { margin-top: 1em; margin-bottom: 1em; @@ -81,7 +82,7 @@ pre { overflow: scroll; } blockquote { - font-size: 1.25rem; + font-size: 1.25em; font-style: italic; margin-left: 0; } @@ -100,7 +101,7 @@ hr { :global { .hljs { border: 1px solid rgba(0,0,0,.0625); - padding: 1rem; - border-radius: 0.25rem; + padding: 1em; + border-radius: 0.25em; } }