Commit a3c00c0a authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '1.0.x' into prod/1.0.x

parents e53c925a accfad9c
......@@ -7,7 +7,9 @@
font-family: Typ1451-Regular,verdana,sans-serif;
width: 100%;
}
.cke_editable .caption > * {
display: inline-block;
}
.cke_editable .caption {
width: 98%;
}
......
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><rect x="11.13" y="22.5" width="13.99" height="3" rx="0.75"/><rect x="11.13" y="16.51" width="13.99" height="3" rx="0.75"/><circle cx="7.13" cy="18.01" r="2.25"/><circle cx="7.13" cy="24" r="2.25"/><path d="M4.64,8.71v0A5.19,5.19,0,0,1,10,3.57a5.14,5.14,0,0,1,5.33,5.08v0A5.19,5.19,0,0,1,10,13.79,5.14,5.14,0,0,1,4.64,8.71Zm7.4,0v0A2.1,2.1,0,0,0,10,6.47,2.06,2.06,0,0,0,8,8.65v0A2.1,2.1,0,0,0,10,10.89,2.07,2.07,0,0,0,12,8.71Z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30"><defs><style>.background{fill:#85bef4;}</style></defs><rect class="background" x="0.5" y="0.5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0Z"/><path d="M24.14,9.38H20.62V7.27a2.1,2.1,0,0,0-2.1-2.11h-7a2.1,2.1,0,0,0-2.1,2.11V9.38H5.86a2.1,2.1,0,0,0-2.11,2.1V22.73a2.1,2.1,0,0,0,2.11,2.11H24.14a2.1,2.1,0,0,0,2.11-2.11V11.48A2.1,2.1,0,0,0,24.14,9.38ZM11.48,7.27h7V9.38h-7ZM6.12,11.48H23.88a.27.27,0,0,1,.26.27V15H5.86V11.75A.27.27,0,0,1,6.12,11.48ZM23.88,22.73H6.12a.26.26,0,0,1-.26-.26V17.11h6.33v1.05a1.05,1.05,0,0,0,1.05,1.06h3.52a1.05,1.05,0,0,0,1-1.06V17.11h6.33v5.36A.26.26,0,0,1,23.88,22.73Z"/></svg>
/**
* @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>');
......
{% if featured_image == 'no' %}
{% if media == 'no' %}
{%
set classes = [
'block',
......
......@@ -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) -->
......
......@@ -41,6 +41,7 @@ stylesheets-remove:
- 'core/themes/seven/css/classy/components/pager.css'
- 'core/themes/seven/css/classy/components/form.css'
- 'core/themes/seven/css/components/form.css'
- 'core/themes/seven/css/components/tables.css'
# - '@stable/css/system/components/align.module.css'
# - '@stable/css/system/components/fieldgroup.module.css'
# - '@stable/css/system/components/container-inline.module.css'
......
......@@ -394,9 +394,9 @@ function uw_fdsu_theme_resp_preprocess_block(&$variables) {
// If we do then, set variable to not show page title.
if ($variables['plugin_id'] == 'page_title_block') {
// Set the featured image variable to no, we will only
// change if there is a featured image.
$variables['featured_image'] = 'no';
// Set the media variable to no, we will only
// change if there is a media.
$variables['media'] = 'no';
// Load the node.
$node = \Drupal::routeMatch()->getParameter('node');
......@@ -409,13 +409,13 @@ function uw_fdsu_theme_resp_preprocess_block(&$variables) {
$node = Node::load($node);
}
// If there is a node, check that it has a featured image.
// If there is a node, check that it has a media.
if ($node) {
// The UW service object.
$uwService = \Drupal::service('uw_cfg_common.uw_service');
$variables['featured_image'] = $uwService->uwCheckNodeForFeaturedImage($node);
$variables['media'] = $uwService->uwCheckNodeForMedia($node);
}
}
......@@ -508,7 +508,7 @@ function uw_fdsu_theme_resp_preprocess_container(&$variables) {
// Set variables for featured image.
$variables['node_type'] = str_replace('_', '-', $node->getType());
$variables['featured_image'] = $uwService->uwCheckNodeForFeaturedImage($node);
$variables['media'] = $uwService->uwCheckNodeForMedia($node);
// If there is a node object, get the header and footer data.
if ($node) {
......
Supports Markdown
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