fix that bramplate

NRCan · Mar 13, 2023 · 7039e86 · 7039e86
2 parents ebfaa02 + 5b2c03c
commit 7039e86
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/html/modules/custom/header_and_footer_scripts/header_and_footer_scripts.module b/html/modules/custom/header_and_footer_scripts/header_and_footer_scripts.module
@@ -88,6 +88,12 @@ function header_and_footer_scripts_page_top(array &$page_top) {
       $i++;
     }
   }
+  if (isset($body_section['scripts']) && !empty($body_section['scripts'])) {
+    $page_top['top_scripts_scripts'] = [
+      '#markup' => $body_section['scripts'],
+    ];
+  }
+  /*
   if (isset($body_section['scripts']) && !empty($body_section['scripts'])) {
     $output_scripts = preg_split("/(<\/script>|<\/noscript>)/", $body_section['scripts']);
     $i = 1;
@@ -146,6 +152,7 @@ function header_and_footer_scripts_page_top(array &$page_top) {
       $i++;
     }
   }
+  */
 }
 
 /**

diff --git a/html/themes/custom/nrcan_wxt/templates/block/block--system-branding-block.html.twig b/html/themes/custom/nrcan_wxt/templates/block/block--system-branding-block.html.twig
@@ -28,20 +28,14 @@
 
 #}
 {% block content %}
-  {% if nrwxt_logo %}
-    <a class="logo navbar-btn pull-left" href="{{ site_link }}" title="{{ 'Home'|t }}" rel="home">
+  {% if nrwxt_logo == true %}
+    <a class="logo col-xs-6 col-md-2 text-right" href="{{ site_link }}" title="{{ 'Home'|t }}" rel="home">
       <img src="{{ logo_svg }}" alt="{{ site_name }}" />
     </a>
   {% endif %}
-  {% if site_logo %}
-    <a class="logo navbar-btn pull-left" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
+  {% if not nrwxt_logo and site_logo %}
+    <a class="logo col-xs-6 col-md-2 text-right" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">
       <img src="{{ site_logo }}" alt="{{ 'Home'|t }}" />
     </a>
   {% endif %}
-  {% if site_name %}
-    <!-- <a class="name navbar-brand" href="{{ path('<front>') }}" title="{{ 'Home'|t }}" rel="home">{{ site_name }}</a> -->
-  {% endif %}
-  {% if site_slogan %}
-    <p class="navbar-text">{{ site_slogan }}</p>
-  {% endif %}
 {% endblock %}