Skip to content
Snippets Groups Projects
Commit 5b20d91e authored by Kevin Paxman's avatar Kevin Paxman
Browse files

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
parents 6d20c8c2 bf9abc57
No related branches found
No related tags found
1 merge request!59ISTWCMS 4546 m26lebla barlow as backup font
Hide whitespace changes
Inline Side-by-side
js/user-login.js
+ 6
− 3
View file @ 5b20d91e
/**
* @file
*/
(function ($, Drupal) { (function ($, Drupal) {
Drupal.behaviors.uwFdsuThemeRespUserLogin = { Drupal.behaviors.uwFdsuThemeRespUserLogin = {
attach: function (context, settings) { attach: function (context, settings) {
// Don't do anything if SimpleSAML isn't enabled. // Don't do anything if SimpleSAML isn't enabled.
if ($('#edit-simplesamlphp-auth-login-link').length) if ($('#edit-simplesamlphp-auth-login-link').length) {
{ // Hide the normal login form.
// Hide the normal login form.
$('#user-login-form').css('display', 'none'); $('#user-login-form').css('display', 'none');
// Add buttons (using JS because they don't work without JS) // 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>'); $('#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>');
......
templates/page/html.html.twig
+ 8
− 1
View file @ 5b20d91e
...@@ -32,6 +32,13 @@ ...@@ -32,6 +32,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html{{ html_attributes }} class="no-js"> <html{{ html_attributes }} class="no-js">
<head> <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 %} {% if not uw_admin_page %}
<!-- Google Tag Manager --> <!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start': <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
...@@ -45,7 +52,7 @@ ...@@ -45,7 +52,7 @@
<title>{{ head_title|safe_join(' | ') }}</title> <title>{{ head_title|safe_join(' | ') }}</title>
<css-placeholder token="{{ placeholder_token|raw }}"> <css-placeholder token="{{ placeholder_token|raw }}">
<js-placeholder token="{{ placeholder_token|raw }}"> <js-placeholder token="{{ placeholder_token|raw }}">
</head> </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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment