Merge pull request #579 from adventistchurch/#87-New_design_of_ALPS_Q…

…uote_block 87 - New design of ALPS Quote block. Prepare for release. Fix styles.
adventistchurch · Nov 29, 2022 · 5bbee87 · 5bbee87
2 parents ed23286 + 6019ede
commit 5bbee87
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@ A record of the changes made to `ALPS V3`.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.11.10]
+New design of ALPS Quote block. Fix styles for citation and quote fields. [story](https://app.zenhub.com/workspaces/alps---core-and-wp-583365a5f9e6361b5cc5f5f6/issues/adventistchurch/alps-gutenberg-blocks/87)
+
 ## [3.11.9]
 New design of ALPS Quote block [story](https://app.zenhub.com/workspaces/alps---core-and-wp-583365a5f9e6361b5cc5f5f6/issues/adventistchurch/alps-gutenberg-blocks/87)
 

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -15,7 +15,7 @@ module.exports = function (grunt) {
    * of /cdn/<major_version/<version>/ that contains the javascript and css.
    */
   const major_version = "3";
-  const version = "3.11.9";
+  const version = "3.11.10";
 
   /**
    * Split SCSS files by theme

diff --git a/source/css/_base.text.scss b/source/css/_base.text.scss
@@ -28,7 +28,6 @@ b,
 blockquote {
   text-align: left;
   position: relative;
-  quotes: "“" "”" "‘" "’";
   display: flex;
   flex-direction: column;
 
@@ -37,35 +36,32 @@ blockquote {
   }
 
   @include media(">medium") {
-    //border-left: 2px solid $c-black;
   }
 
   p {
-    font-size: rem(20);
-    line-height: rem(31);
+    font-size: rem(16);
+    line-height: rem(30);
     position: relative;
     z-index: 10;
-    text-indent: $pad;
     margin-top: $space;
     font-family: $ff-font--primary;
-    font-style: normal;
-    font-weight: 400;
-    color: #4A4A4A;
+    font-style: italic;
+    font-weight: 600;
+    padding: rem(10) 0 rem(10) rem(60);
 
     &:first-child {
       margin-top: 0;
     }
 
-    &:after {
-      content: "\201D";
-    }
-
     &:before {
-      content: "\201C";
       position: absolute;
-      left: -$pad/1.5;
       top: 0;
     }
+
+    @include media("<large") {
+      padding: rem(20) 0 rem(10) 0;
+      left: 0;
+    }
   }
 
   &.o-pullquote--strong {

diff --git a/source/css/_objects.text.scss b/source/css/_objects.text.scss
@@ -697,21 +697,27 @@ ul:not(.c-breadcrumbs__list):not(.o-inline-list) {
 
 .o-citation {
   display: block;
-  font-style: italic;
-  //text-transform: uppercase;
+  font-style: normal;
   margin-top: $space / 2;
-  font-weight: 600;
+  font-weight: 500;
 
   font-family: $ff-font--primary;
-  font-size: rem(22);
-  line-height: rem(34);
+  font-size: rem(14);
+  line-height: rem(20);
+
+  padding: rem(10) 0 rem(25) rem(60);
 
-  padding: rem(25) 0 rem(25) rem(20);
+  &:before {
+    content: "\2014  ";
+  }
+
+  @include media("<large") {
+    padding: rem(10) 0 rem(20) 0;
+  }
 
   @include media(">large") {
-    font-size: rem(25);
+    //font-size: rem(16);
   }
-  //@include u-font--secondary--s;
 }
 
 /**