Commit 6d7e4926 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents e3f346e7 9341f959
<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="M20.34,14.37a1.85,1.85,0,0,1,.47,0,1.58,1.58,0,0,0,0-.88c-.11-.53-.26-.86-.57-.81s-.33.44-.22,1a1.89,1.89,0,0,0,.3.71Zm-2.68.43c.22.1.36.16.41.11s-.17-.47-.6-.66a1.6,1.6,0,0,0-1.54.18c-.15.11-.29.27-.27.36s.5-.14,1.13-.18a1.84,1.84,0,0,1,.87.19Zm-.45.26c-.46.07-.75.32-.68.5,0,0,.06,0,.26,0a2,2,0,0,1,.94-.1c.15,0,.22,0,.25,0s-.29-.4-.77-.34Zm2.71.85c.17-.34-.54-.69-.71-.35s.54.7.71.35Zm.79-1c-.39,0-.4.79,0,.8s.4-.8,0-.8Zm-11,3.95a.37.37,0,0,1-.42-.12c-.26-.4.56-1,.15-1.79a1.08,1.08,0,0,0-1.76-.28c-.43.48-.43,1.18-.25,1.21s.21-.32.37-.58a.64.64,0,0,1,.89-.19h0c.58.38.06.89.11,1.44.07.83.92.82,1.08.45a.1.1,0,0,0,0-.12s0-.07-.17,0Zm15-.85a8.28,8.28,0,0,0-.34-1,1.67,1.67,0,0,0-.15-2.17,5,5,0,0,0-2.06-.93c-.08-.57.23-2.94-1.08-4.16a5.19,5.19,0,0,0,1.69-3.29c0-2-2.41-2.55-5.38-1.32l-.63.26L15.65,4.22C12.27,1.27,1.68,13,5.07,15.89l.74.63A3.7,3.7,0,0,0,5.6,18.2a3.56,3.56,0,0,0,3.39,3c2.89,6.66,13.42,6.67,16.15.15a7.06,7.06,0,0,0,.45-2.13c0-.89-.5-1.26-.83-1.26ZM8.93,20.4a2.72,2.72,0,0,1-2.5-2.28c-.31-3.07,3.72-3.77,4.21-.62.22,1.49-.24,2.93-1.71,2.9ZM8,14.68a2.86,2.86,0,0,0-1.84,1.17,5.17,5.17,0,0,1-.78-.75c-.65-1.25.71-3.66,1.67-5,2.36-3.37,6.06-5.92,7.77-5.46A6.71,6.71,0,0,1,16,5.77,24.47,24.47,0,0,0,12.72,8,15,15,0,0,0,8,14.68Zm12,5.07a8,8,0,0,1-3.48-.36c.31-1,1.35.31,4.83-.69a7.79,7.79,0,0,0,2.55-1.27,5.19,5.19,0,0,1,.36,1.22c.18,0,.71,0,.57.9a4.54,4.54,0,0,1-1.3,2.55,5.28,5.28,0,0,1-1.56,1.17,6.64,6.64,0,0,1-1,.43c-2.68.87-5.42-.09-6.31-2.16a3.94,3.94,0,0,1-.18-.48,4.26,4.26,0,0,1,1-4,.31.31,0,0,0,0-.47c-.35-.51-1.56-1.37-1.32-3a2.29,2.29,0,0,1,2.21-2l.25,0c.43,0,.8.08,1.15.09A2.28,2.28,0,0,0,19.43,11a1.32,1.32,0,0,1,.66-.37.86.86,0,0,1,.68.11c.5.33.57,1.14.6,1.73,0,.33.05,1.15.07,1.38,0,.54.17.61.46.7l.52.16a3,3,0,0,1,1.3.61.79.79,0,0,1,.24.47c.08.57-.44,1.27-1.82,1.91a9.43,9.43,0,0,1-5,.69c-1-.14-1.59,1.16-1,2.06,1.13,1.67,6.13,1,7.58-1.07,0-.05,0-.08,0-.05-2.1,1.43-4.87,1.91-6.44,1.3a1.12,1.12,0,0,1-.8-.83,5.28,5.28,0,0,0,3.56,0s.1-.14,0-.12Zm-7.61-9.69a9.83,9.83,0,0,1,2.8-2.28,0,0,0,0,1,.05,0v0a2.3,2.3,0,0,0-.26.63s0,0,0,0h0a5.5,5.5,0,0,1,2.45-.87,0,0,0,0,1,0,0,0,0,0,0,1,0,0,2.06,2.06,0,0,0-.39.39s0,0,0,.05h0a4.75,4.75,0,0,1,2.06.54,0,0,0,0,1,0,.08,8.63,8.63,0,0,0-6.74,1.35,0,0,0,0,1-.05,0,0,0,0,0,1,0,0Z"/></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><g><rect class="background" x=".5" y=".5" width="29" height="29"/><path d="M29,1V29H1V1H29m1-1H0V30H30V0h0Z"/></g><g><path d="M23.44,3.75H6.56c-1.55,0-2.81,1.26-2.81,2.81v12.66c0,1.55,1.26,2.81,2.81,2.81h4.22v3.69c0,.31,.26,.53,.53,.53,.11,0,.21-.03,.31-.1l5.49-4.11h6.33c1.55,0,2.81-1.26,2.81-2.81V6.56c0-1.55-1.26-2.81-2.81-2.81Zm.7,15.47c0,.39-.32,.7-.7,.7h-7.03l-.56,.42-2.95,2.21v-2.64H6.56c-.39,0-.7-.32-.7-.7V6.56c0-.39,.32-.7,.7-.7H23.44c.39,0,.7,.32,.7,.7v12.66Z"/><path d="M11.38,16l1.23-1.68c.73,.6,1.56,1.01,2.44,1.01,.62,0,.94-.27,.94-.65h0c0-.37-.27-.59-1.32-.96-1.69-.58-2.88-1.19-2.88-2.82v-.04c0-1.63,1.24-2.77,3.2-2.77,1.21,0,2.27,.33,3.2,1.09l-1.17,1.72c-.62-.47-1.36-.82-2.09-.82-.53,0-.82,.26-.82,.59h0c0,.41,.28,.62,1.42,1.04,1.7,.55,2.77,1.24,2.77,2.77v.03c0,1.74-1.35,2.82-3.27,2.82-1.33,0-2.6-.41-3.65-1.32Z"/></g></svg>
......@@ -21,21 +21,20 @@
* @see template_preprocess_html()
*/
#}
{% set body_classes = [
logged_in ? 'user-logged-in',
not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
not root_path ? 'front' : 'not-front',
node_type ? 'node-page node-page--node-type-' ~ node_type|clean_class,
] %}
<!DOCTYPE html>
<html{{ html_attributes }} class="no-js">
<head>
<head-placeholder token="{{ placeholder_token|raw }}">
<title>{{ head_title|safe_join(' | ') }}</title>
<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'" />
<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>
......@@ -48,11 +47,9 @@
})(window,document,'script','dataLayer','GTM-M9XLVF');</script>
<!-- End Google Tag Manager -->
{% endif %}
<head-placeholder token="{{ placeholder_token|raw }}">
<title>{{ head_title|safe_join(' | ') }}</title>
<css-placeholder token="{{ placeholder_token|raw }}">
<js-placeholder token="{{ placeholder_token|raw }}">
</head>
<css-placeholder token="{{ placeholder_token|raw }}">
<js-placeholder token="{{ placeholder_token|raw }}">
</head>
<body{{ attributes.addClass(body_classes) }}>
{% if not uw_admin_page %}
<!-- Google Tag Manager (noscript) -->
......
......@@ -173,14 +173,18 @@ function uw_fdsu_theme_resp_form_system_theme_settings_alter(&$form, FormStateIn
'#default_value' => theme_get_setting('wcms_colour_scheme', 'uw_fdsu_theme_resp') ? theme_get_setting('wcms_colour_scheme', 'uw_fdsu_theme_resp') : 'default',
'#description' => t("Select a color scheme to use"),
'#options' => [
'org-default' => t('Yellow/red (Default)'),
'org-default' => t('Black/gold (default)'),
'org-art' => t('Orange (Arts)'),
'org-eng' => t('Purple (Engineering)'),
'org-env' => t('Green (Environment)'),
'org-ahs' => t('Teal (Health)'),
'org-mat' => t('Pink (Mathematics)'),
'org-sci' => t('Blue (Science)'),
'org-school' => t('Red (School)'),
'org-school' => t('Red (school)'),
'org-cgc' => t('Red (Conrad Grebel University College)'),
'org-ren' => t('Green (Renison University College)'),
'org-stj' => t('Green (St. Jerome’s University)'),
'org-stp' => t('Green (St. Paul’s University College)'),
],
];
......
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