Merge remote-tracking branch 'origin/fix/reviewBlocks' into develop

xproglabs · Aug 9, 2020 · 443fc00 · 443fc00
2 parents 416646f + cfa1416
commit 443fc00
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/components/Article/index.scss b/components/Article/index.scss
@@ -23,4 +23,12 @@
 .paragraph-title {
   @include fs(22px);
   @include fw(bold);
+}
+@media (min-width: $lg) {
+  .article {
+    @include mt(104px);
+    .article-head {
+      @include mb($space-size-8);
+    }
+  }
 }
diff --git a/components/Tags/index.scss b/components/Tags/index.scss
@@ -2,8 +2,8 @@
 
 .tag {
   @include w(max-content);
-  @include px(20px);
-  @include py(12px);
+  @include px(4px);
+  @include py($space-size-1);
   @include mr(20px);
   @include mb(16px);
   @include b(2px, solid, $color-primary-2);

diff --git a/components/Teasers/Teaser.js b/components/Teasers/Teaser.js
@@ -13,7 +13,7 @@ const Teaser = ({content, domain, hasImageTop, hasSubjectFilled, hasSubtitle, ha
   const propsTeaser = {
     align: hasImageTop ? 'col' : 'row left',
     custom: 'teaser-default',
-    mb: '4'
+    mb: '2'
   }
   const propsImage = {
     align: 'row',

diff --git a/components/Typography/index.scss b/components/Typography/index.scss
@@ -71,7 +71,7 @@
   @include fc($article-title-fc);
   @extend %bold;
   @include mt($space-size-3);
-  @include mb($space-size-2);
+  @include mb($space-size-5);
   @media (min-width: $lg) {
     @include fs($article-title-fs-lg);
     @include lh($article-title-lh-lg);
@@ -84,6 +84,10 @@
   @include fc($article-subtitle-fc);
   @include ff($font-primary);
   @extend %regular;
+  @media (min-width: $lg) {
+    @include fs($article-subtitle-fs-lg);
+    @include lh($article-subtitle-lh-lg);
+  }
 }
 
 .article-paragraph {

diff --git a/styles/variables/fonts.scss b/styles/variables/fonts.scss
@@ -4,13 +4,15 @@ $font-tertiary: 'Arvo' !default;
 
 $article-title-fs-sm: 32px !default;
 $article-title-lh-sm: 34px !default;
-$article-title-fs-lg: 48px !default;
-$article-title-lh-lg: 50px !default;
+$article-title-fs-lg: 62px !default;
+$article-title-lh-lg: 66px !default;
 $article-title-ff: $font-primary !default;
 
 $article-subtitle-fs: 18px !default;
 $article-subtitle-lh: 26px !default;
 $article-subtitle-ff: $font-primary !default;
+$article-subtitle-fs-lg: 20px !default;
+$article-subtitle-lh-lg: 28px !default;
 
 $article-paragraph-fs: 18px !default;
 $article-paragraph-lh: 42px !default;

diff --git a/teasers.js b/teasers.js
@@ -756,7 +756,7 @@ var Teaser = function Teaser(_ref) {
   var propsTeaser = {
     align: hasImageTop ? 'col' : 'row left',
     custom: 'teaser-default',
-    mb: '4'
+    mb: '2'
   };
   var propsImage = {
     align: 'row',

diff --git a/templates.js b/templates.js
@@ -774,7 +774,7 @@ var Teaser = function Teaser(_ref) {
   var propsTeaser = {
     align: hasImageTop ? 'col' : 'row left',
     custom: 'teaser-default',
-    mb: '4'
+    mb: '2'
   };
   var propsImage = {
     align: 'row',