Merge pull request #419 from adventistchurch/v3.312-title-hover

V3.312 title hover
adventistchurch · Nov 11, 2019 · 6e5dad2 · 6e5dad2
2 parents 48e141b + 7c9141a
commit 6e5dad2
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 17 deletions.
diff --git a/source/_patterns/01-molecules/blocks/content-block.twig b/source/_patterns/01-molecules/blocks/content-block.twig
@@ -5,7 +5,7 @@
     {% endif %}
     <h3 class="u-theme--color--darker {{ content_block_default.title_class }}">
       {% if content_block_default.url %}
-        <a href="{{ content_block_default.url }}" class="c-block__title-link u-theme--link-hover--dark">
+        <a href="{{ content_block_default.url }}" class="c-block__title-link {% if content_block_default.block_title_link_class %}{{ content_block_default.block_title_link_class }}{% else %}{{ 'u-theme--link-hover--dark' }}{% endif %}">
       {% endif %}
       <strong>{{ content_block_default.title | raw }}</strong>
       {% if content_block_default.url %}

diff --git a/source/_patterns/01-molecules/blocks/media-block.twig b/source/_patterns/01-molecules/blocks/media-block.twig
@@ -54,10 +54,10 @@
           {% if media_block_default.title %}
             <h3 class="c-media-block__title c-block__title {{ media_block_default.block_title_class }} {% if media_block_default.kicker %}{{ 'u-space--zero'}}{% endif %}">
               {% if media_block_default.url %}
-                <a href="{{ media_block_default.url }}" class="c-block__title-link u-theme--link-hover--dark">
-                {% endif %}
+                <a href="{{ media_block_default.url }}" class="c-block__title-link {% if media_block_default.block_title_link_class %}{{ media_block_default.block_title_link_class }}{% else %}{{ 'u-theme--link-hover--dark' }}{% endif %}">
+              {% endif %}
                 {{ media_block_default.title | raw }}
-                {% if media_block_default.url %}
+              {% if media_block_default.url %}
                 </a>
               {% endif %}
             </h3>

diff --git a/source/_patterns/02-organisms/sections/page-header-feature.json b/source/_patterns/02-organisms/sections/page-header-feature.json
@@ -4,6 +4,7 @@
     "block_img_class": "l-grid-item u-padding--zero--sides",
     "block_content_class": "l-grid-item u-border-left--black--at-large u-theme--border-color--darker--left u-theme--color--lighter u-theme--background-color--darker u-padding--top u-padding--bottom",
     "block_title_class": "u-color--white u-font--primary u-font-weight--bold",
+    "block_title_link_class": "u-theme--link-hover--light",
     "block_meta_class": "",
     "kicker": "Feature",
     "title": "Nulla finibus ligula ut nisl facilisis",

diff --git a/source/_patterns/02-organisms/sections/page-header-feature~3-col.json b/source/_patterns/02-organisms/sections/page-header-feature~3-col.json
@@ -6,13 +6,15 @@
         "block_group_class": "u-flex--justify-center u-overlay--dark",
         "block_content_class": "u-color--white",
         "block_title_class": "u-font--primary--xl u-flex--justify-center",
+        "block_title_link_class": "u-theme--link-hover--light",
         "block_meta_class": "hide",
         "title": "<em class='u-theme--color--lighter'>Sermon</em> Seeking Another Way",
         "kicker": false,
         "description": false,
         "category": false,
         "datetime": false,
         "date": false,
+        "url": "/",
         "picture": {
           "img_break_m": "700",
           "img": {
@@ -41,13 +43,15 @@
         "block_group_class": "u-flex--justify-center u-overlay--dark",
         "block_content_class": "u-color--white",
         "block_title_class": "u-font--primary--xl u-flex--justify-center",
+        "block_title_link_class": "u-theme--link-hover--light",
         "block_meta_class": "hide",
         "title": "<em class='u-theme--color--lighter'>Blog</em> Son Rise Over the Land of the Rising Sun: My Eyewitness Account",
         "kicker": false,
         "description": false,
         "category": false,
         "datetime": false,
         "date": false,
+        "url": "/",
         "picture": {
           "img_break_m": "700",
           "img": {
@@ -76,13 +80,15 @@
         "block_group_class": "u-flex--justify-center u-overlay--dark",
         "block_content_class": "u-color--white",
         "block_title_class": "u-font--primary--xl u-flex--justify-center",
+        "block_title_link_class": "u-theme--link-hover--light",
         "block_meta_class": "hide",
         "title": "<em class='u-theme--color--lighter'>Event</em> Religious Liberty – The Freedom to Beleive",
         "kicker": false,
         "description": false,
         "category": false,
         "datetime": false,
         "date": false,
+        "url": "/",
         "picture": {
           "img_break_m": "700",
           "img": {

diff --git a/source/_patterns/02-organisms/sections/page-header-feature~full.json b/source/_patterns/02-organisms/sections/page-header-feature~full.json
@@ -7,6 +7,7 @@
     "block_group_class": "u-flex--justify-center u-flex--align-center u-text-align--center u-overlay--dark",
     "block_content_class": "l-grid--7-col l-grid-wrap l-grid-wrap--7-of-7 u-color--white",
     "block_title_class": "l-grid-item--5-col l-grid-item--m--2-col u-font--primary--xl u-flex--justify-center",
+    "block_title_link_class": "u-theme--link-hover--lighter",
     "block_meta_class": "hide",
     "title": "Lorem ipsum dolor sit amet, consectetur adipiscing elit",
     "kicker": false,

diff --git a/source/_patterns/02-organisms/sections/page-header-long.twig b/source/_patterns/02-organisms/sections/page-header-long.twig
@@ -22,8 +22,16 @@
   <header class="c-page-header c-page-header__long u-space--zero u-theme--background-color--dark{{ ' ' ~ page_header_class }}">
     <div class="c-page-header__long--inner l-grid l-grid--7-col{{ ' ' ~ page_header_inner_class }}">
       <div class="c-page-header__content c-page-header__long__content l-grid-wrap l-grid-wrap--5-of-7 u-shift--left--1-col--at-medium{{ ' ' ~ page_header_content_class }}">
-        {%  if page_header.kicker %}<span class="o-kicker u-color--white">{{ page_header.kicker | raw }}</span>{% endif %}
-        <h1 class="u-font--primary--xl u-color--white"><a class="u-link--white u-link-hover--white u-font-weight--bold" href="">{{ page_header.title }}</a></h1>
+        {%  if page_header.kicker %}<span class="c-page-header__kicker o-kicker u-color--white">{{ page_header.kicker | raw }}</span>{% endif %}
+        <h1 class="c-page-header__title u-font--primary--xl u-color--white">
+          {% if page_header.url %}
+            <a href="{{ page_header.url }}" class="c-page-header__title-link u-font-weight--bold {% if page_header.block_title_link_class %}{{ page_header.block_title_link_class }}{% else %}{{ 'u-theme--link-hover--lighter' }}{% endif %}">
+          {% endif %}
+            {{ page_header.title | raw }}
+          {% if page_header.url %}
+            </a>
+          {% endif %}
+        </h1>
       </div>
     </div>
   </header>

diff --git a/source/_patterns/02-organisms/sections/page-header.twig b/source/_patterns/02-organisms/sections/page-header.twig
@@ -18,8 +18,16 @@
       </style>
     {% endif %}
     <div class="c-page-header__simple--inner u-padding">
-      {%  if page_header.kicker %}<span class="o-kicker u-color--white">{{ page_header.kicker | raw }}</span> {% endif %}
-      <h1 class="u-font--primary--xxl u-color--white"><a class="u-link--white u-link-hover--white" href="">{{ page_header.title }}</a></h1>
+      {%  if page_header.kicker %}<span class="c-page-header__kicker o-kicker u-color--white">{{ page_header.kicker | raw }}</span> {% endif %}
+      <h1 class="c-page-header__title u-font--primary--xxl u-color--white">
+        {% if page_header.url %}
+          <a href="{{ page_header.url }}" class="c-page-header__title-link {% if page_header.block_title_link_class %}{{ page_header.block_title_link_class }}{% else %}{{ 'u-theme--link-hover--lighter' }}{% endif %}">
+        {% endif %}
+          {{ page_header.title | raw }}
+        {% if page_header.url %}
+          </a>
+        {% endif %}
+      </h1>
     </div>
   </header> <!-- /.header__swath -->
 {% endif %}
diff --git a/source/css/_base.text.scss b/source/css/_base.text.scss
@@ -28,15 +28,16 @@ b,
 blockquote {
   text-align: left;
   position: relative;
-  quotes: "\201C""\201D""\2018""\2019";
+  quotes: "“" "”" "‘" "’";
   padding-left: $pad;
   display: flex;
   flex-direction: column;
 
-  @include media('>medium') {
+  @include media(">medium") {
     border-left: 3px solid $c-black;
   }
 
+
   p {
     font-size: rem(24);
     line-height: 1.3;
@@ -51,11 +52,11 @@ blockquote {
     }
 
     &:after {
-      content: close-quote;
+      content: "\201D";
     }
 
     &:before {
-      content: open-quote;
+      content: "\201C";
       position: absolute;
       left: -$pad;
       top: 0;

diff --git a/source/css/_objects.carousels.scss b/source/css/_objects.carousels.scss
@@ -86,11 +86,6 @@
     min-height: 250px;
     display: block;
   }
-
-  .c-block__title-link:hover {
-    color: white !important;
-    text-decoration: underline;
-  }
 }
 
 .c-hero-carousel {

diff --git a/source/css/_trumps.helper-classes.scss b/source/css/_trumps.helper-classes.scss
@@ -295,6 +295,11 @@
 /**
  * Specific Widths - visible greater than #
  */
+
+.u-hide {
+  display: none;
+}
+
 .u-hide-until--s {
   @include media("<=small") {
     display: none;
@@ -564,6 +569,7 @@
  * Round Element
  */
 .u-round {
+  display: grid;
   overflow: hidden;
   border-radius: 100%;
 }