Merge pull request #35 from wri/sass-bullet-fix

Sass bullet fix
wri · Dec 8, 2021 · 2229de0 · 2229de0
2 parents f2a94f1 + d0796c9
commit 2229de0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/modules/wri_narrative/components/wri_narrative_tax.sfc b/modules/wri_narrative/components/wri_narrative_tax.sfc
@@ -30,7 +30,7 @@
 
   $prepareContext = function(&$context) {
     // If this is the homepage display.
-    if (isset($context["content"]["main_content"]["field_listing"][0]) && $context["content"]["main_content"]["field_listing"][0]["#display_id"] == 'cards') {
+    if (isset($context["content"]["main_content"]["field_listing"][0]) && $context["content"]["main_content"]["field_listing"][0]["#display_id"] == 'cards' && !empty(\Drupal::hasService('wri_filter.filter'))) {
       // Check for an applied content filter.
       $current_filter = \Drupal::service('wri_filter.filter')->getCurrentFilter(TRUE);
       // If filter is found set value to narrative tax field from landing page node.

diff --git a/themes/custom/ts_wrin/sass/global/_wysiwyg.scss b/themes/custom/ts_wrin/sass/global/_wysiwyg.scss
@@ -1,4 +1,4 @@
-.main-content,
+.main-content .text-formatted,
 .cke_editable_themed,
 .paragraph--type--side-by-side .text-formatted {
   line-height: 1.5;