Commit 982f1613 authored by Chris Shantz's avatar Chris Shantz
Browse files

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

parents 95a6207f 8e7839dc
......@@ -12,3 +12,33 @@
color: white;
padding: 0.2rem 1rem;
}
.layout-builder__section section {
/* position: relative; */
}
.layout-builder__section [data-expand-collapse-group],
.layout-builder__section [data-expand-collapse-header] {
position: relative;
margin-top: 0.6rem;
}
.layout-builder__section [data-expand-collapse-group]::before,
.layout-builder__section [data-expand-collapse-header]::before {
font-family: Typ1451-Regular, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Oxygen-Sans", Ubuntu, Cantarell, "Fira Sans", Droid Sans, sans-serif;
font-size: 12.6px;
position: absolute;
top: -0.6rem;
left: -2px;
background-color: #6A6A6A;
color: white;
padding: 0.2rem 1rem;
}
.layout-builder__section [data-expand-collapse-group]::before {
content: "Expand/collapse group " open-quote attr(data-expand-collapse-group) close-quote;
}
.layout-builder__section [data-expand-collapse-header]::before {
content: "Expand/collapse group " open-quote attr(data-expand-collapse-group) close-quote " with header " open-quote attr(data-expand-collapse-header) close-quote;
}
......@@ -51,6 +51,8 @@ function _uw_theme_admin_add_favicons(array &$variables) {
'href' => $favicon_base_path . '/apple-touch-icon.png',
];
$variables['page']['#attached']['html_head_link'][] = [$favicon_apple];
// Manifest needs a full URL.
$favicon_base_path = \Drupal::request()->getSchemeAndHttpHost() . $favicon_base_path;
$manifest = [
'icons' => [
[
......@@ -65,7 +67,7 @@ function _uw_theme_admin_add_favicons(array &$variables) {
],
],
];
$manifest = json_encode($manifest);
$manifest = urlencode(json_encode($manifest));
$favicon_manifest = [
'rel' => 'manifest',
'href' => 'data:application/manifest+json,' . $manifest,
......
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