Use bootstrap typography

diff --git a/app/assets/stylesheets/_bootstrap-custom.scss b/app/assets/stylesheets/_bootstrap-custom.scss
index 88056f5e7d0d07148a065a8a24df8e9e65c6f848..0cbec1a2740d14262e2ff2e5d937ed5adc902d17 100644 (file)
--- 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 2df150550e7c16dd5d35ae7891d62c580fdea3cf..6031526f4be0f2e3a474f7fe2429e215034c1a42 100644 (file)
--- 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;
+    }
   }
 }