Merge fbfc62f into 1525343

liqd · Jul 31, 2019 · 81d357d · 81d357d
2 parents 1525343 + fbfc62f
commit 81d357d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/liqd_product/assets/scss/_base.scss b/liqd_product/assets/scss/_base.scss
@@ -44,48 +44,51 @@ h6 {
 }
 
 h1 {
-    font-size: $font-size-xxl;
+    font-size: $font-size-xxxl;
 }
 
 h2 {
-    font-size: $font-size-xl;
+    font-size: $font-size-xxl;
 }
 
 h3 {
-    font-size: $font-size-lg;
+    font-size: $font-size-xl;
 }
 
 h4 {
-    font-size: inherit;
+    font-size: $font-size-lg;
 }
 
 h5 {
-    font-size: $font-size-sm;
+    font-size: $font-size-md;
 }
 
 h6 {
-    font-size: $font-size-xs;
+    font-size: $font-size-sm;
 }
 
 @media screen and (max-width: $breakpoint-xs-down) {
     h1 {
-        font-size: $mobile-headline-size*$font-size-xxl;
+        font-size: $mobile-headline-size*$font-size-xxxl;
     }
 
     h2 {
-        font-size: $mobile-headline-size*$font-size-xl;
+        font-size: $mobile-headline-size*$font-size-xxl;
     }
 
     h3 {
-        font-size: $font-size-base; //it's smaller than base if multiplied same as above
-        font-weight: bold; //it's a headline so need to have some differentiation from base
+        font-size: $mobile-headline-size*$font-size-xl;
+    }
+
+    h4 {
+        font-size: $mobile-headline-size*$font-size-lg;
     }
 }
 
 a {
     color: $link-color;
     text-decoration: underline;
-    font-weight: bold;
+    font-family: $font-family-serif;
 
     &:hover,
     &:focus {

diff --git a/liqd_product/assets/scss/_fonts.scss b/liqd_product/assets/scss/_fonts.scss
@@ -13,13 +13,6 @@
     font-weight: normal;
 }
 
-@font-face {
-    font-family: 'SourceSerifPro';
-    src: url('../fonts/SourceSerifPro-Bold.otf');
-    font-style: bold;
-    font-weight: 600;
-}
-
 @font-face {
     font-family: 'SourceSansPro';
     src: url('../fonts/SourceSansPro-Regular.otf');

diff --git a/liqd_product/assets/scss/_variables.scss b/liqd_product/assets/scss/_variables.scss
@@ -55,9 +55,12 @@ $feedback-color-consideration: #ffae00 !default;
 $font-family-base: "SourceSansPro", sans-serif !default;
 $font-family-serif: "SourceSerifPro", serif !default;
 
-$font-size-xxl: 2.25rem !default;
-$font-size-xl: 1.5rem !default;
-$font-size-lg: 1.125rem !default;
+$font-size-xxxl: 3rem !default;
+$font-size-xxl: 2.5rem !default;
+$font-size-xl: 2rem !default;
+$font-size-lg: 1.5rem !default;
+$font-size-md: 1.25rem !default;
+$font-size-base: 1rem !default;
 $font-size-sm: 0.8rem !default;
 $font-size-xs: 0.64rem !default;
 

diff --git a/liqd_product/assets/scss/components/_dropdown.scss b/liqd_product/assets/scss/components/_dropdown.scss
@@ -4,6 +4,10 @@
     // margin-bottom: $spacer / 2; for bootstrap
 }
 
+.dropdown-item {
+    font-family: $font-family-base;
+}
+
 .dropdown--right {
     text-align: right;
 }

diff --git a/liqd_product/assets/scss/components/_tile.scss b/liqd_product/assets/scss/components/_tile.scss
@@ -50,7 +50,7 @@
 
 .tile__text {
     flex: 1 0 auto;
-    font-size: $font-size-lg;
+    font-size: $font-size-md;
 }
 
 .tile__title {