Skip to content
Snippets Groups Projects
Commit f7966fcd authored by Igor Biki's avatar Igor Biki
Browse files

Merge branch 'feature/ISTWCMS-4708-lkmorlan-fix-markup' into '1.0.x'

ISTWCMS-4708: Move important items nearer top of 'head' element

See merge request !67
parents 613d579c f1d679ce
No related branches found
No related tags found
1 merge request!67ISTWCMS-4708: Move important items nearer top of 'head' element
...@@ -21,21 +21,20 @@ ...@@ -21,21 +21,20 @@
* @see template_preprocess_html() * @see template_preprocess_html()
*/ */
#} #}
{% set body_classes = [ {% set body_classes = [
logged_in ? 'user-logged-in', logged_in ? 'user-logged-in',
not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class, not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
not root_path ? 'front' : 'not-front', not root_path ? 'front' : 'not-front',
node_type ? 'node-page node-page--node-type-' ~ node_type|clean_class, node_type ? 'node-page node-page--node-type-' ~ node_type|clean_class,
] %} ] %}
<!DOCTYPE html> <!DOCTYPE html>
<html{{ html_attributes }} class="no-js"> <html{{ html_attributes }} class="no-js">
<head> <head>
<head-placeholder token="{{ placeholder_token|raw }}">
<title>{{ head_title|safe_join(' | ') }}</title>
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin /> <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" /> <link rel="preload" as="style" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" media="print" onload="this.media='all'" />
media="print" onload="this.media='all'" />
<noscript> <noscript>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" /> <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" />
</noscript> </noscript>
...@@ -48,11 +47,9 @@ ...@@ -48,11 +47,9 @@
})(window,document,'script','dataLayer','GTM-M9XLVF');</script> })(window,document,'script','dataLayer','GTM-M9XLVF');</script>
<!-- End Google Tag Manager --> <!-- End Google Tag Manager -->
{% endif %} {% endif %}
<head-placeholder token="{{ placeholder_token|raw }}"> <css-placeholder token="{{ placeholder_token|raw }}">
<title>{{ head_title|safe_join(' | ') }}</title> <js-placeholder token="{{ placeholder_token|raw }}">
<css-placeholder token="{{ placeholder_token|raw }}"> </head>
<js-placeholder token="{{ placeholder_token|raw }}">
</head>
<body{{ attributes.addClass(body_classes) }}> <body{{ attributes.addClass(body_classes) }}>
{% if not uw_admin_page %} {% if not uw_admin_page %}
<!-- Google Tag Manager (noscript) --> <!-- Google Tag Manager (noscript) -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment