From 7e09c0507f1c18ad7f5b5380f916dbc8336b76a6 Mon Sep 17 00:00:00 2001 From: Tom Russell Date: Mon, 3 Dec 2018 10:21:19 +0000 Subject: [PATCH] Typography: glacial_cl for logotype only --- app/src/frontend/logo.css | 6 ++++-- app/src/frontend/sidebar.css | 6 +++--- app/src/frontend/sidebar.js | 2 +- app/src/frontend/styles/typography.css | 4 ---- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/frontend/logo.css b/app/src/frontend/logo.css index 19fa01f6..7c70e220 100644 --- a/app/src/frontend/logo.css +++ b/app/src/frontend/logo.css @@ -1,16 +1,18 @@ /** * Logo */ + .logotype { + font-family: 'glacial_cl', sans-serif; + text-transform: uppercase; + } .logo, .logo.navbar-brand { display: block; padding: 0; - text-transform: uppercase; color: #000; text-decoration: none; } .logo .logotype { - font-family: 'glacial_cl', sans-serif; font-size: 2rem; margin: 0 0 0 3px; display: inline-block; diff --git a/app/src/frontend/sidebar.css b/app/src/frontend/sidebar.css index 0d78b48b..65fe7d34 100644 --- a/app/src/frontend/sidebar.css +++ b/app/src/frontend/sidebar.css @@ -13,7 +13,7 @@ z-index: 1000; overflow-y: auto; } -.info-container .h2:first-child { +.info-container h2:first-child { margin-bottom: 0.5rem; margin-top: 0.5rem; margin-left: -0.1em; @@ -54,7 +54,7 @@ /** * Sidebar main header */ -.sidebar-header .h2 { +.sidebar-header h2 { display: inline-block; } .sidebar-header .icon-button { @@ -227,7 +227,7 @@ margin: 0; } .data-intro { - padding: 0 0.75rem; + padding: 0 0.5rem 0 2.25rem; margin-top: 0.25rem; } .data-list { diff --git a/app/src/frontend/sidebar.js b/app/src/frontend/sidebar.js index df4e6bb1..ee033252 100644 --- a/app/src/frontend/sidebar.js +++ b/app/src/frontend/sidebar.js @@ -14,7 +14,7 @@ const Sidebar = (props) => ( : null } -

{props.title}

+

{props.title}

{props.children} diff --git a/app/src/frontend/styles/typography.css b/app/src/frontend/styles/typography.css index ac817e77..8429a7cf 100644 --- a/app/src/frontend/styles/typography.css +++ b/app/src/frontend/styles/typography.css @@ -6,15 +6,11 @@ body { background: #fff; color: #222; } -.h1, .h2, .h3, .h4, .h5 { - font-family: 'glacial_cl', sans-serif; -} .h2 { font-weight: normal; margin: 0; } .h3, .h4, .h5 { - font-family: 'glacial_cl', sans-serif; font-weight: normal; font-size: 1.2rem; }