From ec5039d9ccc96effc0ce3cc6a8c6ca54be9a400f Mon Sep 17 00:00:00 2001 From: Andy Allan Date: Wed, 4 Dec 2019 15:45:58 +0100 Subject: [PATCH] Use bootstrap typography --- app/assets/stylesheets/_bootstrap-custom.scss | 6 ++--- app/assets/stylesheets/common.scss | 24 ++++++------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss index 88056f5e7..0cbec1a27 100644 --- a/app/assets/stylesheets/_bootstrap-custom.scss +++ b/app/assets/stylesheets/_bootstrap-custom.scss @@ -8,9 +8,9 @@ @import "bootstrap/functions"; @import "bootstrap/variables"; @import "bootstrap/mixins"; -// @import "bootstrap/root"; -// @import "bootstrap/reboot"; -// @import "bootstrap/type"; +@import "bootstrap/root"; +@import "bootstrap/reboot"; +@import "bootstrap/type"; // @import "bootstrap/images"; // @import "bootstrap/code"; // @import "bootstrap/grid"; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 2df150550..6031526f4 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -109,23 +109,6 @@ body { height: 100%; } -h1, h2, h3 { - font-weight: 600; - line-height: 1.2; -} - -h4, h5 { - font-weight: 500; -} - -h1 { - font-size: 18px; -} - -h2, h3 { - font-size: 16px; -} - p > img { width: auto; max-width: 100%; @@ -281,12 +264,19 @@ header { } h1 { + font-size: 18px; + font-weight: 600; + line-height: 1.2; margin: 0; padding-top: 15px; a { color: #000; } + + a:hover { + color: #000; + } } } -- 2.39.5