Merge branch 'feature/ISTWCMS-4546-m26lebla-barlow-as-backup-font' into '1.0.x'

ISTWCMS 4546 m26lebla barlow as backup font See merge request !59

Merge branch 'feature/ISTWCMS-4546-m26lebla-barlow-as-backup-font' into '1.0.x'
ISTWCMS 4546 m26lebla barlow as backup font See merge request !59
5b20d91e · Kevin Paxman · 6d20c8c2 · bf9abc57 · 5b20d91e · 5b20d91e
Commit 5b20d91e authored Dec 03, 2021 by Kevin Paxman
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 4 deletions

js/user-login.js js/user-login.js +6 -3

templates/page/html.html.twig templates/page/html.html.twig +8 -1

No files found.
--- a/js/user-login.js
+++ b/js/user-login.js
+/**
+ * @file
+ */
+
 (function ($, Drupal) {
  Drupal.behaviors.uwFdsuThemeRespUserLogin = {
    attach: function (context, settings) {
      // Don't do anything if SimpleSAML isn't enabled.
-      if ($('#edit-simplesamlphp-auth-login-link').length)
-      {
-        // Hide the normal login form.
+      if ($('#edit-simplesamlphp-auth-login-link').length) {
+      // Hide the normal login form.
        $('#user-login-form').css('display', 'none');
        // Add buttons (using JS because they don't work without JS)
        $('#user-login-form').after('<button id="adfs-login-link" class="button--primary">Log in via ADFS</button> &nbsp; <button id="local-login-link" class="button--medium">Log in locally</button>');

--- a/templates/page/html.html.twig
+++ b/templates/page/html.html.twig
@@ -32,6 +32,13 @@
 <!DOCTYPE html>
 <html{{ html_attributes }} class="no-js">
 <head>
+  <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="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'" />
+  <noscript>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Barlow+Condensed:wght@500;700&family=Barlow:wght@400;500;700&display=swap" />
+  </noscript>
  {% if not uw_admin_page %}
  <!-- Google Tag Manager -->
  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
@@ -45,7 +52,7 @@
    <title>{{ head_title|safe_join(' | ') }}</title>
    <css-placeholder token="{{ placeholder_token|raw }}">
      <js-placeholder token="{{ placeholder_token|raw }}">
-        </head>
+  </head>
 <body{{ attributes.addClass(body_classes) }}>
 {% if not uw_admin_page %}
 <!-- Google Tag Manager (noscript) -->