From 9bf86695fb0ff5595b422a1949f68ae06e27a5c6 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Tue, 5 Feb 2019 14:47:06 -0800 Subject: [PATCH 01/25] HSD8-577 Change "Post Event Video" to "Post Event Details" --- .../core.entity_form_display.node.hs_event.default.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/default/core.entity_form_display.node.hs_event.default.yml b/config/default/core.entity_form_display.node.hs_event.default.yml index a66e67fe93..e2bf334ccc 100644 --- a/config/default/core.entity_form_display.node.hs_event.default.yml +++ b/config/default/core.entity_form_display.node.hs_event.default.yml @@ -95,13 +95,13 @@ third_party_settings: weight: 6 format_type: tab format_settings: - label: 'Post Event Video' + label: 'Post Event Details' formatter: closed description: '' required_fields: true id: '' classes: '' - label: 'Post Event Video' + label: 'Post Event Details' group_event_tags: children: - field_hs_event_series From 15c27498d8742a4841aa6cec3518e4b91c16da17 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Tue, 5 Feb 2019 15:42:38 -0800 Subject: [PATCH 02/25] updated dependencies --- composer.json | 3 - composer.lock | 410 +++++++++++++++++++++++++------------------------- 2 files changed, 206 insertions(+), 207 deletions(-) diff --git a/composer.json b/composer.json index 78627e0b7e..b0db5141f0 100644 --- a/composer.json +++ b/composer.json @@ -302,9 +302,6 @@ "drupal/config_update": { "https://www.drupal.org/project/config_update/issues/2974637": "https://www.drupal.org/files/issues/2018-06-11/drush9-support-2974637-24.patch" }, - "drupal/jira_rest": { - "https://www.drupal.org/project/jira_rest/issues/2982892": "https://www.drupal.org/files/issues/2018-08-22/jira_rest-key_error-2982892-6.patch" - }, "drupal/entity_reference_revisions": { "Prevent recursion and unwanted entity saves": "patches/contrib/entity_reference_revisions-recursion-fix.patch" }, diff --git a/composer.lock b/composer.lock index 005278096e..08aee83538 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "672ed6625beb2411a3841835ce919c66", + "content-hash": "21d2335216e0f9c95080c034ac4c4662", "packages": [ { "name": "acquia/blt", @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/acquia/blt.git", - "reference": "e90ace3160a4c0450ba8c2a0e35e1a46f7849329" + "reference": "a38e61505f9858be89e711e845d5b0c2fdf7ca78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/acquia/blt/zipball/e90ace3160a4c0450ba8c2a0e35e1a46f7849329", - "reference": "e90ace3160a4c0450ba8c2a0e35e1a46f7849329", + "url": "https://api.github.com/repos/acquia/blt/zipball/a38e61505f9858be89e711e845d5b0c2fdf7ca78", + "reference": "a38e61505f9858be89e711e845d5b0c2fdf7ca78", "shasum": "" }, "require": { @@ -94,7 +94,7 @@ "template", "testing" ], - "time": "2018-12-17T15:48:37+00:00" + "time": "2019-02-04T15:42:02+00:00" }, { "name": "acquia/http-hmac-php", @@ -308,24 +308,24 @@ }, { "name": "chi-teck/drupal-code-generator", - "version": "1.27.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://github.com/Chi-teck/drupal-code-generator.git", - "reference": "a839bc89d385087d8a7a96a9c1c4bd470ffb627e" + "reference": "a43131309b56a4c1874f39a9eaa4f6cb1a9832cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/a839bc89d385087d8a7a96a9c1c4bd470ffb627e", - "reference": "a839bc89d385087d8a7a96a9c1c4bd470ffb627e", + "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/a43131309b56a4c1874f39a9eaa4f6cb1a9832cd", + "reference": "a43131309b56a4c1874f39a9eaa4f6cb1a9832cd", "shasum": "" }, "require": { "ext-json": "*", "php": ">=5.5.9", - "symfony/console": "~2.7|^3", - "symfony/filesystem": "~2.7|^3", - "twig/twig": "^1.23.1" + "symfony/console": "^3.4 || ^4.0", + "symfony/filesystem": "^3.4 || ^4.0", + "twig/twig": "^1.35" }, "bin": [ "bin/dcg" @@ -349,7 +349,7 @@ "GPL-2.0-or-later" ], "description": "Drupal code generator", - "time": "2018-10-11T08:05:59+00:00" + "time": "2019-01-30T10:34:16+00:00" }, { "name": "ckeditor-plugin/fakeobjects", @@ -622,21 +622,21 @@ }, { "name": "consolidation/annotated-command", - "version": "2.11.0", + "version": "2.11.2", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "edea407f57104ed518cc3c3b47d5b84403ee267a" + "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/edea407f57104ed518cc3c3b47d5b84403ee267a", - "reference": "edea407f57104ed518cc3c3b47d5b84403ee267a", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572", + "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572", "shasum": "" }, "require": { "consolidation/output-formatters": "^3.4", - "php": ">=5.4.0", + "php": ">=5.4.5", "psr/log": "^1", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", @@ -714,7 +714,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-12-29T04:43:17+00:00" + "time": "2019-02-02T02:29:53+00:00" }, { "name": "consolidation/config", @@ -2357,17 +2357,17 @@ }, { "name": "drupal/admin_toolbar", - "version": "1.25.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://git.drupal.org/project/admin_toolbar", - "reference": "8.x-1.25" + "reference": "8.x-1.26" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-1.25.zip", - "reference": "8.x-1.25", - "shasum": "bc24929d5e49932518797c1228e647e98b03542b" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-8.x-1.26.zip", + "reference": "8.x-1.26", + "shasum": "7be9f91008bf17cf49b43d1c8e2211e7a8e40ce4" }, "require": { "drupal/core": "*" @@ -2378,8 +2378,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.25", - "datestamp": "1542915180", + "version": "8.x-1.26", + "datestamp": "1549218480", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5219,7 +5219,7 @@ "source": { "type": "git", "url": "https://git.drupal.org/project/extlink", - "reference": "60ee8d03009e72700c91fe3ec1d55532cf69d611" + "reference": "92c2d5b33b1f287bc51206417f95d8c9b5b57ea2" }, "require": { "drupal/core": "~8.0" @@ -5230,8 +5230,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.1+26-dev", - "datestamp": "1547516880", + "version": "8.x-1.1+30-dev", + "datestamp": "1548978480", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -5261,7 +5261,7 @@ "support": { "source": "http://cgit.drupalcode.org/extlink" }, - "time": "2019-01-20T23:56:37+00:00" + "time": "2019-01-31T23:53:42+00:00" }, { "name": "drupal/fakeobjects", @@ -5620,20 +5620,20 @@ }, { "name": "drupal/google_analytics", - "version": "2.3.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://git.drupal.org/project/google_analytics", - "reference": "8.x-2.3" + "reference": "8.x-2.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/google_analytics-8.x-2.3.zip", - "reference": "8.x-2.3", - "shasum": "9ea88a81925ba538d9fa7ac6ce4f1598e5ee48e4" + "url": "https://ftp.drupal.org/files/projects/google_analytics-8.x-2.4.zip", + "reference": "8.x-2.4", + "shasum": "f2e78ec140024ddcd19e027704ba73c33731f656" }, "require": { - "drupal/core": "~8.0" + "drupal/core": "~8.5" }, "require-dev": { "drupal/php": "*", @@ -5645,8 +5645,8 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.3", - "datestamp": "1531469021", + "version": "8.x-2.4", + "datestamp": "1548968580", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5670,7 +5670,7 @@ "description": "Allows your site to be tracked by Google Analytics by adding a Javascript tracking code to every page.", "homepage": "https://www.drupal.org/project/google_analytics", "support": { - "source": "http://git.drupal.org/project/google_analytics.git", + "source": "https://git.drupal.org/project/google_analytics.git", "issues": "https://www.drupal.org/project/issues/google_analytics" } }, @@ -5798,17 +5798,17 @@ }, { "name": "drupal/jira_rest", - "version": "3.0.0", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupal.org/project/jira_rest", - "reference": "8.x-3.0" + "reference": "8.x-3.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jira_rest-8.x-3.0.zip", - "reference": "8.x-3.0", - "shasum": "f1a9145a7933b024847d6119ffc78b21a54dec3e" + "url": "https://ftp.drupal.org/files/projects/jira_rest-8.x-3.1.zip", + "reference": "8.x-3.1", + "shasum": "bfacdd2480e40d578c50a9af88779cb297eb4ccc" }, "require": { "biologis/jira-php-api": "dev-master", @@ -5820,15 +5820,12 @@ "dev-3.x": "3.x-dev" }, "drupal": { - "version": "8.x-3.0", - "datestamp": "1530215620", + "version": "8.x-3.1", + "datestamp": "1548351780", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "patches_applied": { - "https://www.drupal.org/project/jira_rest/issues/2982892": "https://www.drupal.org/files/issues/2018-08-22/jira_rest-key_error-2982892-6.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -8634,7 +8631,7 @@ "source": { "type": "git", "url": "https://git.drupal.org/project/xmlsitemap", - "reference": "81343a9d2cd5fe659e1a20679b7da4a9ef5635be" + "reference": "cfd38951fc23cdf62ef38be3dd12d015cf9cf4a7" }, "require": { "drupal/core": "~8.0", @@ -8652,8 +8649,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-alpha3+20-dev", - "datestamp": "1547565780", + "version": "8.x-1.0-alpha3+22-dev", + "datestamp": "1549401180", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -8713,7 +8710,7 @@ "source": "http://cgit.drupalcode.org/xmlsitemap", "issues": "http://drupal.org/project/issues/xmlsitemap" }, - "time": "2019-01-15T15:27:55+00:00" + "time": "2019-02-05T21:24:31+00:00" }, { "name": "drupal/yearonly", @@ -10644,16 +10641,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.5.13", + "version": "6.5.14", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0973426fb012359b2f18d3bd1e90ef1172839693" + "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0973426fb012359b2f18d3bd1e90ef1172839693", - "reference": "0973426fb012359b2f18d3bd1e90ef1172839693", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bac23fe7ff13dbdb461481f706f0e9fe746334b7", + "reference": "bac23fe7ff13dbdb461481f706f0e9fe746334b7", "shasum": "" }, "require": { @@ -10724,7 +10721,7 @@ "testing", "xunit" ], - "time": "2018-09-08T15:10:43+00:00" + "time": "2019-02-01T05:22:47+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -12107,12 +12104,12 @@ "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford_media.git", - "reference": "8621f2ae3b8d4384db52185d98a9e7e05458aeac" + "reference": "5a29a7dd7bae583e717078a2755cc25a81eb84ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford_media/zipball/8621f2ae3b8d4384db52185d98a9e7e05458aeac", - "reference": "8621f2ae3b8d4384db52185d98a9e7e05458aeac", + "url": "https://api.github.com/repos/SU-SWS/stanford_media/zipball/5a29a7dd7bae583e717078a2755cc25a81eb84ba", + "reference": "5a29a7dd7bae583e717078a2755cc25a81eb84ba", "shasum": "" }, "require": { @@ -12142,7 +12139,7 @@ ], "description": "Stanford Media module for Drupal 8 Media management", "homepage": "https://github.com/SU-SWS/stanford_media", - "time": "2019-01-24T17:17:31+00:00" + "time": "2019-02-04T23:15:39+00:00" }, { "name": "su-sws/stanford_ssp", @@ -12239,16 +12236,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "4513348012c25148f8cbc3a7761a1d1e60ca3e87" + "reference": "4459eef5298dedfb69f771186a580062b8516497" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/4513348012c25148f8cbc3a7761a1d1e60ca3e87", - "reference": "4513348012c25148f8cbc3a7761a1d1e60ca3e87", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/4459eef5298dedfb69f771186a580062b8516497", + "reference": "4459eef5298dedfb69f771186a580062b8516497", "shasum": "" }, "require": { @@ -12291,20 +12288,20 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T09:39:14+00:00" }, { "name": "symfony/config", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3" + "reference": "c9bc510c217075d42d4a927e285917d0c2001cf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/17c5d8941eb75a03d19bc76a43757738632d87b3", - "reference": "17c5d8941eb75a03d19bc76a43757738632d87b3", + "url": "https://api.github.com/repos/symfony/config/zipball/c9bc510c217075d42d4a927e285917d0c2001cf4", + "reference": "c9bc510c217075d42d4a927e285917d0c2001cf4", "shasum": "" }, "require": { @@ -12355,20 +12352,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-30T11:33:42+00:00" }, { "name": "symfony/console", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a" + "reference": "069bf3f0e8f871a2169a06e43d9f3f03f355e9be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a700b874d3692bc8342199adfb6d3b99f62cc61a", - "reference": "a700b874d3692bc8342199adfb6d3b99f62cc61a", + "url": "https://api.github.com/repos/symfony/console/zipball/069bf3f0e8f871a2169a06e43d9f3f03f355e9be", + "reference": "069bf3f0e8f871a2169a06e43d9f3f03f355e9be", "shasum": "" }, "require": { @@ -12380,6 +12377,9 @@ "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.3|~4.0", @@ -12389,7 +12389,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -12424,20 +12424,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-01-04T04:42:43+00:00" + "time": "2019-01-25T10:42:12+00:00" }, { "name": "symfony/debug", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186" + "reference": "667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186", - "reference": "26d7f23b9bd0b93bee5583e4d6ca5cb1ab31b186", + "url": "https://api.github.com/repos/symfony/debug/zipball/667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8", + "reference": "667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8", "shasum": "" }, "require": { @@ -12480,20 +12480,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-25T10:19:25+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "928a38b18bd632d67acbca74d0b2eed09915e83e" + "reference": "b514f5b765cf3e4a56e9d8ebacf14b117f7a0ee1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/928a38b18bd632d67acbca74d0b2eed09915e83e", - "reference": "928a38b18bd632d67acbca74d0b2eed09915e83e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b514f5b765cf3e4a56e9d8ebacf14b117f7a0ee1", + "reference": "b514f5b765cf3e4a56e9d8ebacf14b117f7a0ee1", "shasum": "" }, "require": { @@ -12551,20 +12551,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2019-01-05T12:26:58+00:00" + "time": "2019-01-30T17:48:51+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2" + "reference": "ed5be1663fa66623b3a7004d5d51a14c4045399b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2", - "reference": "d1cdd46c53c264a2bd42505bd0e8ce21423bd0e2", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ed5be1663fa66623b3a7004d5d51a14c4045399b", + "reference": "ed5be1663fa66623b3a7004d5d51a14c4045399b", "shasum": "" }, "require": { @@ -12614,20 +12614,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-01-01T18:08:36+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde" + "reference": "b52454ec66fe5082b7a66a491339d1f1da9a5a0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde", - "reference": "c24ce3d18ccc9bb9d7e1d6ce9330fcc6061cafde", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b52454ec66fe5082b7a66a491339d1f1da9a5a0d", + "reference": "b52454ec66fe5082b7a66a491339d1f1da9a5a0d", "shasum": "" }, "require": { @@ -12664,20 +12664,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/finder", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e" + "reference": "7c0c627220308928e958a87c293108e5891cde1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e", - "reference": "3f2a2ab6315dd7682d4c16dcae1e7b95c8b8555e", + "url": "https://api.github.com/repos/symfony/finder/zipball/7c0c627220308928e958a87c293108e5891cde1d", + "reference": "7c0c627220308928e958a87c293108e5891cde1d", "shasum": "" }, "require": { @@ -12713,20 +12713,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T13:43:35+00:00" }, { "name": "symfony/http-foundation", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "2b97319e68816d2120eee7f13f4b76da12e04d03" + "reference": "9a81d2330ea255ded06a69b4f7fb7804836e7a05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/2b97319e68816d2120eee7f13f4b76da12e04d03", - "reference": "2b97319e68816d2120eee7f13f4b76da12e04d03", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9a81d2330ea255ded06a69b4f7fb7804836e7a05", + "reference": "9a81d2330ea255ded06a69b4f7fb7804836e7a05", "shasum": "" }, "require": { @@ -12767,26 +12767,26 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-01-05T08:05:37+00:00" + "time": "2019-01-27T09:04:14+00:00" }, { "name": "symfony/http-kernel", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "60bd9d7444ca436e131c347d78ec039dd99a34b4" + "reference": "dc6bf17684b7120f7bf74fae85c9155506041002" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/60bd9d7444ca436e131c347d78ec039dd99a34b4", - "reference": "60bd9d7444ca436e131c347d78ec039dd99a34b4", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/dc6bf17684b7120f7bf74fae85c9155506041002", + "reference": "dc6bf17684b7120f7bf74fae85c9155506041002", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0|~4.0", + "symfony/debug": "^3.3.3|~4.0", "symfony/event-dispatcher": "~2.8|~3.0|~4.0", "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1", "symfony/polyfill-ctype": "~1.8" @@ -12856,7 +12856,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-01-06T15:53:59+00:00" + "time": "2019-02-03T12:22:50+00:00" }, { "name": "symfony/polyfill-ctype", @@ -13095,16 +13095,16 @@ }, { "name": "symfony/process", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c" + "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c", - "reference": "0d41dd7d95ed179aed6a13393b0f4f97bfa2d25c", + "url": "https://api.github.com/repos/symfony/process/zipball/009f8dda80930e89e8344a4e310b08f9ff07dd2e", + "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e", "shasum": "" }, "require": { @@ -13140,7 +13140,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-01-02T21:24:08+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -13205,16 +13205,16 @@ }, { "name": "symfony/routing", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "445d3629a26930158347a50d1a5f2456c49e0ae6" + "reference": "62f0b8d8cd2cd359c3caa5a9f5253a4a6d480646" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/445d3629a26930158347a50d1a5f2456c49e0ae6", - "reference": "445d3629a26930158347a50d1a5f2456c49e0ae6", + "url": "https://api.github.com/repos/symfony/routing/zipball/62f0b8d8cd2cd359c3caa5a9f5253a4a6d480646", + "reference": "62f0b8d8cd2cd359c3caa5a9f5253a4a6d480646", "shasum": "" }, "require": { @@ -13278,20 +13278,20 @@ "uri", "url" ], - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-29T08:47:12+00:00" }, { "name": "symfony/serializer", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "3bb84f8a785bf30be3d4aef6f3c80f103acc54df" + "reference": "a897373b86489ddecacc665d15ab32983a519907" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/3bb84f8a785bf30be3d4aef6f3c80f103acc54df", - "reference": "3bb84f8a785bf30be3d4aef6f3c80f103acc54df", + "url": "https://api.github.com/repos/symfony/serializer/zipball/a897373b86489ddecacc665d15ab32983a519907", + "reference": "a897373b86489ddecacc665d15ab32983a519907", "shasum": "" }, "require": { @@ -13357,20 +13357,20 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-26T19:55:54+00:00" }, { "name": "symfony/translation", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "5f357063f4907cef47e5cf82fa3187fbfb700456" + "reference": "81cfcd6935cb7505640153576c1f9155b2a179c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/5f357063f4907cef47e5cf82fa3187fbfb700456", - "reference": "5f357063f4907cef47e5cf82fa3187fbfb700456", + "url": "https://api.github.com/repos/symfony/translation/zipball/81cfcd6935cb7505640153576c1f9155b2a179c1", + "reference": "81cfcd6935cb7505640153576c1f9155b2a179c1", "shasum": "" }, "require": { @@ -13425,25 +13425,25 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-25T10:00:44+00:00" }, { "name": "symfony/twig-bridge", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "e45ab510cefacdd878b8a60b115adad7fed2effb" + "reference": "bd0bd5fcfbf4b6be7a72b57f8755bb305172d379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/e45ab510cefacdd878b8a60b115adad7fed2effb", - "reference": "e45ab510cefacdd878b8a60b115adad7fed2effb", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/bd0bd5fcfbf4b6be7a72b57f8755bb305172d379", + "reference": "bd0bd5fcfbf4b6be7a72b57f8755bb305172d379", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "twig/twig": "^1.35|^2.4.4" + "twig/twig": "^1.37.1|^2.6.2" }, "conflict": { "symfony/console": "<3.4", @@ -13455,7 +13455,7 @@ "symfony/dependency-injection": "~2.8|~3.0|~4.0", "symfony/expression-language": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/form": "^3.4.16|^4.1.5", + "symfony/form": "^3.4.22|~4.1.11|^4.2.3", "symfony/http-foundation": "^3.3.11|~4.0", "symfony/http-kernel": "~3.2|~4.0", "symfony/polyfill-intl-icu": "~1.0", @@ -13515,20 +13515,20 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-18T09:39:23+00:00" }, { "name": "symfony/validator", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "cd3fba16d309347883b74bb0ee8cb4720a60554c" + "reference": "06af494d8634df6ad9655ec7d80cb61983253912" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/cd3fba16d309347883b74bb0ee8cb4720a60554c", - "reference": "cd3fba16d309347883b74bb0ee8cb4720a60554c", + "url": "https://api.github.com/repos/symfony/validator/zipball/06af494d8634df6ad9655ec7d80cb61983253912", + "reference": "06af494d8634df6ad9655ec7d80cb61983253912", "shasum": "" }, "require": { @@ -13600,20 +13600,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2019-01-06T14:07:11+00:00" + "time": "2019-01-30T09:03:33+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "a5f39641bb62e8b74e343467b145331273f615a2" + "reference": "2159335b452d929cbb9921fc4eb7d1bfed32d0be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a5f39641bb62e8b74e343467b145331273f615a2", - "reference": "a5f39641bb62e8b74e343467b145331273f615a2", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2159335b452d929cbb9921fc4eb7d1bfed32d0be", + "reference": "2159335b452d929cbb9921fc4eb7d1bfed32d0be", "shasum": "" }, "require": { @@ -13669,20 +13669,20 @@ "debug", "dump" ], - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-29T16:19:17+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea" + "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/554a59a1ccbaac238a89b19c8e551a556fd0e2ea", - "reference": "554a59a1ccbaac238a89b19c8e551a556fd0e2ea", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d", + "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d", "shasum": "" }, "require": { @@ -13728,7 +13728,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T10:59:17+00:00" }, { "name": "theseer/tokenizer", @@ -14361,22 +14361,24 @@ }, { "name": "zendframework/zend-feed", - "version": "2.10.3", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-feed.git", - "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888" + "reference": "5248e9fffa760e5c36092aeff02c3797e4a8a690" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/6641f4cf3f4586c63f83fd70b6d19966025c8888", - "reference": "6641f4cf3f4586c63f83fd70b6d19966025c8888", + "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/5248e9fffa760e5c36092aeff02c3797e4a8a690", + "reference": "5248e9fffa760e5c36092aeff02c3797e4a8a690", "shasum": "" }, "require": { + "ext-dom": "*", + "ext-libxml": "*", "php": "^5.6 || ^7.0", "zendframework/zend-escaper": "^2.5.2", - "zendframework/zend-stdlib": "^2.7.7 || ^3.1" + "zendframework/zend-stdlib": "^3.2.1" }, "require-dev": { "phpunit/phpunit": "^5.7.23 || ^6.4.3", @@ -14399,8 +14401,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.10.x-dev", - "dev-develop": "2.11.x-dev" + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" } }, "autoload": { @@ -14418,7 +14420,7 @@ "feed", "zf" ], - "time": "2018-08-01T13:53:20+00:00" + "time": "2019-01-29T21:37:15+00:00" }, { "name": "zendframework/zend-stdlib", @@ -16772,16 +16774,16 @@ }, { "name": "symfony/browser-kit", - "version": "v4.2.2", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "313512c878805971aebddb5d1707bcf3f4e25df7" + "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/313512c878805971aebddb5d1707bcf3f4e25df7", - "reference": "313512c878805971aebddb5d1707bcf3f4e25df7", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ee4462581eb54bf34b746e4a5d522a4f21620160", + "reference": "ee4462581eb54bf34b746e4a5d522a4f21620160", "shasum": "" }, "require": { @@ -16825,20 +16827,20 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-01-16T21:31:25+00:00" }, { "name": "symfony/cache", - "version": "v4.2.2", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "dd223d4bb9a2f9a4b4992851800b349739c40860" + "reference": "7c5b85bcc5f87dd7938123be12ce3323be6cde5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/dd223d4bb9a2f9a4b4992851800b349739c40860", - "reference": "dd223d4bb9a2f9a4b4992851800b349739c40860", + "url": "https://api.github.com/repos/symfony/cache/zipball/7c5b85bcc5f87dd7938123be12ce3323be6cde5a", + "reference": "7c5b85bcc5f87dd7938123be12ce3323be6cde5a", "shasum": "" }, "require": { @@ -16902,7 +16904,7 @@ "caching", "psr6" ], - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-01-31T15:08:08+00:00" }, { "name": "symfony/contracts", @@ -16974,16 +16976,16 @@ }, { "name": "symfony/css-selector", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d" + "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/12f86295c46c36af9896cf21db6b6b8a1465315d", - "reference": "12f86295c46c36af9896cf21db6b6b8a1465315d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/8ca29297c29b64fb3a1a135e71cb25f67f9fdccf", + "reference": "8ca29297c29b64fb3a1a135e71cb25f67f9fdccf", "shasum": "" }, "require": { @@ -17023,20 +17025,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-01-02T09:30:52+00:00" + "time": "2019-01-16T09:39:14+00:00" }, { "name": "symfony/dom-crawler", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "311f666d85d1075b0a294ba1f3de4ae9307d8180" + "reference": "32cb577c07bd900ee883a9d4b55d4098aa02e422" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/311f666d85d1075b0a294ba1f3de4ae9307d8180", - "reference": "311f666d85d1075b0a294ba1f3de4ae9307d8180", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/32cb577c07bd900ee883a9d4b55d4098aa02e422", + "reference": "32cb577c07bd900ee883a9d4b55d4098aa02e422", "shasum": "" }, "require": { @@ -17080,20 +17082,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/expression-language", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", - "reference": "55d6b84470157129ce30339d266563502af391d2" + "reference": "74631d47774cfa59bfb4a0de18cdf700fb98d658" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/expression-language/zipball/55d6b84470157129ce30339d266563502af391d2", - "reference": "55d6b84470157129ce30339d266563502af391d2", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/74631d47774cfa59bfb4a0de18cdf700fb98d658", + "reference": "74631d47774cfa59bfb4a0de18cdf700fb98d658", "shasum": "" }, "require": { @@ -17130,20 +17132,20 @@ ], "description": "Symfony ExpressionLanguage Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T12:52:19+00:00" }, { "name": "symfony/phpunit-bridge", - "version": "v4.2.2", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "4d53b78ee50da242dffa4eb91ea1f0ee084945c5" + "reference": "4ea7d80a7512ddc41d5af598978edcd395140edc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/4d53b78ee50da242dffa4eb91ea1f0ee084945c5", - "reference": "4d53b78ee50da242dffa4eb91ea1f0ee084945c5", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/4ea7d80a7512ddc41d5af598978edcd395140edc", + "reference": "4ea7d80a7512ddc41d5af598978edcd395140edc", "shasum": "" }, "require": { @@ -17196,20 +17198,20 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2019-01-03T09:07:35+00:00" + "time": "2019-01-24T21:39:51+00:00" }, { "name": "symfony/stopwatch", - "version": "v3.4.21", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "af55d31cb58c5452d2c160655fa1968b872a8084" + "reference": "2a651c2645c10bbedd21170771f122d935e0dd58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/af55d31cb58c5452d2c160655fa1968b872a8084", - "reference": "af55d31cb58c5452d2c160655fa1968b872a8084", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2a651c2645c10bbedd21170771f122d935e0dd58", + "reference": "2a651c2645c10bbedd21170771f122d935e0dd58", "shasum": "" }, "require": { @@ -17245,20 +17247,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2019-01-01T13:45:19+00:00" + "time": "2019-01-16T09:39:14+00:00" }, { "name": "symfony/var-exporter", - "version": "v4.2.2", + "version": "v4.2.3", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "51bd782120fa2bfed89452f142d2a47c4b51101c" + "reference": "d8bf4424c232b55f4c1816037d3077a89258557e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/51bd782120fa2bfed89452f142d2a47c4b51101c", - "reference": "51bd782120fa2bfed89452f142d2a47c4b51101c", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/d8bf4424c232b55f4c1816037d3077a89258557e", + "reference": "d8bf4424c232b55f4c1816037d3077a89258557e", "shasum": "" }, "require": { @@ -17305,7 +17307,7 @@ "instantiate", "serialize" ], - "time": "2019-01-03T09:09:06+00:00" + "time": "2019-01-16T20:35:37+00:00" }, { "name": "textalk/websocket", From 7a18338b3ca2476c653cdf6f2b8097d4b8c56942 Mon Sep 17 00:00:00 2001 From: pookmish Date: Tue, 5 Feb 2019 22:15:36 -0800 Subject: [PATCH 03/25] HSD8-578 Added padding for cards in ECK fields (#166) --- .../css/date-stacked-vertical-card.css | 2 +- .../patterns/molecules/horizontal-card/css/horizontal-card.css | 2 +- .../patterns/molecules/masonry-item/css/masonry-item.css | 2 +- .../patterns/molecules/vertical-card/css/vertical-card.css | 2 +- .../molecules/vertical-link-card/css/vertical-link-card.css | 2 +- .../humsci/su_humsci_theme/scss/utilities/mixins/_card.scss | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css index 4f798d47f4..253c2fc975 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css @@ -1 +1 @@ -.date-stacked-vertical-card .date-stacked-vertical-card__img{position:relative}.date-stacked-vertical-card .date-stacked-vertical-card__img img{width:100%}.date-stacked-vertical-card>*{word-break:break-word}.date-stacked-vertical-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;padding:2.75em 1.75em 1em}.view .date-stacked-vertical-card__content-container{margin:0 0 1.5em}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__time{margin-bottom:5px}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__title h2{font-size:3rem;margin-top:20px}.date-stacked-vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0} +.date-stacked-vertical-card .date-stacked-vertical-card__img{position:relative}.date-stacked-vertical-card .date-stacked-vertical-card__img img{width:100%}.date-stacked-vertical-card>*{word-break:break-word}.date-stacked-vertical-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;padding:2.75em 1.75em 1em}.view .date-stacked-vertical-card__content-container,.field-block .entity-reference .date-stacked-vertical-card__content-container{margin:0 0 1.5em}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__time{margin-bottom:5px}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__title h2{font-size:3rem;margin-top:20px}.date-stacked-vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css index 8975df761c..80fb19d03e 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css @@ -1 +1 @@ -.horizontal-card{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;display:block}.view .horizontal-card{margin:0 0 1.5em}@media screen and (min-width: 600px){.horizontal-card{display:flex}}.horizontal-card .horizontal-card__img{margin:0;flex-shrink:0;width:100%}.horizontal-card .horizontal-card__img img{margin:0 0 .5em;display:block;padding:0;width:100%;height:auto}@media screen and (min-width: 600px){.horizontal-card .horizontal-card__img{margin:0 .75em 0 0;width:10em}.horizontal-card .horizontal-card__img img{margin:0}}.horizontal-card .horizontal-card__content .horizontal-card__category{margin:0 0 .75em;font-size:1.7rem;font-weight:100}.horizontal-card .horizontal-card__content .horizontal-card__date{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .horizontal-card__time{float:left}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .pipe{float:left;padding:0 3px}.horizontal-card .horizontal-card__content .horizontal-card__title{clear:both;font-weight:600;margin:0 0 .35em}.horizontal-card .horizontal-card__content .horizontal-card__speaker{font-weight:100;margin:.25em 0 0}.horizontal-card .horizontal-card__content .horizontal-card__speaker .views-label{display:block;float:left}.horizontal-card .horizontal-card__content .horizontal-card__description{clear:both;margin:0}.horizontal-card .horizontal-card__content .horizontal-card__description>div{margin:0 0 .25em}.horizontal-card .horizontal-card__content>*:last-child>*:last-child{margin-bottom:0}.horizontal-card>*{word-break:break-word} +.horizontal-card{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;display:block}.view .horizontal-card,.field-block .entity-reference .horizontal-card{margin:0 0 1.5em}@media screen and (min-width: 600px){.horizontal-card{display:flex}}.horizontal-card .horizontal-card__img{margin:0;flex-shrink:0;width:100%}.horizontal-card .horizontal-card__img img{margin:0 0 .5em;display:block;padding:0;width:100%;height:auto}@media screen and (min-width: 600px){.horizontal-card .horizontal-card__img{margin:0 .75em 0 0;width:10em}.horizontal-card .horizontal-card__img img{margin:0}}.horizontal-card .horizontal-card__content .horizontal-card__category{margin:0 0 .75em;font-size:1.7rem;font-weight:100}.horizontal-card .horizontal-card__content .horizontal-card__date{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .horizontal-card__time{float:left}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .pipe{float:left;padding:0 3px}.horizontal-card .horizontal-card__content .horizontal-card__title{clear:both;font-weight:600;margin:0 0 .35em}.horizontal-card .horizontal-card__content .horizontal-card__speaker{font-weight:100;margin:.25em 0 0}.horizontal-card .horizontal-card__content .horizontal-card__speaker .views-label{display:block;float:left}.horizontal-card .horizontal-card__content .horizontal-card__description{clear:both;margin:0}.horizontal-card .horizontal-card__content .horizontal-card__description>div{margin:0 0 .25em}.horizontal-card .horizontal-card__content>*:last-child>*:last-child{margin-bottom:0}.horizontal-card>*{word-break:break-word} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css index c6d5cf773b..8d9e8fa53f 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css @@ -1 +1 @@ -.masonry-item .masonry-item--image{width:100%;overflow:hidden}.masonry-item .masonry-item--image img{width:100%;height:auto;display:block}.masonry-item .masonry-item--inner .masonry-item--image img{display:block}.masonry-item .masonry-item--inner .masonry-item--body{overflow:hidden;background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .masonry-item .masonry-item--inner .masonry-item--body{margin:0 0 1.5em}.masonry-item .masonry-item--inner .masonry-item--body p{font-size:1.8rem;line-height:1.3;margin-top:0;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body a{font-size:1.8rem;line-height:1.3}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--type{font-size:1.7rem;font-weight:200;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body h3,.masonry-item .masonry-item--inner .masonry-item--body h3 a{font-size:2.1rem;margin:0 0 .5em}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year{font-weight:200}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year .author{font-weight:400} +.masonry-item .masonry-item--image{width:100%;overflow:hidden}.masonry-item .masonry-item--image img{width:100%;height:auto;display:block}.masonry-item .masonry-item--inner .masonry-item--image img{display:block}.masonry-item .masonry-item--inner .masonry-item--body{overflow:hidden;background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .masonry-item .masonry-item--inner .masonry-item--body,.field-block .entity-reference .masonry-item .masonry-item--inner .masonry-item--body{margin:0 0 1.5em}.masonry-item .masonry-item--inner .masonry-item--body p{font-size:1.8rem;line-height:1.3;margin-top:0;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body a{font-size:1.8rem;line-height:1.3}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--type{font-size:1.7rem;font-weight:200;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body h3,.masonry-item .masonry-item--inner .masonry-item--body h3 a{font-size:2.1rem;margin:0 0 .5em}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year{font-weight:200}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year .author{font-weight:400} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css index 84d1514e6e..d13650bd8b 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css @@ -1 +1 @@ -.vertical-card .vertical-card__img img{width:100%}.vertical-card .vertical-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .vertical-card .vertical-card__content-container{margin:0 0 1.5em}.vertical-card .vertical-card__content-container .vertical-card__title{font-size:3rem;margin-top:0}.vertical-card .vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-card .vertical-card__author-year>div{display:inline-block}.vertical-card .vertical-card__author-year .vertical-card__author-year--author{font-weight:400}.vertical-card .vertical-card__author-year .vertical-card__author-year--year{font-weight:200}.vertical-card .vertical-card__author-year .comma{margin-left:-3px}.vertical-card>*{word-break:break-word} +.vertical-card .vertical-card__img img{width:100%}.vertical-card .vertical-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .vertical-card .vertical-card__content-container,.field-block .entity-reference .vertical-card .vertical-card__content-container{margin:0 0 1.5em}.vertical-card .vertical-card__content-container .vertical-card__title{font-size:3rem;margin-top:0}.vertical-card .vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-card .vertical-card__author-year>div{display:inline-block}.vertical-card .vertical-card__author-year .vertical-card__author-year--author{font-weight:400}.vertical-card .vertical-card__author-year .vertical-card__author-year--year{font-weight:200}.vertical-card .vertical-card__author-year .comma{margin-left:-3px}.vertical-card>*{word-break:break-word} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css index 8161d29e4e..38938e0c6f 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css @@ -1 +1 @@ -.vertical-link-card{height:100%}.vertical-link-card>a{display:table;height:100%;text-decoration:none;width:100%}.vertical-link-card>a:hover,.vertical-link-card>a:focus{color:#fff;text-decoration:underline}.vertical-link-card .vertical-link-card__img{display:table-row;height:1px}.vertical-link-card .vertical-link-card__img .field-hs-postcard-image{overflow:hidden}.vertical-link-card .vertical-link-card__img img{width:100%}.vertical-link-card .vertical-link-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;background:#b1040e;color:#fff;display:table-row;padding:0}.view .vertical-link-card .vertical-link-card__content-container{margin:0 0 1.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__title{margin-top:0;padding-top:.5em;padding-right:.5em;padding-left:.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__description{padding-right:.75em;padding-bottom:.75em;padding-left:.75em}.vertical-link-card .vertical-link-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-link-card>*{word-break:break-word} +.vertical-link-card{height:100%}.vertical-link-card>a{display:table;height:100%;text-decoration:none;width:100%}.vertical-link-card>a:hover,.vertical-link-card>a:focus{color:#fff;text-decoration:underline}.vertical-link-card .vertical-link-card__img{display:table-row;height:1px}.vertical-link-card .vertical-link-card__img .field-hs-postcard-image{overflow:hidden}.vertical-link-card .vertical-link-card__img img{width:100%}.vertical-link-card .vertical-link-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;background:#b1040e;color:#fff;display:table-row;padding:0}.view .vertical-link-card .vertical-link-card__content-container,.field-block .entity-reference .vertical-link-card .vertical-link-card__content-container{margin:0 0 1.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__title{margin-top:0;padding-top:.5em;padding-right:.5em;padding-left:.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__description{padding-right:.75em;padding-bottom:.75em;padding-left:.75em}.vertical-link-card .vertical-link-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-link-card>*{word-break:break-word} diff --git a/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss b/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss index 21c481bfb0..3142e8548e 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss @@ -12,7 +12,8 @@ @include padding(0.75em); - .view & { + .view &, + .field-block .entity-reference & { @include margin(0 0 1.5em); } } From 03f28328e3ff611836611d8dba1f5d6cc99be668 Mon Sep 17 00:00:00 2001 From: pookmish Date: Wed, 6 Feb 2019 16:44:56 -0800 Subject: [PATCH 04/25] HSD8-536 Accordion pattern and paragraph type (#162) * HSD8-536 Accordion pattern and paragraph type * increased summary length --- ...display.paragraph.hs_accordion.default.yml | 53 ++++++++++++++ ...display.paragraph.hs_accordion.default.yml | 70 +++++++++++++++++++ ...cordion.field_hs_accordion_description.yml | 28 ++++++++ ....hs_accordion.field_hs_accordion_image.yml | 28 ++++++++ ...s_accordion.field_hs_accordion_summary.yml | 19 +++++ ...ragraph.field_hs_accordion_description.yml | 19 +++++ ...age.paragraph.field_hs_accordion_image.yml | 20 ++++++ ...e.paragraph.field_hs_accordion_summary.yml | 21 ++++++ ...aragraphs.paragraphs_type.hs_accordion.yml | 9 +++ .../molecules/accordion/accordion.html.twig | 22 ++++++ .../accordion/accordion.ui_patterns.yml | 30 ++++++++ .../molecules/accordion/css/accordion.css | 1 + .../molecules/accordion/scss/accordion.scss | 51 ++++++++++++++ .../su_humsci_theme/su_humsci_theme.theme | 16 +++++ 14 files changed, 387 insertions(+) create mode 100644 config/default/core.entity_form_display.paragraph.hs_accordion.default.yml create mode 100644 config/default/core.entity_view_display.paragraph.hs_accordion.default.yml create mode 100644 config/default/field.field.paragraph.hs_accordion.field_hs_accordion_description.yml create mode 100644 config/default/field.field.paragraph.hs_accordion.field_hs_accordion_image.yml create mode 100644 config/default/field.field.paragraph.hs_accordion.field_hs_accordion_summary.yml create mode 100644 config/default/field.storage.paragraph.field_hs_accordion_description.yml create mode 100644 config/default/field.storage.paragraph.field_hs_accordion_image.yml create mode 100644 config/default/field.storage.paragraph.field_hs_accordion_summary.yml create mode 100644 config/default/paragraphs.paragraphs_type.hs_accordion.yml create mode 100644 docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.html.twig create mode 100644 docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.ui_patterns.yml create mode 100644 docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/css/accordion.css create mode 100644 docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/scss/accordion.scss diff --git a/config/default/core.entity_form_display.paragraph.hs_accordion.default.yml b/config/default/core.entity_form_display.paragraph.hs_accordion.default.yml new file mode 100644 index 0000000000..6b302e0b78 --- /dev/null +++ b/config/default/core.entity_form_display.paragraph.hs_accordion.default.yml @@ -0,0 +1,53 @@ +uuid: e5e7c79a-1dd9-47d3-a6c1-4a9764b599c6 +langcode: en +status: true +dependencies: + config: + - entity_browser.browser.image_browser + - field.field.paragraph.hs_accordion.field_hs_accordion_description + - field.field.paragraph.hs_accordion.field_hs_accordion_image + - field.field.paragraph.hs_accordion.field_hs_accordion_summary + - paragraphs.paragraphs_type.hs_accordion + module: + - entity_browser + - text +id: paragraph.hs_accordion.default +targetEntityType: paragraph +bundle: hs_accordion +mode: default +content: + field_hs_accordion_description: + weight: 2 + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + type: text_textarea + region: content + field_hs_accordion_image: + weight: 1 + settings: + entity_browser: image_browser + field_widget_display: rendered_entity + field_widget_edit: true + field_widget_remove: true + open: true + selection_mode: selection_append + field_widget_display_settings: + view_mode: default + field_widget_replace: false + third_party_settings: { } + type: entity_browser_entity_reference + region: content + field_hs_accordion_summary: + weight: 0 + settings: + size: 60 + placeholder: '' + third_party_settings: { } + type: string_textfield + region: content +hidden: + created: true + status: true + uid: true diff --git a/config/default/core.entity_view_display.paragraph.hs_accordion.default.yml b/config/default/core.entity_view_display.paragraph.hs_accordion.default.yml new file mode 100644 index 0000000000..3118d74bb0 --- /dev/null +++ b/config/default/core.entity_view_display.paragraph.hs_accordion.default.yml @@ -0,0 +1,70 @@ +uuid: b2af9c5f-d6b0-4a88-be32-cbb235d1c200 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.hs_accordion.field_hs_accordion_description + - field.field.paragraph.hs_accordion.field_hs_accordion_image + - field.field.paragraph.hs_accordion.field_hs_accordion_summary + - paragraphs.paragraphs_type.hs_accordion + module: + - ds + - field_formatter_class + - hs_field_helpers + - layout_builder + - stanford_media + - text +third_party_settings: + layout_builder: + sections: { } + ds: + layout: + id: pattern_accordion + library: null + disable_css: false + entity_classes: all_classes + settings: + pattern: + field_templates: default + variant: closed + regions: + title: + - field_hs_accordion_summary + description: + - field_hs_accordion_image + - field_hs_accordion_description +id: paragraph.hs_accordion.default +targetEntityType: paragraph +bundle: hs_accordion +mode: default +content: + field_hs_accordion_description: + type: text_default + weight: 2 + region: description + label: hidden + settings: { } + third_party_settings: { } + field_hs_accordion_image: + type: media_image_formatter + weight: 1 + region: description + label: hidden + settings: + view_mode: default + image_style: '' + link: 0 + third_party_settings: + field_formatter_class: + class: decanter-width-one-fourth + hs_field_helpers: + inline_contents: 0 + field_hs_accordion_summary: + weight: 0 + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + type: string + region: title +hidden: { } diff --git a/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_description.yml b/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_description.yml new file mode 100644 index 0000000000..c7595c47e3 --- /dev/null +++ b/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_description.yml @@ -0,0 +1,28 @@ +uuid: d2efa342-5884-4298-9834-fc44b31e22ab +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hs_accordion_description + - paragraphs.paragraphs_type.hs_accordion + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + basic_html: '0' + full_html: '0' + minimal_html: '0' + plain_text: '0' +id: paragraph.hs_accordion.field_hs_accordion_description +field_name: field_hs_accordion_description +entity_type: paragraph +bundle: hs_accordion +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_image.yml b/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_image.yml new file mode 100644 index 0000000000..70f93b0bc7 --- /dev/null +++ b/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_image.yml @@ -0,0 +1,28 @@ +uuid: 83d4fac8-c15b-4d9a-94f3-7667b4f10550 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hs_accordion_image + - media.type.image + - paragraphs.paragraphs_type.hs_accordion +id: paragraph.hs_accordion.field_hs_accordion_image +field_name: field_hs_accordion_image +entity_type: paragraph +bundle: hs_accordion +label: Image +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:media' + handler_settings: + target_bundles: + image: image + sort: + field: _none + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_summary.yml b/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_summary.yml new file mode 100644 index 0000000000..7a208c8065 --- /dev/null +++ b/config/default/field.field.paragraph.hs_accordion.field_hs_accordion_summary.yml @@ -0,0 +1,19 @@ +uuid: 9f6934d1-6db7-4c42-a533-bdbc8254f624 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_hs_accordion_summary + - paragraphs.paragraphs_type.hs_accordion +id: paragraph.hs_accordion.field_hs_accordion_summary +field_name: field_hs_accordion_summary +entity_type: paragraph +bundle: hs_accordion +label: Summary +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/default/field.storage.paragraph.field_hs_accordion_description.yml b/config/default/field.storage.paragraph.field_hs_accordion_description.yml new file mode 100644 index 0000000000..3ebaf763a7 --- /dev/null +++ b/config/default/field.storage.paragraph.field_hs_accordion_description.yml @@ -0,0 +1,19 @@ +uuid: 952bf395-5f3b-45d4-8e53-79577cc864f2 +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +id: paragraph.field_hs_accordion_description +field_name: field_hs_accordion_description +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/default/field.storage.paragraph.field_hs_accordion_image.yml b/config/default/field.storage.paragraph.field_hs_accordion_image.yml new file mode 100644 index 0000000000..bc1201ec6d --- /dev/null +++ b/config/default/field.storage.paragraph.field_hs_accordion_image.yml @@ -0,0 +1,20 @@ +uuid: 596022e2-6847-4136-a4d9-30c6110e4a0a +langcode: en +status: true +dependencies: + module: + - media + - paragraphs +id: paragraph.field_hs_accordion_image +field_name: field_hs_accordion_image +entity_type: paragraph +type: entity_reference +settings: + target_type: media +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/default/field.storage.paragraph.field_hs_accordion_summary.yml b/config/default/field.storage.paragraph.field_hs_accordion_summary.yml new file mode 100644 index 0000000000..456a776b60 --- /dev/null +++ b/config/default/field.storage.paragraph.field_hs_accordion_summary.yml @@ -0,0 +1,21 @@ +uuid: cc755f4b-258b-4cee-b70c-7412eaf24040 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_hs_accordion_summary +field_name: field_hs_accordion_summary +entity_type: paragraph +type: string +settings: + max_length: 1000 + is_ascii: false + case_sensitive: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/default/paragraphs.paragraphs_type.hs_accordion.yml b/config/default/paragraphs.paragraphs_type.hs_accordion.yml new file mode 100644 index 0000000000..ffb607a6d9 --- /dev/null +++ b/config/default/paragraphs.paragraphs_type.hs_accordion.yml @@ -0,0 +1,9 @@ +uuid: eaf8a56b-4f9f-49f1-91f5-b47411527805 +langcode: en +status: true +dependencies: { } +id: hs_accordion +label: Accordion +icon_uuid: null +description: '' +behavior_plugins: { } diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.html.twig b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.html.twig new file mode 100644 index 0000000000..d65c48c5f9 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.html.twig @@ -0,0 +1,22 @@ +{% if variant == 'open' %} + {% set attributes = attributes.setAttribute('open', 'open') %} +{% endif %} + + + {%- if title -%} + {{ title }} + {%- endif -%} +
+
+ {{ description }} +
+ + {%- if children -%} +
+ {{ children }} +
+ {%- endif -%} + + {{ value }} +
+ diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.ui_patterns.yml b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.ui_patterns.yml new file mode 100644 index 0000000000..95c67fb009 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/accordion.ui_patterns.yml @@ -0,0 +1,30 @@ +accordion: + label: "Accordion" + fields: + title: + label: "Title" + type: text + preview: "Summary Text" + description: + label: "Description" + type: text + preview: "Cras ultricies mi eu turpis hendrerit fringilla. Curabitur at lacus ac velit ornare lobortis. Duis lobortis massa imperdiet quam. Etiam sit amet orci eget eros faucibus tincidunt. Vivamus in erat ut urna cursus vestibulum." + children: + label: "Children" + type: text + preview: "Cras ultricies mi eu turpis hendrerit fringilla. Curabitur at lacus ac velit ornare lobortis. Duis lobortis massa imperdiet quam. Etiam sit amet orci eget eros faucibus tincidunt. Vivamus in erat ut urna cursus vestibulum." + variants: + closed: + label: Normally Closed + description: Closed accordion on page load. + open: + label: Normally Open + description: Open accordion on page load. + libraries: + - accordion: + css: + component: + css/accordion.css: {} + dependencies: + - core/drupal.collapse + use: "@su_humsci_theme/molecules/accordion/accordion.html.twig" diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/css/accordion.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/css/accordion.css new file mode 100644 index 0000000000..38791934c4 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/css/accordion.css @@ -0,0 +1 @@ +details[open] summary{border-bottom:1px solid #ccc}details[open] .revealed-details{display:inline-block}details summary{display:inline-block;width:calc(100% - 20px)}details summary>*{display:inline-block}details .revealed-details{width:calc(100% - 40px);padding:10px 20px;animation:bounceInUp .5s ease both;display:none}@-webkit-keyframes bounceInUp{0%{opacity:0;-webkit-transform:translateY(-50px)}100%{-webkit-transform:translateY(0)}}@keyframes bounceInUp{0%{opacity:0;transform:translateY(-50px)}100%{transform:translateY(0)}} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/scss/accordion.scss b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/scss/accordion.scss new file mode 100644 index 0000000000..ea71a3ea14 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/accordion/scss/accordion.scss @@ -0,0 +1,51 @@ +@charset "UTF-8"; + +details { + &[open] { + summary { + border-bottom: 1px solid #ccc; + } + + .revealed-details { + display: inline-block; + } + } + + summary { + display: inline-block; + width: calc(100% - 20px); + + > * { + display: inline-block; + } + } + + .revealed-details { + width: calc(100% - 40px); + padding: 10px 20px; + animation: bounceInUp .5s ease both; + display: none; + } +} + +@-webkit-keyframes bounceInUp { + 0% { + opacity: 0; + -webkit-transform: translateY(-50px); + } + + 100% { + -webkit-transform: translateY(0); + } +} + +@keyframes bounceInUp { + 0% { + opacity: 0; + transform: translateY(-50px); + } + + 100% { + transform: translateY(0); + } +} diff --git a/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.theme b/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.theme index a8939132cd..6c9019b6ec 100755 --- a/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.theme +++ b/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.theme @@ -9,6 +9,22 @@ use Drupal\views\Plugin\views\field\EntityField; use Drupal\Component\Utility\Html; use Drupal\node\Entity\Node; use Drupal\Component\Utility\SortArray; +use Drupal\Core\Template\Attribute; + +/** + * Implements hook_preprocess_HOOK(). + */ +function su_humsci_theme_preprocess_pattern_accordion(&$variables) { + $id = Html::getUniqueId('accordion'); + $summary_attributes = [ + 'role' => 'button', + 'aria-controls' => $id, + 'aria-expanded' => $variables['variant'] == 'open' ? 'true' : 'false', + 'aria-pressed' => 'false', + ]; + $variables['summary_attributes'] = new Attribute($summary_attributes); + $variables['attributes']->setAttribute('id', $id); +} /** * Implements hook_preprocess_patterns_overview_page(). From d959e92080da4c386f08d78d61bdbb6f43d2701e Mon Sep 17 00:00:00 2001 From: pookmish Date: Wed, 6 Feb 2019 17:40:10 -0800 Subject: [PATCH 05/25] =?UTF-8?q?HSD8-355=20Change=20config=20ignore=20to?= =?UTF-8?q?=20only=20ignore=20some=20parts=20of=20google=20ana=E2=80=A6=20?= =?UTF-8?q?(#163)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * HSD8-355 Change config ignore to only ignore some parts of google analtyics * allow for quicker local tests of prod --- composer.json | 4 +-- composer.lock | 26 ++++++++----------- config/default/config_ignore.settings.yml | 7 ++++- .../envs/prod/google_analytics.settings.yml | 9 ++++--- docroot/sites/settings/common.settings.php | 2 +- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/composer.json b/composer.json index b0db5141f0..b7a6b6170b 100644 --- a/composer.json +++ b/composer.json @@ -118,7 +118,7 @@ "drupal/color_field": "~2.0-rc2", "drupal/components": "~1.0", "drupal/conditional_fields": "^1.0@alpha", - "drupal/config_ignore": "^2.1", + "drupal/config_ignore": "dev-2.x#2b1740411fd1eb8bb139711be5e10535c40ddbbf", "drupal/config_import_de": "^1.0@alpha", "drupal/config_installer": "^1.8", "drupal/config_readonly": "dev-1.x", @@ -275,7 +275,7 @@ "Simplify Field Samples": "patches/contrib/core-simplify-samples.patch" }, "drupal/config_ignore": { - "https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2018-04-19/support-for-export-2857247-18.patch" + "https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2018-10-14/support-for-export-2857247-24.patch" }, "drupal/menu_block": { "https://www.drupal.org/project/menu_block/issues/2809699": "https://www.drupal.org/files/issues/2018-05-07/menu_block-label_configuration-2809699-77.patch" diff --git a/composer.lock b/composer.lock index 08aee83538..50e8697908 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "21d2335216e0f9c95080c034ac4c4662", + "content-hash": "ede092a7d7b9c7e6ad9925cfe9734a63", "packages": [ { "name": "acquia/blt", @@ -3437,17 +3437,11 @@ }, { "name": "drupal/config_ignore", - "version": "2.1.0", + "version": "dev-2.x", "source": { "type": "git", "url": "https://git.drupal.org/project/config_ignore", - "reference": "8.x-2.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-2.1.zip", - "reference": "8.x-2.1", - "shasum": "07e00684930706632b3f2fc2a7433ffdae57cde7" + "reference": "2b1740411fd1eb8bb139711be5e10535c40ddbbf" }, "require": { "drupal/config_filter": "1.*", @@ -3459,15 +3453,15 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.1", - "datestamp": "1507706044", + "version": "8.x-2.1+4-dev", + "datestamp": "1537966380", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." } }, "patches_applied": { - "https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2018-04-19/support-for-export-2857247-18.patch" + "https://www.drupal.org/project/config_ignore/issues/2857247": "https://www.drupal.org/files/issues/2018-10-14/support-for-export-2857247-24.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -3493,7 +3487,8 @@ "source": "http://cgit.drupalcode.org/config_ignore", "issues": "http://drupal.org/project/config_ignore", "irc": "irc://irc.freenode.org/drupal-contribute" - } + }, + "time": "2018-09-26T16:48:09+00:00" }, { "name": "drupal/config_import_de", @@ -17361,6 +17356,7 @@ "drupal/block_field": 15, "drupal/bricks": 20, "drupal/conditional_fields": 15, + "drupal/config_ignore": 20, "drupal/config_import_de": 15, "drupal/config_readonly": 20, "drupal/config_update": 20, diff --git a/config/default/config_ignore.settings.yml b/config/default/config_ignore.settings.yml index e1ad4975c9..a4296fd627 100644 --- a/config/default/config_ignore.settings.yml +++ b/config/default/config_ignore.settings.yml @@ -2,7 +2,6 @@ ignored_config_entities: - 'core.entity_view_display.node.hs_*.default' - 'core.entity_form_display.node.hs_*' - 'menu_position.menu_position_rule.*' - - google_analytics.settings - 'user.role.*:permissions' - 'config_split.config_split.not_live:status' - 'views.view.hs_*:status' @@ -18,5 +17,11 @@ ignored_config_entities: - 'domain_301_redirect.settings:enabled' - 'domain_301_redirect.settings:domain' - 'simplesamlphp_auth.settings:role.population' + - 'google_analytics.settings:account' + - 'google_analytics.settings:premium' + - 'google_analytics.settings:domain_mode' + - 'google_analytics.settings:cross_domains' + - 'google_analytics.settings:visibility' + - 'google_analytics.settings:track' _core: default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk diff --git a/config/envs/prod/google_analytics.settings.yml b/config/envs/prod/google_analytics.settings.yml index 615cb36032..c3bc83b3f7 100644 --- a/config/envs/prod/google_analytics.settings.yml +++ b/config/envs/prod/google_analytics.settings.yml @@ -4,9 +4,12 @@ domain_mode: 0 cross_domains: '' visibility: request_path_mode: 0 - request_path_pages: "/admin\n/admin/*\n/batch\n/node/add*\n/node/*/*\n/user/*/*" - user_role_mode: 0 - user_role_roles: { } + request_path_pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*" + user_role_mode: 1 + user_role_roles: + administrator: administrator + contributor: contributor + site_manager: site_manager user_account_mode: 0 track: outbound: true diff --git a/docroot/sites/settings/common.settings.php b/docroot/sites/settings/common.settings.php index f95c06003d..5db4d3cf8c 100644 --- a/docroot/sites/settings/common.settings.php +++ b/docroot/sites/settings/common.settings.php @@ -102,7 +102,7 @@ } // Set the config_ignore settings so that config imports will function on local. -if ($is_local_env) { +if ($is_local_env || (isset($split) && $split == 'local')) { $config_ignore = Yaml::decode(file_get_contents(DRUPAL_ROOT . '/../config/envs/local/config_ignore.settings.yml')); $config['config_ignore.settings']['ignored_config_entities'] = $config_ignore['ignored_config_entities']; } From 662d096d4e62be4a045cf268b75afe22acb0a494 Mon Sep 17 00:00:00 2001 From: pookmish Date: Thu, 7 Feb 2019 15:56:54 -0800 Subject: [PATCH 06/25] HSD8-579 Use ultimate cron to break up migration importers (#169) --- composer.json | 3 +- composer.lock | 66 ++++++++++++++++++- config/default/core.extension.yml | 1 + .../default/ultimate_cron.job.dblog_cron.yml | 17 +++++ .../default/ultimate_cron.job.field_cron.yml | 17 +++++ .../default/ultimate_cron.job.file_cron.yml | 17 +++++ ...ltimate_cron.job.google_analytics_cron.yml | 17 +++++ .../ultimate_cron.job.honeypot_cron.yml | 17 +++++ ...ltimate_cron.job.hs_field_helpers_cron.yml | 17 +++++ .../ultimate_cron.job.hs_migrate_hs_capx.yml | 17 +++++ ...ltimate_cron.job.hs_migrate_hs_courses.yml | 17 +++++ ...ultimate_cron.job.hs_migrate_hs_events.yml | 17 +++++ ...mate_cron.job.hs_revision_cleanup_cron.yml | 17 +++++ .../ultimate_cron.job.layout_builder_cron.yml | 17 +++++ .../default/ultimate_cron.job.node_cron.yml | 17 +++++ .../ultimate_cron.job.redirect_404_cron.yml | 17 +++++ .../default/ultimate_cron.job.rules_cron.yml | 17 +++++ .../ultimate_cron.job.search_api_cron.yml | 17 +++++ .../default/ultimate_cron.job.system_cron.yml | 17 +++++ .../ultimate_cron.job.ultimate_cron_cron.yml | 15 +++++ .../default/ultimate_cron.job.update_cron.yml | 17 +++++ .../ultimate_cron.job.webform_cron.yml | 17 +++++ .../ultimate_cron.job.xmlsitemap_cron.yml | 17 +++++ config/default/ultimate_cron.settings.yml | 35 ++++++++++ .../ultimate_cron.job.hs_migrate_hs_capx.yml | 16 +++++ ...ltimate_cron.job.hs_migrate_hs_courses.yml | 16 +++++ ...ultimate_cron.job.hs_migrate_hs_events.yml | 16 +++++ .../humsci/hs_migrate/hs_migrate.info.yml | 1 + .../humsci/hs_migrate/hs_migrate.install | 13 ++++ .../humsci/hs_migrate/hs_migrate.module | 33 ++++++++-- 30 files changed, 531 insertions(+), 7 deletions(-) create mode 100644 config/default/ultimate_cron.job.dblog_cron.yml create mode 100644 config/default/ultimate_cron.job.field_cron.yml create mode 100644 config/default/ultimate_cron.job.file_cron.yml create mode 100644 config/default/ultimate_cron.job.google_analytics_cron.yml create mode 100644 config/default/ultimate_cron.job.honeypot_cron.yml create mode 100644 config/default/ultimate_cron.job.hs_field_helpers_cron.yml create mode 100644 config/default/ultimate_cron.job.hs_migrate_hs_capx.yml create mode 100644 config/default/ultimate_cron.job.hs_migrate_hs_courses.yml create mode 100644 config/default/ultimate_cron.job.hs_migrate_hs_events.yml create mode 100644 config/default/ultimate_cron.job.hs_revision_cleanup_cron.yml create mode 100644 config/default/ultimate_cron.job.layout_builder_cron.yml create mode 100644 config/default/ultimate_cron.job.node_cron.yml create mode 100644 config/default/ultimate_cron.job.redirect_404_cron.yml create mode 100644 config/default/ultimate_cron.job.rules_cron.yml create mode 100644 config/default/ultimate_cron.job.search_api_cron.yml create mode 100644 config/default/ultimate_cron.job.system_cron.yml create mode 100644 config/default/ultimate_cron.job.ultimate_cron_cron.yml create mode 100644 config/default/ultimate_cron.job.update_cron.yml create mode 100644 config/default/ultimate_cron.job.webform_cron.yml create mode 100644 config/default/ultimate_cron.job.xmlsitemap_cron.yml create mode 100644 config/default/ultimate_cron.settings.yml create mode 100644 docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_capx.yml create mode 100644 docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_courses.yml create mode 100644 docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_events.yml create mode 100644 docroot/modules/humsci/hs_migrate/hs_migrate.install diff --git a/composer.json b/composer.json index 223fc0df29..2c9f07e583 100644 --- a/composer.json +++ b/composer.json @@ -92,8 +92,8 @@ "require": { "acquia/blt": "9.x-dev", "beleneglorion/php-bugherd-api": "dev-master#f0fce97042bd05bc5560fbf37051cd74f802cea1", - "ckeditor-plugin/link": "4.10.1", "ckeditor-plugin/fakeobjects": "4.10.1", + "ckeditor-plugin/link": "4.10.1", "composer/installers": "^1.4", "consolidation/robo": "~1.2.4", "consolidation/site-alias": "1.1.5", @@ -178,6 +178,7 @@ "drupal/smart_trim": "^1.1", "drupal/taxonomy_menu_ui": "^1.0@beta", "drupal/ui_patterns": "~1.0@RC", + "drupal/ultimate_cron": "^2.0@alpha", "drupal/video_embed_field": "~2.0-alpha1", "drupal/viewfield": "^3.0@alpha", "drupal/views_block_filter_block": "^1.0@beta", diff --git a/composer.lock b/composer.lock index 3aadf7bd0e..f051a13ad5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "561378eb91be31c6fc9f2619d0b8d157", + "content-hash": "ccf7bab6f41a35bac816aba9a38453cc", "packages": [ { "name": "acquia/blt", @@ -8244,6 +8244,69 @@ "source": "http://cgit.drupalcode.org/ui_patterns" } }, + { + "name": "drupal/ultimate_cron", + "version": "2.0.0-alpha4", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/ultimate_cron", + "reference": "8.x-2.0-alpha4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/ultimate_cron-8.x-2.0-alpha4.zip", + "reference": "8.x-2.0-alpha4", + "shasum": "50cdadd061f1f6fadb961b04ed04348bcc4719d3" + }, + "require": { + "drupal/core": "~8.0" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, + "drupal": { + "version": "8.x-2.0-alpha4", + "datestamp": "1527925385", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Berdir", + "homepage": "https://www.drupal.org/user/214652" + }, + { + "name": "Dane Powell", + "homepage": "https://www.drupal.org/user/339326" + }, + { + "name": "arnested", + "homepage": "https://www.drupal.org/user/245635" + }, + { + "name": "gielfeldt", + "homepage": "https://www.drupal.org/user/366993" + }, + { + "name": "miro_dietiker", + "homepage": "https://www.drupal.org/user/227761" + } + ], + "description": "Cron", + "homepage": "https://www.drupal.org/project/ultimate_cron", + "support": { + "source": "http://cgit.drupalcode.org/ultimate_cron" + } + }, { "name": "drupal/video_embed_field", "version": "2.0.0", @@ -17388,6 +17451,7 @@ "drupal/slick_paragraphs": 5, "drupal/taxonomy_menu_ui": 10, "drupal/ui_patterns": 5, + "drupal/ultimate_cron": 15, "drupal/viewfield": 15, "drupal/views_block_filter_block": 10, "drupal/views_taxonomy_term_name_depth": 20, diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 44303e2efa..728588f2bd 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -166,6 +166,7 @@ module: ui_patterns_layouts: 0 ui_patterns_library: 0 ui_patterns_views: 0 + ultimate_cron: 0 update: 0 user: 0 video_embed_field: 0 diff --git a/config/default/ultimate_cron.job.dblog_cron.yml b/config/default/ultimate_cron.job.dblog_cron.yml new file mode 100644 index 0000000000..b47190a1af --- /dev/null +++ b/config/default/ultimate_cron.job.dblog_cron.yml @@ -0,0 +1,17 @@ +uuid: ec081abb-2272-4ee1-afbb-1359f4daaf53 +langcode: en +status: true +dependencies: + module: + - dblog +title: 'Remove expired log messages and flood control events' +id: dblog_cron +weight: 0 +module: dblog +callback: dblog_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.field_cron.yml b/config/default/ultimate_cron.job.field_cron.yml new file mode 100644 index 0000000000..6525aeac2c --- /dev/null +++ b/config/default/ultimate_cron.job.field_cron.yml @@ -0,0 +1,17 @@ +uuid: 70976473-705d-4bf7-ac80-bc7fbcae78ee +langcode: en +status: true +dependencies: + module: + - field +title: 'Purges deleted Field API data' +id: field_cron +weight: 0 +module: field +callback: field_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.file_cron.yml b/config/default/ultimate_cron.job.file_cron.yml new file mode 100644 index 0000000000..a83d6f2f80 --- /dev/null +++ b/config/default/ultimate_cron.job.file_cron.yml @@ -0,0 +1,17 @@ +uuid: 40cd3a12-e3bc-461e-9581-8192e3c157a4 +langcode: en +status: true +dependencies: + module: + - file +title: 'Deletes temporary files' +id: file_cron +weight: 0 +module: file +callback: file_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.google_analytics_cron.yml b/config/default/ultimate_cron.job.google_analytics_cron.yml new file mode 100644 index 0000000000..09dbfda1d3 --- /dev/null +++ b/config/default/ultimate_cron.job.google_analytics_cron.yml @@ -0,0 +1,17 @@ +uuid: c9688959-b1d1-4c2e-8505-a07484671575 +langcode: en +status: true +dependencies: + module: + - google_analytics +title: 'Default cron handler' +id: google_analytics_cron +weight: 0 +module: google_analytics +callback: google_analytics_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.honeypot_cron.yml b/config/default/ultimate_cron.job.honeypot_cron.yml new file mode 100644 index 0000000000..135bd8300e --- /dev/null +++ b/config/default/ultimate_cron.job.honeypot_cron.yml @@ -0,0 +1,17 @@ +uuid: 0eb0926a-3423-4e67-ac29-7fe14e1c49d3 +langcode: en +status: true +dependencies: + module: + - honeypot +title: 'Default cron handler' +id: honeypot_cron +weight: 0 +module: honeypot +callback: honeypot_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.hs_field_helpers_cron.yml b/config/default/ultimate_cron.job.hs_field_helpers_cron.yml new file mode 100644 index 0000000000..ee83a9aa2f --- /dev/null +++ b/config/default/ultimate_cron.job.hs_field_helpers_cron.yml @@ -0,0 +1,17 @@ +uuid: 052b8dc6-94fa-4c31-874e-7e27833020c8 +langcode: en +status: true +dependencies: + module: + - hs_field_helpers +title: 'Default cron handler' +id: hs_field_helpers_cron +weight: 0 +module: hs_field_helpers +callback: hs_field_helpers_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.hs_migrate_hs_capx.yml b/config/default/ultimate_cron.job.hs_migrate_hs_capx.yml new file mode 100644 index 0000000000..5900d5e218 --- /dev/null +++ b/config/default/ultimate_cron.job.hs_migrate_hs_capx.yml @@ -0,0 +1,17 @@ +uuid: 2bec8c07-e511-42e0-9ebf-22c2ade0d769 +langcode: en +status: true +dependencies: + module: + - hs_migrate +title: 'CAPx Migration' +id: hs_migrate_hs_capx +weight: 0 +module: hs_migrate +callback: hs_migrate_ultimate_cron_task +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.hs_migrate_hs_courses.yml b/config/default/ultimate_cron.job.hs_migrate_hs_courses.yml new file mode 100644 index 0000000000..963f5d5899 --- /dev/null +++ b/config/default/ultimate_cron.job.hs_migrate_hs_courses.yml @@ -0,0 +1,17 @@ +uuid: 7fd9d5c1-f1b2-4a5c-a60b-56ae18aee061 +langcode: en +status: true +dependencies: + module: + - hs_migrate +title: 'Courses Migration' +id: hs_migrate_hs_courses +weight: 0 +module: hs_migrate +callback: hs_migrate_ultimate_cron_task +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.hs_migrate_hs_events.yml b/config/default/ultimate_cron.job.hs_migrate_hs_events.yml new file mode 100644 index 0000000000..c1dfa0f347 --- /dev/null +++ b/config/default/ultimate_cron.job.hs_migrate_hs_events.yml @@ -0,0 +1,17 @@ +uuid: dd98bf44-60c5-4034-969d-090598927c59 +langcode: en +status: true +dependencies: + module: + - hs_migrate +title: 'Events Migration' +id: hs_migrate_hs_events +weight: 0 +module: hs_migrate +callback: hs_migrate_ultimate_cron_task +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.hs_revision_cleanup_cron.yml b/config/default/ultimate_cron.job.hs_revision_cleanup_cron.yml new file mode 100644 index 0000000000..f8eaaa4279 --- /dev/null +++ b/config/default/ultimate_cron.job.hs_revision_cleanup_cron.yml @@ -0,0 +1,17 @@ +uuid: 245bfbf4-7fda-45fc-bd28-70566850f55e +langcode: en +status: true +dependencies: + module: + - hs_revision_cleanup +title: 'Default cron handler' +id: hs_revision_cleanup_cron +weight: 0 +module: hs_revision_cleanup +callback: hs_revision_cleanup_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.layout_builder_cron.yml b/config/default/ultimate_cron.job.layout_builder_cron.yml new file mode 100644 index 0000000000..6cbbb34c94 --- /dev/null +++ b/config/default/ultimate_cron.job.layout_builder_cron.yml @@ -0,0 +1,17 @@ +uuid: cdfcb2f4-8657-4ce3-be67-6cc0c7e4c7f0 +langcode: en +status: true +dependencies: + module: + - layout_builder +title: 'Default cron handler' +id: layout_builder_cron +weight: 0 +module: layout_builder +callback: layout_builder_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.node_cron.yml b/config/default/ultimate_cron.job.node_cron.yml new file mode 100644 index 0000000000..b16e3400b8 --- /dev/null +++ b/config/default/ultimate_cron.job.node_cron.yml @@ -0,0 +1,17 @@ +uuid: 5c15b745-a8ba-45eb-88e9-06448ba838a7 +langcode: en +status: true +dependencies: + module: + - node +title: 'Mark old nodes as read' +id: node_cron +weight: 0 +module: node +callback: node_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.redirect_404_cron.yml b/config/default/ultimate_cron.job.redirect_404_cron.yml new file mode 100644 index 0000000000..abfe87fedb --- /dev/null +++ b/config/default/ultimate_cron.job.redirect_404_cron.yml @@ -0,0 +1,17 @@ +uuid: c0f0a4d8-9cf6-4ff3-ab46-c07952d1140c +langcode: en +status: true +dependencies: + module: + - redirect_404 +title: 'Default cron handler' +id: redirect_404_cron +weight: 0 +module: redirect_404 +callback: redirect_404_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.rules_cron.yml b/config/default/ultimate_cron.job.rules_cron.yml new file mode 100644 index 0000000000..8d73e16411 --- /dev/null +++ b/config/default/ultimate_cron.job.rules_cron.yml @@ -0,0 +1,17 @@ +uuid: 51605d01-c2d4-4e26-a5b8-2ebf6613a3aa +langcode: en +status: true +dependencies: + module: + - rules +title: 'Default cron handler' +id: rules_cron +weight: 0 +module: rules +callback: rules_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.search_api_cron.yml b/config/default/ultimate_cron.job.search_api_cron.yml new file mode 100644 index 0000000000..fb724d2156 --- /dev/null +++ b/config/default/ultimate_cron.job.search_api_cron.yml @@ -0,0 +1,17 @@ +uuid: 79855926-a2bb-4fda-aea9-cdf627e35d69 +langcode: en +status: true +dependencies: + module: + - search_api +title: 'Default cron handler' +id: search_api_cron +weight: 0 +module: search_api +callback: search_api_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.system_cron.yml b/config/default/ultimate_cron.job.system_cron.yml new file mode 100644 index 0000000000..e5110f11cb --- /dev/null +++ b/config/default/ultimate_cron.job.system_cron.yml @@ -0,0 +1,17 @@ +uuid: e42b8959-f7ff-4bd7-8408-d9fdb7989786 +langcode: en +status: true +dependencies: + module: + - system +title: 'Cleanup (caches, batch, flood, temp-files, etc.)' +id: system_cron +weight: 0 +module: system +callback: system_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.ultimate_cron_cron.yml b/config/default/ultimate_cron.job.ultimate_cron_cron.yml new file mode 100644 index 0000000000..131b3750d9 --- /dev/null +++ b/config/default/ultimate_cron.job.ultimate_cron_cron.yml @@ -0,0 +1,15 @@ +uuid: 488cb667-dd02-4bb7-8763-958f99390a10 +langcode: en +status: true +dependencies: { } +title: 'Runs internal cleanup operations' +id: ultimate_cron_cron +weight: 0 +module: ultimate_cron +callback: ultimate_cron_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.update_cron.yml b/config/default/ultimate_cron.job.update_cron.yml new file mode 100644 index 0000000000..b6544f8459 --- /dev/null +++ b/config/default/ultimate_cron.job.update_cron.yml @@ -0,0 +1,17 @@ +uuid: 488d73fc-8aed-4a8c-9e36-1563a5080ba4 +langcode: en +status: true +dependencies: + module: + - update +title: 'Update indexes' +id: update_cron +weight: 0 +module: update +callback: update_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.webform_cron.yml b/config/default/ultimate_cron.job.webform_cron.yml new file mode 100644 index 0000000000..dfdd57de25 --- /dev/null +++ b/config/default/ultimate_cron.job.webform_cron.yml @@ -0,0 +1,17 @@ +uuid: 527f219f-18b8-4ac5-872d-96cf16b9decb +langcode: en +status: true +dependencies: + module: + - webform +title: 'Default cron handler' +id: webform_cron +weight: 0 +module: webform +callback: webform_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.job.xmlsitemap_cron.yml b/config/default/ultimate_cron.job.xmlsitemap_cron.yml new file mode 100644 index 0000000000..dc4b11c2f0 --- /dev/null +++ b/config/default/ultimate_cron.job.xmlsitemap_cron.yml @@ -0,0 +1,17 @@ +uuid: 3fb435ad-7b41-44b5-9a8c-722e2acde768 +langcode: en +status: true +dependencies: + module: + - xmlsitemap +title: 'Default cron handler' +id: xmlsitemap_cron +weight: 0 +module: xmlsitemap +callback: xmlsitemap_cron +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/config/default/ultimate_cron.settings.yml b/config/default/ultimate_cron.settings.yml new file mode 100644 index 0000000000..caf8867aa1 --- /dev/null +++ b/config/default/ultimate_cron.settings.yml @@ -0,0 +1,35 @@ +bypass_transactional_safe_connection: false +queue: + enabled: false + timeouts: + lease_time: 30 + time: 15 + delays: + empty_delay: 0 + item_delay: 0 + throttle: + enabled: true + threads: 4 + threshold: 10 +launcher: + thread: any + max_threads: 1 + lock_timeout: 3600 + max_execution_time: 3600 +logger: + cache: + bin: ultimate_cron_logger + timeout: -1 + database: + method: 3 + expire: 1209600 + retain: 1000 +scheduler: + crontab: + catch_up: 86400 + rules: + - '*/10+@ * * * *' + simple: + rule: '*/15+@ * * * *' +_core: + default_config_hash: xNvhVNcCJsZiYwYTw9TTnRv1SjLVO7H5BCK1U8Brvfo diff --git a/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_capx.yml b/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_capx.yml new file mode 100644 index 0000000000..98780bd4c3 --- /dev/null +++ b/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_capx.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: + module: + - hs_migrate +title: 'CAPx Migration' +id: hs_migrate_hs_capx +weight: 0 +module: hs_migrate +callback: hs_migrate_ultimate_cron_task +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_courses.yml b/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_courses.yml new file mode 100644 index 0000000000..8ce99eda49 --- /dev/null +++ b/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_courses.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: + module: + - hs_migrate +title: 'Courses Migration' +id: hs_migrate_hs_courses +weight: 0 +module: hs_migrate +callback: hs_migrate_ultimate_cron_task +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_events.yml b/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_events.yml new file mode 100644 index 0000000000..2e3f93765e --- /dev/null +++ b/docroot/modules/humsci/hs_migrate/config/optional/ultimate_cron.job.hs_migrate_hs_events.yml @@ -0,0 +1,16 @@ +langcode: en +status: true +dependencies: + module: + - hs_migrate +title: 'Events Migration' +id: hs_migrate_hs_events +weight: 0 +module: hs_migrate +callback: hs_migrate_ultimate_cron_task +scheduler: + id: simple +launcher: + id: serial +logger: + id: database diff --git a/docroot/modules/humsci/hs_migrate/hs_migrate.info.yml b/docroot/modules/humsci/hs_migrate/hs_migrate.info.yml index fae313f221..fb5a0c7d24 100644 --- a/docroot/modules/humsci/hs_migrate/hs_migrate.info.yml +++ b/docroot/modules/humsci/hs_migrate/hs_migrate.info.yml @@ -7,3 +7,4 @@ dependencies: - migrate - migrate_plus - migrate_tools + - ultimate_cron diff --git a/docroot/modules/humsci/hs_migrate/hs_migrate.install b/docroot/modules/humsci/hs_migrate/hs_migrate.install new file mode 100644 index 0000000000..363a41dd68 --- /dev/null +++ b/docroot/modules/humsci/hs_migrate/hs_migrate.install @@ -0,0 +1,13 @@ +install(['ultimate_cron']); +} diff --git a/docroot/modules/humsci/hs_migrate/hs_migrate.module b/docroot/modules/humsci/hs_migrate/hs_migrate.module index 610d12952b..09f7061bcf 100644 --- a/docroot/modules/humsci/hs_migrate/hs_migrate.module +++ b/docroot/modules/humsci/hs_migrate/hs_migrate.module @@ -12,6 +12,7 @@ use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate_tools\MigrateExecutable; use Drupal\migrate\MigrateMessage; use Drupal\Core\Entity\EntityInterface; +use Drupal\ultimate_cron\CronJobInterface; /** * Implements hook_help(). @@ -87,14 +88,36 @@ function hs_migrate_entity_delete(EntityInterface $entity) { } /** - * Implements hook_cron(). + * Ultimate cron callback function to execute a migration group. + * + * The entity id should be in the form `hs_migrate_{migrate_group_id}` to + * execute that group. + * + * @param \Drupal\ultimate_cron\CronJobInterface $cron_entity + * Ultimate cron entity. */ -function hs_migrate_cron() { +function hs_migrate_ultimate_cron_task(CronJobInterface $cron_entity) { + $logger = \Drupal::logger('hs_migrate'); $migrations = hs_migrate_migration_list(); - // Take it one group at a time, importing the migrations within each group. - foreach ($migrations as $migration_list) { - array_walk($migration_list, 'hs_migrate_execute_migration'); + + $migration_group = str_replace('hs_migrate_', '', $cron_entity->id()); + // Execute the migration entities in the provided migration group. + if ($migration_group && !empty($migrations[$migration_group])) { + try { + array_walk($migrations[$migration_group], 'hs_migrate_execute_migration'); + } + catch (Exception $e) { + + // Log any errors that we encounter. + $logger->error('Unable to run migration importer: @group @message', [ + '@group' => $migration_group, + '@message' => $e->getMessage(), + ]); + } + + return; } + $logger->info('No migration group @group_id exists. No migration executed.', ['@group' => $migration_group]); } /** From 5ec8ea741ceffe519d2d1b5d0f35a82b7bb0a9eb Mon Sep 17 00:00:00 2001 From: pookmish Date: Thu, 7 Feb 2019 16:22:36 -0800 Subject: [PATCH 07/25] HSD8-572 Style login form to match previous (#167) --- .../humsci/su_humsci_admin/Gruntfile.js | 18 +- .../css/humsci_admin.portal.css | 2 +- .../humsci/su_humsci_admin/package-lock.json | 1916 +++++++++-------- .../scss/humsci_admin.portal.scss | 26 +- 4 files changed, 1002 insertions(+), 960 deletions(-) diff --git a/docroot/themes/humsci/su_humsci_admin/Gruntfile.js b/docroot/themes/humsci/su_humsci_admin/Gruntfile.js index 39fa824f36..8e3b3de15d 100644 --- a/docroot/themes/humsci/su_humsci_admin/Gruntfile.js +++ b/docroot/themes/humsci/su_humsci_admin/Gruntfile.js @@ -102,13 +102,17 @@ module.exports = function(grunt) { precision: 10 }, dist: { - files: { - // Files are compiled individually so they may be included - // conditionally using logic built in to the theme template or module. - - // BASE - 'css/base/base.css': 'scss/base/base.scss', - } + files: [{ + expand: true, + cwd: 'scss', + src: ['**/[a-z]*.scss'], + dest: 'css', + ext: '.css', + extDot: 'last', + rename: function (dest, src) { + return dest + '/' + src.replace('scss', 'css'); + } + }] } }, drush: { diff --git a/docroot/themes/humsci/su_humsci_admin/css/humsci_admin.portal.css b/docroot/themes/humsci/su_humsci_admin/css/humsci_admin.portal.css index 401e9fc599..0cbf48ace0 100644 --- a/docroot/themes/humsci/su_humsci_admin/css/humsci_admin.portal.css +++ b/docroot/themes/humsci/su_humsci_admin/css/humsci_admin.portal.css @@ -1 +1 @@ -.content-header{background:transparent;text-align:center}.breadcrumb{display:none}.content-header,.layout-container{max-width:750px;margin:0 auto}.user-login-form{box-shadow:0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);padding:30px}.simplesamlphp-auth-login-link{display:block;font-size:32px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);padding:10px;position:relative;color:#b1040e} +.content-header{background:transparent;text-align:center}.content-header,.layout-container{max-width:600px;margin:0 auto}.user-login-form{box-shadow:0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);padding:30px}.simplesamlphp-auth-login-link{display:block;font-size:32px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);padding:10px;position:relative;color:#b1040e}.simplesamlphp-auth-login-link:after{content:"\f054";font-family:"Font Awesome 5 Free";font-weight:900;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1;color:#9e9e9e;position:absolute;top:calc(50% - 10px);font-size:20px;right:20px}h1{margin:2.1rem 0 1.68rem 0;font-weight:200;line-height:110%;font-size:2.5rem;color:#9e9e9e;font-family:"Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif} diff --git a/docroot/themes/humsci/su_humsci_admin/package-lock.json b/docroot/themes/humsci/su_humsci_admin/package-lock.json index 62610f3168..6f160ea0f3 100644 --- a/docroot/themes/humsci/su_humsci_admin/package-lock.json +++ b/docroot/themes/humsci/su_humsci_admin/package-lock.json @@ -7,7 +7,7 @@ "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=", "dev": true }, "accepts": { @@ -16,7 +16,7 @@ "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", "dev": true, "requires": { - "mime-types": "2.1.18", + "mime-types": "~2.1.18", "negotiator": "0.6.1" } }, @@ -32,10 +32,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" }, "dependencies": { "co": { @@ -85,14 +85,14 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", "dev": true }, "archive-type": { @@ -101,7 +101,7 @@ "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=", "dev": true, "requires": { - "file-type": "3.9.0" + "file-type": "^3.1.0" } }, "are-we-there-yet": { @@ -110,17 +110,17 @@ "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "integrity": "sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE=", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "arr-diff": { @@ -129,13 +129,13 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=", "dev": true }, "array-differ": { @@ -165,7 +165,7 @@ "arraybuffer.slice": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", - "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", + "integrity": "sha1-O7xCdd1YTMGxCAm4nU6LY6aednU=", "dev": true }, "asn1": { @@ -201,7 +201,7 @@ "async-limiter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", + "integrity": "sha1-ePrtjD0HSrgfIrTphdeehzj3IPg=", "dev": true }, "asynckit": { @@ -216,10 +216,10 @@ "integrity": "sha1-5kDEFK5Bmq4hwa1DyOoPPbgqVm0=", "dev": true, "requires": { - "browserslist": "0.4.0", - "caniuse-db": "1.0.30000840", - "num2fraction": "1.2.2", - "postcss": "4.1.16" + "browserslist": "~0.4.0", + "caniuse-db": "^1.0.30000214", + "num2fraction": "^1.1.0", + "postcss": "~4.1.12" } }, "aws4": { @@ -234,8 +234,8 @@ "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=", "dev": true, "requires": { - "follow-redirects": "1.4.1", - "is-buffer": "1.1.6" + "follow-redirects": "^1.2.5", + "is-buffer": "^1.1.5" } }, "backo2": { @@ -269,7 +269,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "beeper": { @@ -294,13 +294,13 @@ "dev": true, "optional": true, "requires": { - "archive-type": "3.2.0", - "decompress": "3.0.0", - "download": "4.4.3", - "exec-series": "1.0.3", - "rimraf": "2.6.2", - "tempfile": "1.1.1", - "url-regex": "3.2.0" + "archive-type": "^3.0.1", + "decompress": "^3.0.0", + "download": "^4.1.2", + "exec-series": "^1.0.0", + "rimraf": "^2.2.6", + "tempfile": "^1.0.0", + "url-regex": "^3.0.0" } }, "bin-check": { @@ -310,7 +310,7 @@ "dev": true, "optional": true, "requires": { - "executable": "1.1.0" + "executable": "^1.0.0" } }, "bin-version": { @@ -320,7 +320,7 @@ "dev": true, "optional": true, "requires": { - "find-versions": "1.2.1" + "find-versions": "^1.0.0" } }, "bin-version-check": { @@ -330,10 +330,10 @@ "dev": true, "optional": true, "requires": { - "bin-version": "1.0.4", - "minimist": "1.2.0", - "semver": "4.3.6", - "semver-truncate": "1.1.2" + "bin-version": "^1.0.0", + "minimist": "^1.1.0", + "semver": "^4.0.3", + "semver-truncate": "^1.0.0" }, "dependencies": { "semver": { @@ -352,12 +352,12 @@ "dev": true, "optional": true, "requires": { - "bin-check": "2.0.0", - "bin-version-check": "2.1.0", - "download": "4.4.3", - "each-async": "1.1.1", - "lazy-req": "1.1.0", - "os-filter-obj": "1.0.3" + "bin-check": "^2.0.0", + "bin-version-check": "^2.1.0", + "download": "^4.0.0", + "each-async": "^1.1.1", + "lazy-req": "^1.0.0", + "os-filter-obj": "^1.0.0" } }, "binary-extensions": { @@ -369,11 +369,11 @@ "bl": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "integrity": "sha1-oWCRFxcQPAdBDO9j71Gzl8Alr5w=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2" + "readable-stream": "^2.3.5", + "safe-buffer": "^5.1.1" } }, "blob": { @@ -388,7 +388,7 @@ "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "~2.0.0" } }, "body": { @@ -397,10 +397,10 @@ "integrity": "sha1-5LoM5BCkaTYyM2dgnstOZVMSUGk=", "dev": true, "requires": { - "continuable-cache": "0.3.1", - "error": "7.0.2", - "raw-body": "1.1.7", - "safe-json-parse": "1.0.1" + "continuable-cache": "^0.3.1", + "error": "^7.0.0", + "raw-body": "~1.1.0", + "safe-json-parse": "~1.0.1" }, "dependencies": { "bytes": { @@ -415,8 +415,8 @@ "integrity": "sha1-HQJ8K/oRasxmI7yo8AAWVyqH1CU=", "dev": true, "requires": { - "bytes": "1.0.0", - "string_decoder": "0.10.31" + "bytes": "1", + "string_decoder": "0.10" } }, "string_decoder": { @@ -439,16 +439,16 @@ "integrity": "sha512-DlJn56ILF33mHL/WH3aKTGiEso6qZU/lovt8yX4TTrcQu+NNxkNXi46UC2T+iBxXsK15IQnCm9WJ25vIKgFcUQ==", "dev": true, "requires": { - "node-sass": "4.9.3" + "node-sass": "^4.1.1" } }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -458,9 +458,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "browser-sync": { @@ -469,16 +469,16 @@ "integrity": "sha512-NqXek0cPNEayQm77VGnD+qrwcVBTKMIQ9bdP6IWDRUTU1Bk7tZeq5QR3OG5Rr36Rao1t+Vx1QnfolHvvr5qsTA==", "dev": true, "requires": { - "browser-sync-ui": "1.0.1", + "browser-sync-ui": "v1.0.1", "bs-recipes": "1.3.4", "chokidar": "1.7.0", "connect": "3.6.6", - "connect-history-api-fallback": "1.5.0", - "dev-ip": "1.0.1", - "easy-extender": "2.3.4", + "connect-history-api-fallback": "^1.5.0", + "dev-ip": "^1.0.1", + "easy-extender": "^2.3.4", "eazy-logger": "3.0.2", - "etag": "1.8.1", - "fresh": "0.5.2", + "etag": "^1.8.1", + "fresh": "^0.5.2", "fs-extra": "3.0.1", "http-proxy": "1.15.2", "immutable": "3.8.2", @@ -487,7 +487,7 @@ "opn": "5.3.0", "portscanner": "2.1.1", "qs": "6.2.3", - "raw-body": "2.3.3", + "raw-body": "^2.3.2", "resp-modifier": "6.0.2", "rx": "4.1.0", "serve-index": "1.9.1", @@ -518,7 +518,7 @@ "requires": { "debug": "2.6.9", "finalhandler": "1.1.0", - "parseurl": "1.3.2", + "parseurl": "~1.3.2", "utils-merge": "1.0.1" } }, @@ -528,7 +528,7 @@ "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.17.10" } }, "engine.io": { @@ -537,12 +537,12 @@ "integrity": "sha512-mRbgmAtQ4GAlKwuPnnAvXXwdPhEx+jkc0OBCLrXuD/CRvwNK3AxRSnqK4FSqmAMRRHryVJP8TopOvmEaA64fKw==", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.4", "base64id": "1.0.0", "cookie": "0.3.1", - "debug": "3.1.0", - "engine.io-parser": "2.1.2", - "ws": "3.3.3" + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" }, "dependencies": { "debug": { @@ -564,14 +564,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "3.1.0", - "engine.io-parser": "2.1.2", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "3.3.3", - "xmlhttprequest-ssl": "1.5.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" }, "dependencies": { @@ -593,12 +593,12 @@ "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" + "encodeurl": "~1.0.1", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.3.1", + "unpipe": "~1.0.0" } }, "isarray": { @@ -613,7 +613,7 @@ "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", "dev": true, "requires": { - "is-wsl": "1.1.0" + "is-wsl": "^1.1.0" } }, "qs": { @@ -628,13 +628,13 @@ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "accepts": "1.3.5", + "accepts": "~1.3.4", "batch": "0.6.1", "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.18", - "parseurl": "1.3.2" + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" } }, "socket.io": { @@ -643,12 +643,12 @@ "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, "requires": { - "debug": "3.1.0", - "engine.io": "3.2.0", - "has-binary2": "1.0.3", - "socket.io-adapter": "1.1.1", + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", "socket.io-client": "2.1.1", - "socket.io-parser": "3.2.0" + "socket.io-parser": "~3.2.0" }, "dependencies": { "debug": { @@ -672,15 +672,15 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "3.1.0", - "engine.io-client": "3.2.1", - "has-binary2": "1.0.3", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "3.2.0", + "socket.io-parser": "~3.2.0", "to-array": "0.1.4" }, "dependencies": { @@ -702,7 +702,7 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "3.1.0", + "debug": "~3.1.0", "isarray": "2.0.1" }, "dependencies": { @@ -763,11 +763,11 @@ "dev": true, "requires": { "async-each-series": "0.1.1", - "connect-history-api-fallback": "1.5.0", - "immutable": "3.8.2", + "connect-history-api-fallback": "^1.1.0", + "immutable": "^3.7.6", "server-destroy": "1.0.1", "socket.io-client": "2.0.4", - "stream-throttle": "0.1.3" + "stream-throttle": "^0.1.3" } }, "browserify-zlib": { @@ -776,7 +776,7 @@ "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", "dev": true, "requires": { - "pako": "0.2.9" + "pako": "~0.2.0" } }, "browserslist": { @@ -785,7 +785,7 @@ "integrity": "sha1-O9SrkZncG5FQ1NbbpNnTqrvIbdQ=", "dev": true, "requires": { - "caniuse-db": "1.0.30000840" + "caniuse-db": "^1.0.30000153" } }, "bs-recipes": { @@ -800,8 +800,8 @@ "integrity": "sha1-BVFNM78WVtNUDGhPZbEgLpDsowM=", "dev": true, "requires": { - "buffer-alloc-unsafe": "0.1.1", - "buffer-fill": "0.1.1" + "buffer-alloc-unsafe": "^0.1.0", + "buffer-fill": "^0.1.0" } }, "buffer-alloc-unsafe": { @@ -834,10 +834,10 @@ "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=", "dev": true, "requires": { - "file-type": "3.9.0", - "readable-stream": "2.3.6", - "uuid": "2.0.3", - "vinyl": "1.2.0" + "file-type": "^3.1.0", + "readable-stream": "^2.0.2", + "uuid": "^2.0.1", + "vinyl": "^1.0.0" }, "dependencies": { "uuid": { @@ -878,8 +878,8 @@ "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" } }, "caniuse-db": { @@ -900,10 +900,10 @@ "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=", "dev": true, "requires": { - "get-proxy": "1.1.0", - "is-obj": "1.0.1", - "object-assign": "3.0.0", - "tunnel-agent": "0.4.3" + "get-proxy": "^1.0.1", + "is-obj": "^1.0.0", + "object-assign": "^3.0.0", + "tunnel-agent": "^0.4.0" }, "dependencies": { "object-assign": { @@ -920,11 +920,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "chokidar": { @@ -933,24 +933,24 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.4", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" } }, "clap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", - "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", + "integrity": "sha1-TzZ0WzIAhJJVf0ZBLWbVDLmbzlE=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.1.3" } }, "cliui": { @@ -959,9 +959,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { @@ -988,7 +988,7 @@ "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "dev": true, "requires": { - "q": "1.5.1" + "q": "^1.1.2" } }, "code-point-at": { @@ -1006,7 +1006,7 @@ "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "integrity": "sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg=", "dev": true, "requires": { "color-name": "1.1.3" @@ -1021,7 +1021,7 @@ "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "integrity": "sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI=", "dev": true }, "colors": { @@ -1036,7 +1036,7 @@ "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -1072,13 +1072,13 @@ "concat-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", "dev": true, "requires": { - "buffer-from": "1.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "connect-history-api-fallback": { @@ -1130,7 +1130,7 @@ "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { - "capture-stack-trace": "1.0.0" + "capture-stack-trace": "^1.0.0" } }, "cross-spawn": { @@ -1139,8 +1139,8 @@ "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", "dev": true, "requires": { - "lru-cache": "4.1.3", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, "csso": { @@ -1149,8 +1149,8 @@ "integrity": "sha1-F4tDpEYhIhwndWCG9THgL0KQDug=", "dev": true, "requires": { - "clap": "1.2.3", - "source-map": "0.5.7" + "clap": "^1.0.9", + "source-map": "^0.5.3" }, "dependencies": { "source-map": { @@ -1167,7 +1167,7 @@ "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, "requires": { - "array-find-index": "1.0.2" + "array-find-index": "^1.0.1" } }, "dashdash": { @@ -1176,7 +1176,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -1193,8 +1193,8 @@ "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=", "dev": true, "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" + "get-stdin": "^4.0.1", + "meow": "^3.3.0" } }, "debug": { @@ -1218,11 +1218,11 @@ "integrity": "sha512-Mz2um2E31Jd1yBIlUGU2Ow0LxNdHEY8FkNT9NyK/UsU8jFq64dfg9b7c4QNrcxD+5m2aZCxuAMdku2urIsmn4w==", "dev": true, "requires": { - "bourbon": "4.3.4", - "bourbon-neat": "1.9.0", - "font-awesome": "4.7.0", - "neat-omega": "3.0.1", - "normalize.css": "6.0.0" + "bourbon": "^4.2.7", + "bourbon-neat": "^1.8.0", + "font-awesome": "~4.7.0", + "neat-omega": "^3.0.0", + "normalize.css": "^6.0.0" }, "dependencies": { "normalize.css": { @@ -1239,15 +1239,15 @@ "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=", "dev": true, "requires": { - "buffer-to-vinyl": "1.1.0", - "concat-stream": "1.6.2", - "decompress-tar": "3.1.0", - "decompress-tarbz2": "3.1.0", - "decompress-targz": "3.1.0", - "decompress-unzip": "3.4.0", - "stream-combiner2": "1.1.1", - "vinyl-assign": "1.2.1", - "vinyl-fs": "2.4.4" + "buffer-to-vinyl": "^1.0.0", + "concat-stream": "^1.4.6", + "decompress-tar": "^3.0.0", + "decompress-tarbz2": "^3.0.0", + "decompress-targz": "^3.0.0", + "decompress-unzip": "^3.0.0", + "stream-combiner2": "^1.1.1", + "vinyl-assign": "^1.0.1", + "vinyl-fs": "^2.2.0" } }, "decompress-tar": { @@ -1256,12 +1256,12 @@ "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=", "dev": true, "requires": { - "is-tar": "1.0.0", - "object-assign": "2.1.1", - "strip-dirs": "1.1.1", - "tar-stream": "1.6.1", - "through2": "0.6.5", - "vinyl": "0.4.6" + "is-tar": "^1.0.0", + "object-assign": "^2.0.0", + "strip-dirs": "^1.0.0", + "tar-stream": "^1.1.1", + "through2": "^0.6.1", + "vinyl": "^0.4.3" }, "dependencies": { "clone": { @@ -1282,8 +1282,8 @@ "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { - "clone": "0.2.0", - "clone-stats": "0.0.1" + "clone": "^0.2.0", + "clone-stats": "^0.0.1" } } } @@ -1294,13 +1294,13 @@ "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=", "dev": true, "requires": { - "is-bzip2": "1.0.0", - "object-assign": "2.1.1", - "seek-bzip": "1.0.5", - "strip-dirs": "1.1.1", - "tar-stream": "1.6.1", - "through2": "0.6.5", - "vinyl": "0.4.6" + "is-bzip2": "^1.0.0", + "object-assign": "^2.0.0", + "seek-bzip": "^1.0.3", + "strip-dirs": "^1.0.0", + "tar-stream": "^1.1.1", + "through2": "^0.6.1", + "vinyl": "^0.4.3" }, "dependencies": { "clone": { @@ -1321,8 +1321,8 @@ "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { - "clone": "0.2.0", - "clone-stats": "0.0.1" + "clone": "^0.2.0", + "clone-stats": "^0.0.1" } } } @@ -1333,12 +1333,12 @@ "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=", "dev": true, "requires": { - "is-gzip": "1.0.0", - "object-assign": "2.1.1", - "strip-dirs": "1.1.1", - "tar-stream": "1.6.1", - "through2": "0.6.5", - "vinyl": "0.4.6" + "is-gzip": "^1.0.0", + "object-assign": "^2.0.0", + "strip-dirs": "^1.0.0", + "tar-stream": "^1.1.1", + "through2": "^0.6.1", + "vinyl": "^0.4.3" }, "dependencies": { "clone": { @@ -1359,8 +1359,8 @@ "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", "dev": true, "requires": { - "clone": "0.2.0", - "clone-stats": "0.0.1" + "clone": "^0.2.0", + "clone-stats": "^0.0.1" } } } @@ -1371,13 +1371,13 @@ "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=", "dev": true, "requires": { - "is-zip": "1.0.0", - "read-all-stream": "3.1.0", - "stat-mode": "0.2.2", - "strip-dirs": "1.1.1", - "through2": "2.0.3", - "vinyl": "1.2.0", - "yauzl": "2.9.1" + "is-zip": "^1.0.0", + "read-all-stream": "^3.0.0", + "stat-mode": "^0.2.0", + "strip-dirs": "^1.0.0", + "through2": "^2.0.0", + "vinyl": "^1.0.0", + "yauzl": "^2.2.1" }, "dependencies": { "through2": { @@ -1386,8 +1386,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } } } @@ -1440,21 +1440,21 @@ "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=", "dev": true, "requires": { - "caw": "1.2.0", - "concat-stream": "1.6.2", - "each-async": "1.1.1", - "filenamify": "1.2.1", - "got": "5.7.1", - "gulp-decompress": "1.2.0", - "gulp-rename": "1.2.3", - "is-url": "1.2.4", - "object-assign": "4.1.1", - "read-all-stream": "3.1.0", - "readable-stream": "2.3.6", - "stream-combiner2": "1.1.1", - "vinyl": "1.2.0", - "vinyl-fs": "2.4.4", - "ware": "1.3.0" + "caw": "^1.0.1", + "concat-stream": "^1.4.7", + "each-async": "^1.0.0", + "filenamify": "^1.0.1", + "got": "^5.0.0", + "gulp-decompress": "^1.2.0", + "gulp-rename": "^1.2.0", + "is-url": "^1.2.0", + "object-assign": "^4.0.1", + "read-all-stream": "^3.0.0", + "readable-stream": "^2.0.2", + "stream-combiner2": "^1.1.1", + "vinyl": "^1.0.0", + "vinyl-fs": "^2.2.0", + "ware": "^1.2.0" } }, "duplexer2": { @@ -1463,7 +1463,7 @@ "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.2" } }, "duplexify": { @@ -1472,10 +1472,10 @@ "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", "dev": true, "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" } }, "each-async": { @@ -1484,8 +1484,8 @@ "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=", "dev": true, "requires": { - "onetime": "1.1.0", - "set-immediate-shim": "1.0.1" + "onetime": "^1.0.0", + "set-immediate-shim": "^1.0.0" } }, "eazy-logger": { @@ -1494,7 +1494,7 @@ "integrity": "sha1-oyWqXlPROiIliJsqxBE7K5Y29Pw=", "dev": true, "requires": { - "tfunk": "3.1.0" + "tfunk": "^3.0.1" } }, "ecc-jsbn": { @@ -1504,7 +1504,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "ee-first": { @@ -1522,10 +1522,10 @@ "end-of-stream": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "integrity": "sha1-7SljTRm6ukY7bOa4CjchPqtx7EM=", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, "engine.io-client": { @@ -1536,14 +1536,14 @@ "requires": { "component-emitter": "1.2.1", "component-inherit": "0.0.3", - "debug": "3.1.0", - "engine.io-parser": "2.1.2", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", "has-cors": "1.1.0", "indexof": "0.0.1", "parseqs": "0.0.5", "parseuri": "0.0.5", - "ws": "3.3.3", - "xmlhttprequest-ssl": "1.5.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", "yeast": "0.1.2" }, "dependencies": { @@ -1565,10 +1565,10 @@ "dev": true, "requires": { "after": "0.8.2", - "arraybuffer.slice": "0.0.7", + "arraybuffer.slice": "~0.0.7", "base64-arraybuffer": "0.1.5", "blob": "0.0.4", - "has-binary2": "1.0.3" + "has-binary2": "~1.0.2" } }, "error": { @@ -1577,8 +1577,8 @@ "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=", "dev": true, "requires": { - "string-template": "0.2.1", - "xtend": "4.0.1" + "string-template": "~0.2.1", + "xtend": "~4.0.0" } }, "error-ex": { @@ -1587,7 +1587,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es6-promise": { @@ -1639,8 +1639,8 @@ "dev": true, "optional": true, "requires": { - "rimraf": "2.6.2", - "tempfile": "1.1.1" + "rimraf": "^2.2.6", + "tempfile": "^1.0.0" } }, "exec-series": { @@ -1650,8 +1650,8 @@ "dev": true, "optional": true, "requires": { - "async-each-series": "1.1.0", - "object-assign": "4.1.1" + "async-each-series": "^1.1.0", + "object-assign": "^4.1.0" }, "dependencies": { "async-each-series": { @@ -1670,7 +1670,7 @@ "dev": true, "optional": true, "requires": { - "meow": "3.7.0" + "meow": "^3.1.0" } }, "exit": { @@ -1685,7 +1685,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -1694,7 +1694,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.4" + "fill-range": "^2.1.0" } }, "extend": { @@ -1709,7 +1709,7 @@ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "is-extendable": "0.1.1" + "is-extendable": "^0.1.0" } }, "extglob": { @@ -1718,7 +1718,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "extsprintf": { @@ -1733,9 +1733,9 @@ "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", "dev": true, "requires": { - "ansi-gray": "0.1.1", - "color-support": "1.1.3", - "time-stamp": "1.1.0" + "ansi-gray": "^0.1.1", + "color-support": "^1.1.3", + "time-stamp": "^1.0.0" } }, "fast-deep-equal": { @@ -1756,7 +1756,7 @@ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", "dev": true, "requires": { - "websocket-driver": "0.7.0" + "websocket-driver": ">=0.5.1" } }, "fd-slicer": { @@ -1765,7 +1765,7 @@ "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", "dev": true, "requires": { - "pend": "1.2.0" + "pend": "~1.2.0" } }, "figures": { @@ -1774,8 +1774,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" } }, "file-type": { @@ -1802,9 +1802,9 @@ "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=", "dev": true, "requires": { - "filename-reserved-regex": "1.0.0", - "strip-outer": "1.0.1", - "trim-repeated": "1.0.0" + "filename-reserved-regex": "^1.0.0", + "strip-outer": "^1.0.0", + "trim-repeated": "^1.0.0" } }, "fill-range": { @@ -1813,11 +1813,11 @@ "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^3.0.0", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" } }, "find-up": { @@ -1826,8 +1826,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "find-versions": { @@ -1837,10 +1837,10 @@ "dev": true, "optional": true, "requires": { - "array-uniq": "1.0.3", - "get-stdin": "4.0.1", - "meow": "3.7.0", - "semver-regex": "1.0.0" + "array-uniq": "^1.0.0", + "get-stdin": "^4.0.1", + "meow": "^3.5.0", + "semver-regex": "^1.0.0" } }, "findup-sync": { @@ -1849,7 +1849,7 @@ "integrity": "sha1-N5MKpdgWt3fANEXhlmzGeQpMCxY=", "dev": true, "requires": { - "glob": "5.0.15" + "glob": "~5.0.0" }, "dependencies": { "glob": { @@ -1858,11 +1858,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -1879,7 +1879,7 @@ "integrity": "sha512-uxYePVPogtya1ktGnAAXOacnbIuRMB4dkvqeNz2qTtTQsuzSfbDolV+wMMKxAmCx0bLgAKLbBOkjItMbbkR1vg==", "dev": true, "requires": { - "debug": "3.1.0" + "debug": "^3.1.0" }, "dependencies": { "debug": { @@ -1911,7 +1911,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "forever-agent": { @@ -1929,7 +1929,7 @@ "fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "integrity": "sha1-a+Dem+mYzhavivwkSXue6bfM2a0=", "dev": true }, "fs-extra": { @@ -1938,9 +1938,9 @@ "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "3.0.1", - "universalify": "0.1.1" + "graceful-fs": "^4.1.2", + "jsonfile": "^3.0.0", + "universalify": "^0.1.0" } }, "fs.realpath": { @@ -1956,8 +1956,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" + "nan": "^2.9.2", + "node-pre-gyp": "^0.10.0" }, "dependencies": { "abbrev": { @@ -1990,12 +1990,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -2010,17 +2012,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2137,7 +2142,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2149,6 +2155,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "1.0.1" } @@ -2163,6 +2170,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "1.1.11" } @@ -2170,12 +2178,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "5.1.1", "yallist": "3.0.2" @@ -2194,6 +2204,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2274,7 +2285,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2286,6 +2298,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1.0.2" } @@ -2407,6 +2420,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -2484,10 +2498,10 @@ "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.2" + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" } }, "gauge": { @@ -2496,14 +2510,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "gaze": { @@ -2512,7 +2526,7 @@ "integrity": "sha1-hHIkZ3rbiHDWeSV+0ziP22HkAQU=", "dev": true, "requires": { - "globule": "1.2.0" + "globule": "^1.0.0" } }, "get-caller-file": { @@ -2527,7 +2541,7 @@ "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=", "dev": true, "requires": { - "rc": "1.2.7" + "rc": "^1.1.2" } }, "get-stdin": { @@ -2548,7 +2562,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -2566,9 +2580,9 @@ "dev": true, "optional": true, "requires": { - "bin-build": "2.2.0", - "bin-wrapper": "3.0.2", - "logalot": "2.1.0" + "bin-build": "^2.0.0", + "bin-wrapper": "^3.0.0", + "logalot": "^2.0.0" } }, "glob": { @@ -2577,12 +2591,12 @@ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-base": { @@ -2591,8 +2605,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { @@ -2601,7 +2615,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "glob-stream": { @@ -2610,14 +2624,14 @@ "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", "dev": true, "requires": { - "extend": "3.0.1", - "glob": "5.0.15", - "glob-parent": "3.1.0", - "micromatch": "2.3.11", - "ordered-read-streams": "0.3.0", - "through2": "0.6.5", - "to-absolute-glob": "0.1.1", - "unique-stream": "2.2.1" + "extend": "^3.0.0", + "glob": "^5.0.3", + "glob-parent": "^3.0.0", + "micromatch": "^2.3.7", + "ordered-read-streams": "^0.3.0", + "through2": "^0.6.0", + "to-absolute-glob": "^0.1.1", + "unique-stream": "^2.0.2" }, "dependencies": { "glob": { @@ -2626,11 +2640,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-parent": { @@ -2639,8 +2653,8 @@ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" } }, "is-extglob": { @@ -2655,7 +2669,7 @@ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "dev": true, "requires": { - "is-extglob": "2.1.1" + "is-extglob": "^2.1.0" } } } @@ -2666,9 +2680,9 @@ "integrity": "sha1-HcScaCLdnoovoAuiopUAboZkvQk=", "dev": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.10", - "minimatch": "3.0.4" + "glob": "~7.1.1", + "lodash": "~4.17.4", + "minimatch": "~3.0.2" } }, "glogg": { @@ -2677,7 +2691,7 @@ "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", "dev": true, "requires": { - "sparkles": "1.0.1" + "sparkles": "^1.0.0" } }, "got": { @@ -2686,21 +2700,21 @@ "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", "dev": true, "requires": { - "create-error-class": "3.0.2", - "duplexer2": "0.1.4", - "is-redirect": "1.0.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "lowercase-keys": "1.0.1", - "node-status-codes": "1.0.0", - "object-assign": "4.1.1", - "parse-json": "2.2.0", - "pinkie-promise": "2.0.1", - "read-all-stream": "3.1.0", - "readable-stream": "2.3.6", - "timed-out": "3.1.3", - "unzip-response": "1.0.2", - "url-parse-lax": "1.0.0" + "create-error-class": "^3.0.1", + "duplexer2": "^0.1.4", + "is-redirect": "^1.0.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "lowercase-keys": "^1.0.0", + "node-status-codes": "^1.0.0", + "object-assign": "^4.0.1", + "parse-json": "^2.1.0", + "pinkie-promise": "^2.0.0", + "read-all-stream": "^3.0.0", + "readable-stream": "^2.0.5", + "timed-out": "^3.0.0", + "unzip-response": "^1.0.2", + "url-parse-lax": "^1.0.0" } }, "graceful-fs": { @@ -2718,26 +2732,26 @@ "grunt": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.3.tgz", - "integrity": "sha512-/JzmZNPfKorlCrrmxWqQO4JVodO+DVd5XX4DkocL/1WlLlKVLE9+SdEIempOAxDhWPysLle6afvn/hg7Ck2k9g==", - "dev": true, - "requires": { - "coffeescript": "1.10.0", - "dateformat": "1.0.12", - "eventemitter2": "0.4.14", - "exit": "0.1.2", - "findup-sync": "0.3.0", - "glob": "7.0.6", - "grunt-cli": "1.2.0", - "grunt-known-options": "1.1.1", - "grunt-legacy-log": "2.0.0", - "grunt-legacy-util": "1.1.1", - "iconv-lite": "0.4.23", - "js-yaml": "3.5.5", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.2" + "integrity": "sha1-s8mSYMUdG0KDV2bnllJ7YPe7o3Q=", + "dev": true, + "requires": { + "coffeescript": "~1.10.0", + "dateformat": "~1.0.12", + "eventemitter2": "~0.4.13", + "exit": "~0.1.1", + "findup-sync": "~0.3.0", + "glob": "~7.0.0", + "grunt-cli": "~1.2.0", + "grunt-known-options": "~1.1.0", + "grunt-legacy-log": "~2.0.0", + "grunt-legacy-util": "~1.1.1", + "iconv-lite": "~0.4.13", + "js-yaml": "~3.5.2", + "minimatch": "~3.0.2", + "mkdirp": "~0.5.1", + "nopt": "~3.0.6", + "path-is-absolute": "~1.0.0", + "rimraf": "~2.6.2" }, "dependencies": { "glob": { @@ -2746,12 +2760,12 @@ "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", "dev": true, "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "grunt-cli": { @@ -2760,10 +2774,10 @@ "integrity": "sha1-VisRnrsGndtGSs4oRVAb6Xs1tqg=", "dev": true, "requires": { - "findup-sync": "0.3.0", - "grunt-known-options": "1.1.1", - "nopt": "3.0.6", - "resolve": "1.1.7" + "findup-sync": "~0.3.0", + "grunt-known-options": "~1.1.0", + "nopt": "~3.0.6", + "resolve": "~1.1.0" } } } @@ -2774,10 +2788,10 @@ "integrity": "sha1-/kLiR7z6ucKSoSwGLa1PNb3pAsU=", "dev": true, "requires": { - "autoprefixer-core": "5.2.1", - "chalk": "1.0.0", - "diff": "1.3.2", - "postcss": "4.1.16" + "autoprefixer-core": "^5.1.7", + "chalk": "~1.0.0", + "diff": "~1.3.0", + "postcss": "^4.1.11" }, "dependencies": { "ansi-regex": { @@ -2792,11 +2806,11 @@ "integrity": "sha1-s89O0P9Tl8mcdbj2edsvUoMfltw=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "1.0.3", - "strip-ansi": "2.0.1", - "supports-color": "1.3.1" + "ansi-styles": "^2.0.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^1.0.3", + "strip-ansi": "^2.0.1", + "supports-color": "^1.3.0" } }, "has-ansi": { @@ -2805,8 +2819,8 @@ "integrity": "sha1-wLWxYV2eOCsP9nFp2We0JeSMpTg=", "dev": true, "requires": { - "ansi-regex": "1.1.1", - "get-stdin": "4.0.1" + "ansi-regex": "^1.1.0", + "get-stdin": "^4.0.1" } }, "strip-ansi": { @@ -2815,7 +2829,7 @@ "integrity": "sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4=", "dev": true, "requires": { - "ansi-regex": "1.1.1" + "ansi-regex": "^1.0.0" } }, "supports-color": { @@ -2832,8 +2846,8 @@ "integrity": "sha1-W+f2/dp3a4CnsnKiH2i9MFD4ImA=", "dev": true, "requires": { - "chalk": "1.1.3", - "lodash": "4.17.10" + "chalk": "^1.1.1", + "lodash": "^4.10.0" } }, "grunt-browser-sync": { @@ -2842,7 +2856,7 @@ "integrity": "sha1-oOnB/RzLXEVMJexRcBE///BqR3I=", "dev": true, "requires": { - "browser-sync": "2.24.7" + "browser-sync": "^2.6.4" } }, "grunt-contrib-concat": { @@ -2851,8 +2865,8 @@ "integrity": "sha1-lTxu/f39LBB6uchQd/LUsk0xzUk=", "dev": true, "requires": { - "chalk": "0.5.1", - "source-map": "0.3.0" + "chalk": "^0.5.1", + "source-map": "^0.3.0" }, "dependencies": { "ansi-regex": { @@ -2873,11 +2887,11 @@ "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", "dev": true, "requires": { - "ansi-styles": "1.1.0", - "escape-string-regexp": "1.0.5", - "has-ansi": "0.1.0", - "strip-ansi": "0.3.0", - "supports-color": "0.2.0" + "ansi-styles": "^1.1.0", + "escape-string-regexp": "^1.0.0", + "has-ansi": "^0.1.0", + "strip-ansi": "^0.3.0", + "supports-color": "^0.2.0" } }, "has-ansi": { @@ -2886,7 +2900,7 @@ "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", "dev": true, "requires": { - "ansi-regex": "0.2.1" + "ansi-regex": "^0.2.0" } }, "source-map": { @@ -2895,7 +2909,7 @@ "integrity": "sha1-hYb7mloAXltQHiHNGLbyG0V60fk=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } }, "strip-ansi": { @@ -2904,7 +2918,7 @@ "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", "dev": true, "requires": { - "ansi-regex": "0.2.1" + "ansi-regex": "^0.2.1" } }, "supports-color": { @@ -2921,11 +2935,11 @@ "integrity": "sha1-5Ho1YTN29MqpwfkERlA8rhyUTXk=", "dev": true, "requires": { - "async": "1.5.2", - "chalk": "1.1.3", - "gulp-rename": "1.2.3", - "imagemin": "4.0.0", - "pretty-bytes": "3.0.1" + "async": "^1.5.2", + "chalk": "^1.0.0", + "gulp-rename": "^1.2.0", + "imagemin": "^4.0.0", + "pretty-bytes": "^3.0.1" } }, "grunt-contrib-uglify": { @@ -2934,22 +2948,22 @@ "integrity": "sha512-W9O7lJE3PlD8VCc5fyaf98QV7f5wEDiU4PBIh0+/6UBbk2LhgzEFS0/p+taH5UD3+PlEn7QPN0o06Z0To6SqXw==", "dev": true, "requires": { - "chalk": "1.1.3", - "maxmin": "1.1.0", - "uglify-js": "3.3.25", - "uri-path": "1.0.0" + "chalk": "^1.0.0", + "maxmin": "^1.1.0", + "uglify-js": "~3.3.0", + "uri-path": "^1.0.0" } }, "grunt-contrib-watch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/grunt-contrib-watch/-/grunt-contrib-watch-1.1.0.tgz", - "integrity": "sha512-yGweN+0DW5yM+oo58fRu/XIRrPcn3r4tQx+nL7eMRwjpvk+rQY6R8o94BPK0i2UhTg9FN21hS+m8vR8v9vXfeg==", + "integrity": "sha1-wUPKW4JLKIoCS4VmOaU0Wu23jtQ=", "dev": true, "requires": { - "async": "2.6.0", - "gaze": "1.1.2", - "lodash": "4.17.10", - "tiny-lr": "1.1.1" + "async": "^2.6.0", + "gaze": "^1.1.0", + "lodash": "^4.17.10", + "tiny-lr": "^1.1.1" }, "dependencies": { "async": { @@ -2958,7 +2972,7 @@ "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "dev": true, "requires": { - "lodash": "4.17.10" + "lodash": "^4.14.0" } } } @@ -2969,9 +2983,9 @@ "integrity": "sha1-uLRCOGT3CsC83N/+n7niEd6Q4mw=", "dev": true, "requires": { - "async": "0.9.2", - "lodash": "2.4.2", - "win-spawn": "2.0.0" + "async": "^0.9.0", + "lodash": "^2.4.1", + "win-spawn": "^2.0.0" }, "dependencies": { "async": { @@ -2991,38 +3005,38 @@ "grunt-known-options": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz", - "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==", + "integrity": "sha1-bMCIEHvQIZ3F0+V9kZI/RpBZgE0=", "dev": true }, "grunt-legacy-log": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-2.0.0.tgz", - "integrity": "sha512-1m3+5QvDYfR1ltr8hjiaiNjddxGdQWcH0rw1iKKiQnF0+xtgTazirSTGu68RchPyh1OBng1bBUjLmX8q9NpoCw==", + "integrity": "sha1-yM0sbIGkRlubvy2HTZY/73pZ/7k=", "dev": true, "requires": { - "colors": "1.1.2", - "grunt-legacy-log-utils": "2.0.1", - "hooker": "0.2.3", - "lodash": "4.17.10" + "colors": "~1.1.2", + "grunt-legacy-log-utils": "~2.0.0", + "hooker": "~0.2.3", + "lodash": "~4.17.5" } }, "grunt-legacy-log-utils": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-2.0.1.tgz", - "integrity": "sha512-o7uHyO/J+i2tXG8r2bZNlVk20vlIFJ9IEYyHMCQGfWYru8Jv3wTqKZzvV30YW9rWEjq0eP3cflQ1qWojIe9VFA==", + "integrity": "sha1-0vRCx8AVAGXZAEsI/XQQ03UZGU4=", "dev": true, "requires": { - "chalk": "2.4.1", - "lodash": "4.17.10" + "chalk": "~2.4.1", + "lodash": "~4.17.10" }, "dependencies": { "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=", "dev": true, "requires": { - "color-convert": "1.9.3" + "color-convert": "^1.9.0" } }, "chalk": { @@ -3031,18 +3045,18 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.5.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -3050,16 +3064,16 @@ "grunt-legacy-util": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.1.1.tgz", - "integrity": "sha512-9zyA29w/fBe6BIfjGENndwoe1Uy31BIXxTH3s8mga0Z5Bz2Sp4UCjkeyv2tI449ymkx3x26B+46FV4fXEddl5A==", + "integrity": "sha1-4QYk58hgNOW4cMioYWdD8KCEXkI=", "dev": true, "requires": { - "async": "1.5.2", - "exit": "0.1.2", - "getobject": "0.1.0", - "hooker": "0.2.3", - "lodash": "4.17.10", - "underscore.string": "3.3.4", - "which": "1.3.0" + "async": "~1.5.2", + "exit": "~0.1.1", + "getobject": "~0.1.0", + "hooker": "~0.2.3", + "lodash": "~4.17.10", + "underscore.string": "~3.3.4", + "which": "~1.3.0" } }, "grunt-notify": { @@ -3068,20 +3082,20 @@ "integrity": "sha1-BSk5kGFhENtrwK0V5sBZL/4YrDE=", "dev": true, "requires": { - "semver": "5.5.0", - "stack-parser": "0.0.1", - "which": "1.3.0" + "semver": "^5.1.0", + "stack-parser": "^0.0.1", + "which": "^1.2.4" } }, "grunt-sass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/grunt-sass/-/grunt-sass-2.1.0.tgz", - "integrity": "sha512-XkexnQt/9rhReNd+Y7T0n/2g5FqYOQKfi2iSlpwDqvgs7EgEaGTxNhnWzHnbW5oNRvzL9AHopBG3AgRxL0d+DA==", + "integrity": "sha1-t7odhe9MLZt9gZX+ZfZkrHVU76E=", "dev": true, "requires": { - "each-async": "1.1.1", - "node-sass": "4.9.3", - "object-assign": "4.1.1" + "each-async": "^1.0.0", + "node-sass": "^4.7.2", + "object-assign": "^4.0.1" } }, "grunt-svgmin": { @@ -3090,11 +3104,11 @@ "integrity": "sha1-YQlT3JGuwY9nD8KMbFaW+7gDe7A=", "dev": true, "requires": { - "chalk": "1.1.3", - "each-async": "1.1.1", - "log-symbols": "1.0.2", - "pretty-bytes": "3.0.1", - "svgo": "0.6.6" + "chalk": "^1.0.0", + "each-async": "^1.0.0", + "log-symbols": "^1.0.0", + "pretty-bytes": "^3.0.0", + "svgo": "^0.6.0" } }, "gulp-decompress": { @@ -3103,10 +3117,10 @@ "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=", "dev": true, "requires": { - "archive-type": "3.2.0", - "decompress": "3.0.0", - "gulp-util": "3.0.8", - "readable-stream": "2.3.6" + "archive-type": "^3.0.0", + "decompress": "^3.0.0", + "gulp-util": "^3.0.1", + "readable-stream": "^2.0.2" } }, "gulp-rename": { @@ -3121,11 +3135,11 @@ "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", "dev": true, "requires": { - "convert-source-map": "1.5.1", - "graceful-fs": "4.1.11", - "strip-bom": "2.0.0", - "through2": "2.0.3", - "vinyl": "1.2.0" + "convert-source-map": "^1.1.1", + "graceful-fs": "^4.1.2", + "strip-bom": "^2.0.0", + "through2": "^2.0.0", + "vinyl": "^1.0.0" }, "dependencies": { "through2": { @@ -3134,8 +3148,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } } } @@ -3146,24 +3160,24 @@ "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-uniq": "1.0.3", - "beeper": "1.1.1", - "chalk": "1.1.3", - "dateformat": "2.2.0", - "fancy-log": "1.3.2", - "gulplog": "1.0.0", - "has-gulplog": "0.1.0", - "lodash._reescape": "3.0.0", - "lodash._reevaluate": "3.0.0", - "lodash._reinterpolate": "3.0.0", - "lodash.template": "3.6.2", - "minimist": "1.2.0", - "multipipe": "0.1.2", - "object-assign": "3.0.0", + "array-differ": "^1.0.0", + "array-uniq": "^1.0.2", + "beeper": "^1.0.0", + "chalk": "^1.0.0", + "dateformat": "^2.0.0", + "fancy-log": "^1.1.0", + "gulplog": "^1.0.0", + "has-gulplog": "^0.1.0", + "lodash._reescape": "^3.0.0", + "lodash._reevaluate": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.template": "^3.0.0", + "minimist": "^1.1.0", + "multipipe": "^0.1.2", + "object-assign": "^3.0.0", "replace-ext": "0.0.1", - "through2": "2.0.3", - "vinyl": "0.5.3" + "through2": "^2.0.0", + "vinyl": "^0.5.0" }, "dependencies": { "dateformat": { @@ -3184,8 +3198,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "vinyl": { @@ -3194,8 +3208,8 @@ "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "dev": true, "requires": { - "clone": "1.0.4", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" } } @@ -3207,7 +3221,7 @@ "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, "requires": { - "glogg": "1.0.1" + "glogg": "^1.0.0" } }, "gzip-size": { @@ -3216,8 +3230,8 @@ "integrity": "sha1-Zs+LEBBHInuVus5uodoMF37Vwi8=", "dev": true, "requires": { - "browserify-zlib": "0.1.4", - "concat-stream": "1.6.2" + "browserify-zlib": "^0.1.4", + "concat-stream": "^1.4.1" } }, "har-schema": { @@ -3232,13 +3246,13 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-binary2": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz", - "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==", + "integrity": "sha1-d3asYn8+p3JQz8My2rfd9eT10R0=", "dev": true, "requires": { "isarray": "2.0.1" @@ -3270,7 +3284,7 @@ "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", "dev": true, "requires": { - "sparkles": "1.0.1" + "sparkles": "^1.0.0" } }, "has-unicode": { @@ -3297,10 +3311,10 @@ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", "dev": true, "requires": { - "depd": "1.1.2", + "depd": "~1.1.2", "inherits": "2.0.3", "setprototypeof": "1.1.0", - "statuses": "1.5.0" + "statuses": ">= 1.4.0 < 2" }, "dependencies": { "statuses": { @@ -3323,8 +3337,8 @@ "integrity": "sha1-ZC/cr/5S00SNK9o7AHnpQJBk2jE=", "dev": true, "requires": { - "eventemitter3": "1.2.0", - "requires-port": "1.0.0" + "eventemitter3": "1.x.x", + "requires-port": "1.x.x" } }, "iconv-lite": { @@ -3333,7 +3347,7 @@ "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "dev": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "imagemin": { @@ -3342,16 +3356,16 @@ "integrity": "sha1-6Q5/CTaDZZXxj6Ff6Qb0+iWeqEc=", "dev": true, "requires": { - "buffer-to-vinyl": "1.1.0", - "concat-stream": "1.6.2", - "imagemin-gifsicle": "4.2.0", - "imagemin-jpegtran": "4.3.2", - "imagemin-optipng": "4.3.0", - "imagemin-svgo": "4.2.1", - "optional": "0.1.4", - "readable-stream": "2.3.6", - "stream-combiner2": "1.1.1", - "vinyl-fs": "2.4.4" + "buffer-to-vinyl": "^1.0.0", + "concat-stream": "^1.4.6", + "imagemin-gifsicle": "^4.0.0", + "imagemin-jpegtran": "^4.0.0", + "imagemin-optipng": "^4.0.0", + "imagemin-svgo": "^4.0.0", + "optional": "^0.1.0", + "readable-stream": "^2.0.0", + "stream-combiner2": "^1.1.1", + "vinyl-fs": "^2.1.1" } }, "imagemin-gifsicle": { @@ -3361,9 +3375,9 @@ "dev": true, "optional": true, "requires": { - "gifsicle": "3.0.4", - "is-gif": "1.0.0", - "through2": "0.6.5" + "gifsicle": "^3.0.0", + "is-gif": "^1.0.0", + "through2": "^0.6.1" } }, "imagemin-jpegtran": { @@ -3373,9 +3387,9 @@ "dev": true, "optional": true, "requires": { - "is-jpg": "1.0.1", - "jpegtran-bin": "3.2.0", - "through2": "2.0.3" + "is-jpg": "^1.0.0", + "jpegtran-bin": "^3.0.0", + "through2": "^2.0.0" }, "dependencies": { "through2": { @@ -3385,8 +3399,8 @@ "dev": true, "optional": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } } } @@ -3398,10 +3412,10 @@ "dev": true, "optional": true, "requires": { - "exec-buffer": "2.0.1", - "is-png": "1.1.0", - "optipng-bin": "3.1.4", - "through2": "0.6.5" + "exec-buffer": "^2.0.0", + "is-png": "^1.0.0", + "optipng-bin": "^3.0.0", + "through2": "^0.6.1" } }, "imagemin-svgo": { @@ -3411,9 +3425,9 @@ "dev": true, "optional": true, "requires": { - "is-svg": "1.1.1", - "svgo": "0.6.6", - "through2": "2.0.3" + "is-svg": "^1.0.0", + "svgo": "^0.6.0", + "through2": "^2.0.0" }, "dependencies": { "through2": { @@ -3423,8 +3437,8 @@ "dev": true, "optional": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } } } @@ -3447,7 +3461,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "indexof": { @@ -3462,8 +3476,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -3475,7 +3489,7 @@ "ini": { "version": "1.3.5", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "integrity": "sha1-7uJfVtscnsYIXgwid4CD9Zar+Sc=", "dev": true }, "invert-kv": { @@ -3497,7 +3511,7 @@ "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=", "dev": true, "requires": { - "is-relative": "0.1.3" + "is-relative": "^0.1.0" } }, "is-arrayish": { @@ -3512,13 +3526,13 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", "dev": true }, "is-builtin-module": { @@ -3527,7 +3541,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-bzip2": { @@ -3548,7 +3562,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -3569,7 +3583,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -3578,7 +3592,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-gif": { @@ -3594,7 +3608,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-gzip": { @@ -3622,16 +3636,16 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-number-like": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", - "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", + "integrity": "sha1-LhKWILUIkQQuROm7uzBZPnXPu+M=", "dev": true, "requires": { - "lodash.isfinite": "3.3.2" + "lodash.isfinite": "^3.3.2" } }, "is-obj": { @@ -3705,7 +3719,7 @@ "is-url": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", - "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==", + "integrity": "sha1-BKTfRtKMTP89c9Af8Gq+sxihqlI=", "dev": true }, "is-utf8": { @@ -3766,9 +3780,9 @@ "dev": true, "optional": true, "requires": { - "bin-build": "2.2.0", - "bin-wrapper": "3.0.2", - "logalot": "2.1.0" + "bin-build": "^2.0.0", + "bin-wrapper": "^3.0.0", + "logalot": "^2.0.0" } }, "js-base64": { @@ -3783,8 +3797,8 @@ "integrity": "sha1-A3fDgBfKvHMisNH7zSWkkWQfL74=", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "2.7.3" + "argparse": "^1.0.2", + "esprima": "^2.6.0" } }, "jsbn": { @@ -3812,7 +3826,7 @@ "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", "dev": true, "requires": { - "jsonify": "0.0.0" + "jsonify": "~0.0.0" } }, "json-stringify-safe": { @@ -3827,7 +3841,7 @@ "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsonify": { @@ -3862,7 +3876,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.6" + "is-buffer": "^1.1.5" } }, "lazy-req": { @@ -3878,7 +3892,7 @@ "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.5" } }, "lcid": { @@ -3887,7 +3901,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "limiter": { @@ -3908,11 +3922,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "localtunnel": { @@ -4052,7 +4066,7 @@ "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", "dev": true, "requires": { - "lodash._root": "3.0.1" + "lodash._root": "^3.0.0" } }, "lodash.isarguments": { @@ -4085,15 +4099,15 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" } }, "lodash.mergewith": { "version": "4.6.1", "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz", - "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==", + "integrity": "sha1-Y5BX5ybDr72z59QnQcqo1uQzWSc=", "dev": true }, "lodash.restparam": { @@ -4108,15 +4122,15 @@ "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", "dev": true, "requires": { - "lodash._basecopy": "3.0.1", - "lodash._basetostring": "3.0.1", - "lodash._basevalues": "3.0.0", - "lodash._isiterateecall": "3.0.9", - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0", - "lodash.keys": "3.1.2", - "lodash.restparam": "3.6.1", - "lodash.templatesettings": "3.1.1" + "lodash._basecopy": "^3.0.0", + "lodash._basetostring": "^3.0.0", + "lodash._basevalues": "^3.0.0", + "lodash._isiterateecall": "^3.0.0", + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0", + "lodash.keys": "^3.0.0", + "lodash.restparam": "^3.0.0", + "lodash.templatesettings": "^3.0.0" } }, "lodash.templatesettings": { @@ -4125,8 +4139,8 @@ "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", "dev": true, "requires": { - "lodash._reinterpolate": "3.0.0", - "lodash.escape": "3.2.0" + "lodash._reinterpolate": "^3.0.0", + "lodash.escape": "^3.0.0" } }, "log-symbols": { @@ -4135,7 +4149,7 @@ "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.0.0" } }, "logalot": { @@ -4145,8 +4159,8 @@ "dev": true, "optional": true, "requires": { - "figures": "1.7.0", - "squeak": "1.3.0" + "figures": "^1.3.5", + "squeak": "^1.0.0" } }, "longest": { @@ -4162,14 +4176,14 @@ "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" } }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", - "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=", "dev": true }, "lpad-align": { @@ -4179,10 +4193,10 @@ "dev": true, "optional": true, "requires": { - "get-stdin": "4.0.1", - "indent-string": "2.1.0", - "longest": "1.0.1", - "meow": "3.7.0" + "get-stdin": "^4.0.1", + "indent-string": "^2.1.0", + "longest": "^1.0.0", + "meow": "^3.3.0" } }, "lru-cache": { @@ -4191,8 +4205,8 @@ "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, "map-obj": { @@ -4213,10 +4227,10 @@ "integrity": "sha1-cTZehKmd2Piz99X94vANHn9zvmE=", "dev": true, "requires": { - "chalk": "1.1.3", - "figures": "1.7.0", - "gzip-size": "1.0.0", - "pretty-bytes": "1.0.4" + "chalk": "^1.0.0", + "figures": "^1.0.1", + "gzip-size": "^1.0.0", + "pretty-bytes": "^1.0.0" }, "dependencies": { "pretty-bytes": { @@ -4225,8 +4239,8 @@ "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", "dev": true, "requires": { - "get-stdin": "4.0.1", - "meow": "3.7.0" + "get-stdin": "^4.0.1", + "meow": "^3.1.0" } } } @@ -4237,16 +4251,16 @@ "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" } }, "merge-stream": { @@ -4255,7 +4269,7 @@ "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "micromatch": { @@ -4264,25 +4278,25 @@ "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, "mime": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "integrity": "sha1-Eh+evEnjdm8xGnbh+hyAA8SwOqY=", "dev": true }, "mime-db": { @@ -4297,16 +4311,16 @@ "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "1.33.0" + "mime-db": "~1.33.0" } }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -4353,7 +4367,7 @@ "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", "dev": true, "requires": { - "readable-stream": "1.1.14" + "readable-stream": "~1.1.9" } }, "isarray": { @@ -4368,10 +4382,10 @@ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -4391,16 +4405,16 @@ "neat-omega": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/neat-omega/-/neat-omega-3.0.1.tgz", - "integrity": "sha512-XZ1dykrKAdR+/HanoVIU1XOxCyrXxxnVr8W18Ri9mAntJMNf12XLD91EAnPDawW2ZMUgF7K5etzVUIzeyQXgTw==", + "integrity": "sha1-Rjqo44skR02X0ojEwNZ3eZ4pArQ=", "dev": true, "requires": { - "bourbon-neat": "2.1.0" + "bourbon-neat": "^2" }, "dependencies": { "bourbon-neat": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/bourbon-neat/-/bourbon-neat-2.1.0.tgz", - "integrity": "sha512-zJn8gEIIM2001F08WvX8WJJ24+8P+3i4J2EoaY5ohu4nU5PBak37w8x5jvPdHpoOnj6LwYMdddFlYkM+TvTAlA==", + "integrity": "sha1-syzhAfRHw1xXtugz3nRWf4tfkII=", "dev": true } } @@ -4417,25 +4431,25 @@ "integrity": "sha512-XzXyGjO+84wxyH7fV6IwBOTrEBe2f0a6SBze9QWWYR/cL74AcQUks2AsqcCZenl/Fp/JVbuEaLpgrLtocwBUww==", "dev": true, "requires": { - "async-foreach": "0.1.3", - "chalk": "1.1.3", - "cross-spawn": "3.0.1", - "gaze": "1.1.2", - "get-stdin": "4.0.1", - "glob": "7.1.2", - "in-publish": "2.0.0", - "lodash.assign": "4.2.0", - "lodash.clonedeep": "4.5.0", - "lodash.mergewith": "4.6.1", - "meow": "3.7.0", - "mkdirp": "0.5.1", - "nan": "2.10.0", - "node-gyp": "3.8.0", - "npmlog": "4.1.2", + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash.assign": "^4.2.0", + "lodash.clonedeep": "^4.3.2", + "lodash.mergewith": "^4.6.0", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.10.0", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", "request": "2.87.0", - "sass-graph": "2.2.4", - "stdout-stream": "1.4.0", - "true-case-path": "1.0.2" + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" }, "dependencies": { "assert-plus": { @@ -4462,9 +4476,9 @@ "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "dev": true, "requires": { - "asynckit": "0.4.0", + "asynckit": "^0.4.0", "combined-stream": "1.0.6", - "mime-types": "2.1.18" + "mime-types": "^2.1.12" } }, "har-validator": { @@ -4473,8 +4487,8 @@ "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, "requires": { - "ajv": "5.5.2", - "har-schema": "2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" } }, "http-signature": { @@ -4483,9 +4497,9 @@ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "1.0.0", - "jsprim": "1.4.1", - "sshpk": "1.14.1" + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" } }, "node-gyp": { @@ -4494,18 +4508,18 @@ "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", "dev": true, "requires": { - "fstream": "1.0.11", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "npmlog": "4.1.2", - "osenv": "0.1.5", - "request": "2.87.0", - "rimraf": "2.6.2", - "semver": "5.3.0", - "tar": "2.2.1", - "which": "1.3.0" + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" } }, "qs": { @@ -4520,26 +4534,26 @@ "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "dev": true, "requires": { - "aws-sign2": "0.7.0", - "aws4": "1.7.0", - "caseless": "0.12.0", - "combined-stream": "1.0.6", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.3.2", - "har-validator": "5.0.3", - "http-signature": "1.2.0", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.18", - "oauth-sign": "0.8.2", - "performance-now": "2.1.0", - "qs": "6.5.2", - "safe-buffer": "5.1.2", - "tough-cookie": "2.3.4", - "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "semver": { @@ -4554,7 +4568,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "^5.0.1" } } } @@ -4571,19 +4585,19 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.1.1" + "abbrev": "1" } }, "normalize-package-data": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=", "dev": true, "requires": { - "hosted-git-info": "2.6.0", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -4592,7 +4606,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.1.0" + "remove-trailing-separator": "^1.0.1" } }, "normalize.css": { @@ -4604,13 +4618,13 @@ "npmlog": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", - "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=", "dev": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "num2fraction": { @@ -4655,8 +4669,8 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" } }, "on-finished": { @@ -4674,7 +4688,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -4692,7 +4706,7 @@ "optional": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz", - "integrity": "sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==", + "integrity": "sha1-zbGpvtxzfSAl9pDO61DgSURP1bM=", "dev": true }, "optipng-bin": { @@ -4702,9 +4716,9 @@ "dev": true, "optional": true, "requires": { - "bin-build": "2.2.0", - "bin-wrapper": "3.0.2", - "logalot": "2.1.0" + "bin-build": "^2.0.0", + "bin-wrapper": "^3.0.0", + "logalot": "^2.0.0" } }, "ordered-read-streams": { @@ -4713,8 +4727,8 @@ "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", "dev": true, "requires": { - "is-stream": "1.1.0", - "readable-stream": "2.3.6" + "is-stream": "^1.0.1", + "readable-stream": "^2.0.1" } }, "os-filter-obj": { @@ -4736,7 +4750,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -4748,11 +4762,11 @@ "osenv": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", - "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "pako": { @@ -4767,10 +4781,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parse-json": { @@ -4779,7 +4793,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "parseqs": { @@ -4788,7 +4802,7 @@ "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseuri": { @@ -4797,7 +4811,7 @@ "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", "dev": true, "requires": { - "better-assert": "1.0.2" + "better-assert": "~1.0.0" } }, "parseurl": { @@ -4818,7 +4832,7 @@ "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -4833,9 +4847,9 @@ "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pend": { @@ -4868,7 +4882,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "portscanner": { @@ -4878,7 +4892,7 @@ "dev": true, "requires": { "async": "1.5.2", - "is-number-like": "1.0.8" + "is-number-like": "^1.0.3" } }, "postcss": { @@ -4887,9 +4901,9 @@ "integrity": "sha1-TESbTIr53zyvbTf44eV10DYXWNw=", "dev": true, "requires": { - "es6-promise": "2.3.0", - "js-base64": "2.1.9", - "source-map": "0.4.4" + "es6-promise": "~2.3.0", + "js-base64": "~2.1.8", + "source-map": "~0.4.2" }, "dependencies": { "js-base64": { @@ -4918,13 +4932,13 @@ "integrity": "sha1-J9AAjXeAY6C0gRuzXHnxvV1fvM8=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "process-nextick-args": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o=", "dev": true }, "pseudomap": { @@ -4951,9 +4965,9 @@ "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", "dev": true, "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" + "is-number": "^4.0.0", + "kind-of": "^6.0.0", + "math-random": "^1.0.1" }, "dependencies": { "is-number": { @@ -4979,7 +4993,7 @@ "raw-body": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", - "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", + "integrity": "sha1-GzJOzmtXBuFThVvBFIxlu39uoMM=", "dev": true, "requires": { "bytes": "3.0.0", @@ -4994,10 +5008,10 @@ "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "dev": true, "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.5.1", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" } }, "read-all-stream": { @@ -5006,8 +5020,8 @@ "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", "dev": true, "requires": { - "pinkie-promise": "2.0.1", - "readable-stream": "2.3.6" + "pinkie-promise": "^2.0.0", + "readable-stream": "^2.0.0" } }, "read-pkg": { @@ -5016,9 +5030,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -5027,23 +5041,23 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -5052,10 +5066,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "redent": { @@ -5064,17 +5078,17 @@ "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" } }, "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", "dev": true, "requires": { - "is-equal-shallow": "0.1.3" + "is-equal-shallow": "^0.1.3" } }, "remove-trailing-separator": { @@ -5101,7 +5115,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "replace-ext": { @@ -5140,8 +5154,8 @@ "integrity": "sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=", "dev": true, "requires": { - "debug": "2.6.9", - "minimatch": "3.0.4" + "debug": "^2.2.0", + "minimatch": "^3.0.2" } }, "rimraf": { @@ -5150,7 +5164,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "rx": { @@ -5162,7 +5176,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=", "dev": true }, "safe-json-parse": { @@ -5174,7 +5188,7 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=", "dev": true }, "sass-graph": { @@ -5183,16 +5197,16 @@ "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", "dev": true, "requires": { - "glob": "7.1.2", - "lodash": "4.17.10", - "scss-tokenizer": "0.2.3", - "yargs": "7.1.0" + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^7.0.0" } }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", "dev": true }, "scss-tokenizer": { @@ -5201,8 +5215,8 @@ "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "dev": true, "requires": { - "js-base64": "2.4.3", - "source-map": "0.4.4" + "js-base64": "^2.1.8", + "source-map": "^0.4.2" } }, "seek-bzip": { @@ -5211,7 +5225,7 @@ "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", "dev": true, "requires": { - "commander": "2.8.1" + "commander": "~2.8.1" }, "dependencies": { "commander": { @@ -5220,7 +5234,7 @@ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } } } @@ -5245,34 +5259,34 @@ "dev": true, "optional": true, "requires": { - "semver": "5.5.0" + "semver": "^5.3.0" } }, "send": { "version": "0.16.2", "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "integrity": "sha1-bsyh4PjBVtFBWXVZhI32RzCmu8E=", "dev": true, "requires": { "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", "fresh": "0.5.2", - "http-errors": "1.6.3", + "http-errors": "~1.6.2", "mime": "1.4.1", "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" + "on-finished": "~2.3.0", + "range-parser": "~1.2.0", + "statuses": "~1.4.0" }, "dependencies": { "statuses": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", + "integrity": "sha1-u3PURtonlhBu/MG2AaJT1sRr0Ic=", "dev": true } } @@ -5280,12 +5294,12 @@ "serve-static": { "version": "1.13.2", "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "integrity": "sha1-CV6Ecv1bRiN9tQzkhqQ/S4bGzsE=", "dev": true, "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.2", "send": "0.16.2" } }, @@ -5310,7 +5324,7 @@ "setprototypeof": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY=", "dev": true }, "signal-exit": { @@ -5335,14 +5349,14 @@ "base64-arraybuffer": "0.1.5", "component-bind": "1.0.0", "component-emitter": "1.2.1", - "debug": "2.6.9", - "engine.io-client": "3.1.6", + "debug": "~2.6.4", + "engine.io-client": "~3.1.0", "has-cors": "1.1.0", "indexof": "0.0.1", "object-component": "0.0.3", "parseqs": "0.0.5", "parseuri": "0.0.5", - "socket.io-parser": "3.1.3", + "socket.io-parser": "~3.1.1", "to-array": "0.1.4" } }, @@ -5353,8 +5367,8 @@ "dev": true, "requires": { "component-emitter": "1.2.1", - "debug": "3.1.0", - "has-binary2": "1.0.3", + "debug": "~3.1.0", + "has-binary2": "~1.0.2", "isarray": "2.0.1" }, "dependencies": { @@ -5381,13 +5395,13 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } }, "sparkles": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz", - "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==", + "integrity": "sha1-AI22XtzmxQ7sDF4ijhlFBh3QQ3w=", "dev": true }, "spdx-correct": { @@ -5396,8 +5410,8 @@ "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", "dev": true, "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { @@ -5409,11 +5423,11 @@ "spdx-expression-parse": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", "dev": true, "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { @@ -5435,9 +5449,9 @@ "dev": true, "optional": true, "requires": { - "chalk": "1.1.3", - "console-stream": "0.1.1", - "lpad-align": "1.1.2" + "chalk": "^1.0.0", + "console-stream": "^0.1.1", + "lpad-align": "^1.0.1" } }, "sshpk": { @@ -5446,14 +5460,14 @@ "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "dev": true, "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" }, "dependencies": { "assert-plus": { @@ -5488,7 +5502,7 @@ "integrity": "sha1-osfIWH5U2UJ+qe2zrD8s1SLfN4s=", "dev": true, "requires": { - "readable-stream": "2.3.6" + "readable-stream": "^2.0.1" } }, "stream-combiner2": { @@ -5497,8 +5511,8 @@ "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", "dev": true, "requires": { - "duplexer2": "0.1.4", - "readable-stream": "2.3.6" + "duplexer2": "~0.1.0", + "readable-stream": "^2.0.2" } }, "stream-shift": { @@ -5513,8 +5527,8 @@ "integrity": "sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=", "dev": true, "requires": { - "commander": "2.15.1", - "limiter": "1.1.3" + "commander": "^2.2.0", + "limiter": "^1.0.5" } }, "string-template": { @@ -5529,18 +5543,18 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "dev": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -5549,7 +5563,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -5558,7 +5572,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-bom-stream": { @@ -5567,8 +5581,8 @@ "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", "dev": true, "requires": { - "first-chunk-stream": "1.0.0", - "strip-bom": "2.0.0" + "first-chunk-stream": "^1.0.0", + "strip-bom": "^2.0.0" } }, "strip-dirs": { @@ -5577,12 +5591,12 @@ "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", "dev": true, "requires": { - "chalk": "1.1.3", - "get-stdin": "4.0.1", - "is-absolute": "0.1.7", - "is-natural-number": "2.1.1", - "minimist": "1.2.0", - "sum-up": "1.0.3" + "chalk": "^1.0.0", + "get-stdin": "^4.0.1", + "is-absolute": "^0.1.5", + "is-natural-number": "^2.0.0", + "minimist": "^1.1.0", + "sum-up": "^1.0.1" } }, "strip-indent": { @@ -5591,7 +5605,7 @@ "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, "requires": { - "get-stdin": "4.0.1" + "get-stdin": "^4.0.1" } }, "strip-json-comments": { @@ -5603,10 +5617,10 @@ "strip-outer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", - "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", + "integrity": "sha1-sv0qv2YEudHmATBXGV34Nrip1jE=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.2" } }, "sum-up": { @@ -5615,7 +5629,7 @@ "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.0.0" } }, "supports-color": { @@ -5630,13 +5644,13 @@ "integrity": "sha1-s0CIkDbyD5tEdUMHfQ9Vc+0ETAg=", "dev": true, "requires": { - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.0.0", - "js-yaml": "3.6.1", - "mkdirp": "0.5.1", - "sax": "1.2.4", - "whet.extend": "0.9.9" + "coa": "~1.0.1", + "colors": "~1.1.2", + "csso": "~2.0.0", + "js-yaml": "~3.6.0", + "mkdirp": "~0.5.1", + "sax": "~1.2.1", + "whet.extend": "~0.9.9" }, "dependencies": { "js-yaml": { @@ -5645,8 +5659,8 @@ "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=", "dev": true, "requires": { - "argparse": "1.0.10", - "esprima": "2.7.3" + "argparse": "^1.0.7", + "esprima": "^2.6.0" } } } @@ -5657,9 +5671,9 @@ "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", "dev": true, "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" + "block-stream": "*", + "fstream": "^1.0.2", + "inherits": "2" } }, "tar-stream": { @@ -5668,13 +5682,13 @@ "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==", "dev": true, "requires": { - "bl": "1.2.2", - "buffer-alloc": "1.1.0", - "end-of-stream": "1.4.1", - "fs-constants": "1.0.0", - "readable-stream": "2.3.6", - "to-buffer": "1.1.1", - "xtend": "4.0.1" + "bl": "^1.0.0", + "buffer-alloc": "^1.1.0", + "end-of-stream": "^1.0.0", + "fs-constants": "^1.0.0", + "readable-stream": "^2.3.0", + "to-buffer": "^1.1.0", + "xtend": "^4.0.0" } }, "tempfile": { @@ -5683,8 +5697,8 @@ "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=", "dev": true, "requires": { - "os-tmpdir": "1.0.2", - "uuid": "2.0.3" + "os-tmpdir": "^1.0.0", + "uuid": "^2.0.1" }, "dependencies": { "uuid": { @@ -5701,8 +5715,8 @@ "integrity": "sha1-OORBT8ZJd9h6/apy+sttKfgve1s=", "dev": true, "requires": { - "chalk": "1.1.3", - "object-path": "0.9.2" + "chalk": "^1.1.1", + "object-path": "^0.9.0" } }, "through2": { @@ -5711,8 +5725,8 @@ "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "dev": true, "requires": { - "readable-stream": "1.0.34", - "xtend": "4.0.1" + "readable-stream": ">=1.0.33-1 <1.1.0-0", + "xtend": ">=4.0.0 <4.1.0-0" }, "dependencies": { "isarray": { @@ -5727,10 +5741,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -5747,8 +5761,8 @@ "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", "dev": true, "requires": { - "through2": "2.0.3", - "xtend": "4.0.1" + "through2": "~2.0.0", + "xtend": "~4.0.0" }, "dependencies": { "through2": { @@ -5757,8 +5771,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } } } @@ -5778,15 +5792,15 @@ "tiny-lr": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-1.1.1.tgz", - "integrity": "sha512-44yhA3tsaRoMOjQQ+5v5mVdqef+kH6Qze9jTpqtVufgYjYt08zyZAwNwwVBj3i1rJMnR52IxOW0LK0vBzgAkuA==", + "integrity": "sha1-n6VHQS8jj+2waO4pWvi2gsmLKqs=", "dev": true, "requires": { - "body": "5.1.0", - "debug": "3.1.0", - "faye-websocket": "0.10.0", - "livereload-js": "2.3.0", - "object-assign": "4.1.1", - "qs": "6.5.2" + "body": "^5.1.0", + "debug": "^3.1.0", + "faye-websocket": "~0.10.0", + "livereload-js": "^2.3.0", + "object-assign": "^4.1.0", + "qs": "^6.4.0" }, "dependencies": { "debug": { @@ -5812,7 +5826,7 @@ "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", "dev": true, "requires": { - "extend-shallow": "2.0.1" + "extend-shallow": "^2.0.1" } }, "to-array": { @@ -5824,7 +5838,7 @@ "to-buffer": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz", - "integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==", + "integrity": "sha1-STvUj2LXxD/N7TE6A9ytsuEhOoA=", "dev": true }, "tough-cookie": { @@ -5833,7 +5847,7 @@ "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "dev": true, "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, "trim-newlines": { @@ -5848,7 +5862,7 @@ "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.2" } }, "true-case-path": { @@ -5857,7 +5871,7 @@ "integrity": "sha1-fskRMJJHZsf1c74wIMNPj9/QDWI=", "dev": true, "requires": { - "glob": "6.0.4" + "glob": "^6.0.4" }, "dependencies": { "glob": { @@ -5866,11 +5880,11 @@ "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -5897,7 +5911,7 @@ "ua-parser-js": { "version": "0.7.17", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz", - "integrity": "sha512-uRdSdu1oA1rncCQL7sCj8vSyZkgtL7faaw9Tc9rZ3mGgraQ7+Pdx7w5mnOSF3gw9ZNG6oc+KXfkon3bKuROm0g==", + "integrity": "sha1-6exflJi57JEOeuOsYmqAXE0J7Kw=", "dev": true }, "uglify-js": { @@ -5906,8 +5920,8 @@ "integrity": "sha512-hobogryjDV36VrLK3Y69ou4REyrTApzUblVFmdQOYRe8cYaSmFJXMb4dR9McdvYDSbeNdzUgYr2YVukJaErJcA==", "dev": true, "requires": { - "commander": "2.15.1", - "source-map": "0.6.1" + "commander": "~2.15.0", + "source-map": "~0.6.1" }, "dependencies": { "source-map": { @@ -5921,7 +5935,7 @@ "ultron": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "integrity": "sha1-n+FTahCmZKZSZqHjzPhf02MCvJw=", "dev": true }, "underscore.string": { @@ -5930,8 +5944,8 @@ "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=", "dev": true, "requires": { - "sprintf-js": "1.0.3", - "util-deprecate": "1.0.2" + "sprintf-js": "^1.0.3", + "util-deprecate": "^1.0.2" } }, "unique-stream": { @@ -5940,8 +5954,8 @@ "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", "dev": true, "requires": { - "json-stable-stringify": "1.0.1", - "through2-filter": "2.0.0" + "json-stable-stringify": "^1.0.0", + "through2-filter": "^2.0.0" } }, "universalify": { @@ -5974,7 +5988,7 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "1.0.4" + "prepend-http": "^1.0.1" } }, "url-regex": { @@ -5984,7 +5998,7 @@ "dev": true, "optional": true, "requires": { - "ip-regex": "1.0.3" + "ip-regex": "^1.0.1" } }, "util-deprecate": { @@ -6011,8 +6025,8 @@ "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", "dev": true, "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "verror": { @@ -6021,9 +6035,9 @@ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" }, "dependencies": { "assert-plus": { @@ -6040,8 +6054,8 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { - "clone": "1.0.4", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" } }, @@ -6051,8 +6065,8 @@ "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=", "dev": true, "requires": { - "object-assign": "4.1.1", - "readable-stream": "2.3.6" + "object-assign": "^4.0.1", + "readable-stream": "^2.0.0" } }, "vinyl-fs": { @@ -6061,23 +6075,23 @@ "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", "dev": true, "requires": { - "duplexify": "3.6.0", - "glob-stream": "5.3.5", - "graceful-fs": "4.1.11", + "duplexify": "^3.2.0", + "glob-stream": "^5.3.2", + "graceful-fs": "^4.0.0", "gulp-sourcemaps": "1.6.0", - "is-valid-glob": "0.3.0", - "lazystream": "1.0.0", - "lodash.isequal": "4.5.0", - "merge-stream": "1.0.1", - "mkdirp": "0.5.1", - "object-assign": "4.1.1", - "readable-stream": "2.3.6", - "strip-bom": "2.0.0", - "strip-bom-stream": "1.0.0", - "through2": "2.0.3", - "through2-filter": "2.0.0", - "vali-date": "1.0.0", - "vinyl": "1.2.0" + "is-valid-glob": "^0.3.0", + "lazystream": "^1.0.0", + "lodash.isequal": "^4.0.0", + "merge-stream": "^1.0.0", + "mkdirp": "^0.5.0", + "object-assign": "^4.0.0", + "readable-stream": "^2.0.4", + "strip-bom": "^2.0.0", + "strip-bom-stream": "^1.0.0", + "through2": "^2.0.0", + "through2-filter": "^2.0.0", + "vali-date": "^1.0.0", + "vinyl": "^1.0.0" }, "dependencies": { "through2": { @@ -6086,8 +6100,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } } } @@ -6098,7 +6112,7 @@ "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=", "dev": true, "requires": { - "wrap-fn": "0.1.5" + "wrap-fn": "^0.1.0" } }, "websocket-driver": { @@ -6107,14 +6121,14 @@ "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", "dev": true, "requires": { - "http-parser-js": "0.4.12", - "websocket-extensions": "0.1.3" + "http-parser-js": ">=0.4.0", + "websocket-extensions": ">=0.1.1" } }, "websocket-extensions": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", + "integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=", "dev": true }, "whet.extend": { @@ -6129,7 +6143,7 @@ "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -6144,7 +6158,7 @@ "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", "dev": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "win-spawn": { @@ -6165,8 +6179,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrap-fn": { @@ -6190,9 +6204,9 @@ "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, "requires": { - "async-limiter": "1.0.0", - "safe-buffer": "5.1.2", - "ultron": "1.1.1" + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" } }, "xmlhttprequest-ssl": { @@ -6225,19 +6239,19 @@ "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", "dev": true, "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "5.0.0" + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" }, "dependencies": { "camelcase": { @@ -6254,7 +6268,7 @@ "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", "dev": true, "requires": { - "camelcase": "3.0.0" + "camelcase": "^3.0.0" }, "dependencies": { "camelcase": { @@ -6271,8 +6285,8 @@ "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=", "dev": true, "requires": { - "buffer-crc32": "0.2.13", - "fd-slicer": "1.0.1" + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.0.1" } }, "yeast": { diff --git a/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss b/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss index 64fcd74a30..cc33c45675 100644 --- a/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss +++ b/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss @@ -7,7 +7,7 @@ .content-header, .layout-container { - max-width: 750px; + max-width: 600px; margin: 0 auto; } @@ -23,4 +23,28 @@ padding: 10px; position: relative; color: #b1040e; + + &:after { + content: "\f054"; + font-family: "Font Awesome 5 Free"; + font-weight: 900; + font-style: normal; + font-variant: normal; + text-rendering: auto; + line-height: 1; + color: #9e9e9e; + position: absolute; + top: calc(50% - 10px); + font-size: 20px; + right: 20px; + } +} + +h1 { + margin: 2.1rem 0 1.68rem 0; + font-weight: 200; + line-height: 110%; + font-size: 2.5rem; + color: #9e9e9e; + font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif; } From c0e87dac990fffe8c206ff1889ca3827ffea0a45 Mon Sep 17 00:00:00 2001 From: pookmish Date: Thu, 7 Feb 2019 16:43:33 -0800 Subject: [PATCH 08/25] HSD8-312 HSD8-504 Show external link icon and style to match (#164) * HSD8-312 HSD8-504 Show external link icon and style to match * updated font awesome --- composer.lock | 2 +- config/default/extlink.settings.yml | 13 ++++---- config/default/fontawesome.settings.yml | 2 +- .../archaeology/archaeology.libraries.yml | 1 + .../themes/humsci/archaeology/css/base.css | 2 +- .../humsci/archaeology/css/ckeditor.css | 2 +- .../humsci/archaeology/package-lock.json | 28 ++++++++++++----- .../themes/humsci/archaeology/scss/base.scss | 23 ++++++++++---- .../humsci/su_humsci_theme/css/base/index.css | 2 +- .../su_humsci_theme/js/su_humsci_theme.js | 13 +++++--- .../horizontal-card/horizontal-card.html.twig | 2 +- .../su_humsci_theme/scss/base/_global.scss | 30 +++++++++++++++++++ .../scss/utilities/mixins/_heading-dash.scss | 7 ++--- 13 files changed, 95 insertions(+), 32 deletions(-) diff --git a/composer.lock b/composer.lock index f051a13ad5..8a92bb39f5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ccf7bab6f41a35bac816aba9a38453cc", + "content-hash": "3985a18ec0b56b78187fa234b2eb56d6", "packages": [ { "name": "acquia/blt", diff --git a/config/default/extlink.settings.yml b/config/default/extlink.settings.yml index 3b6eef7e51..628590c3a2 100644 --- a/config/default/extlink.settings.yml +++ b/config/default/extlink.settings.yml @@ -7,14 +7,17 @@ extlink_alert: false extlink_alert_text: 'This link will take you to an external web site. We are not responsible for their content.' extlink_exclude: '' extlink_include: '' -extlink_class: '0' +extlink_class: ext extlink_label: '(link is external)' extlink_img_class: false -extlink_css_exclude: '' +extlink_css_exclude: '.text-long, .text-with-summary, #footer__global-footer, #header' extlink_css_explicit: '' -extlink_mailto_class: '0' +extlink_mailto_class: mailto extlink_mailto_label: '(link sends email)' -extlink_use_font_awesome: false -extlink_icon_placement: append +extlink_use_font_awesome: true +extlink_icon_placement: '0' _core: default_config_hash: cYhWIXP1HeTp9W72NUNTZnrj5MKx_CPcLcvXGg1i6J0 +extlink_font_awesome_classes: + links: 'fas fa-arrow-right' + mailto: 'far fa-envelope' diff --git a/config/default/fontawesome.settings.yml b/config/default/fontawesome.settings.yml index 790661d27c..d6db617c76 100644 --- a/config/default/fontawesome.settings.yml +++ b/config/default/fontawesome.settings.yml @@ -1,7 +1,7 @@ tag: span method: webfonts use_cdn: true -external_svg_location: 'https://use.fontawesome.com/releases/v5.1.0/css/all.css' +external_svg_location: 'https://use.fontawesome.com/releases/v5.7.1/css/all.css' use_shim: false external_shim_location: 'https://use.fontawesome.com/releases/v5.1.1/js/v4-shims.js' _core: diff --git a/docroot/themes/humsci/archaeology/archaeology.libraries.yml b/docroot/themes/humsci/archaeology/archaeology.libraries.yml index f8e82fd919..658e2739e4 100644 --- a/docroot/themes/humsci/archaeology/archaeology.libraries.yml +++ b/docroot/themes/humsci/archaeology/archaeology.libraries.yml @@ -1,4 +1,5 @@ base: + version: VERSION css: theme: css/base.css: {} diff --git a/docroot/themes/humsci/archaeology/css/base.css b/docroot/themes/humsci/archaeology/css/base.css index a33d162463..45501d27c1 100644 --- a/docroot/themes/humsci/archaeology/css/base.css +++ b/docroot/themes/humsci/archaeology/css/base.css @@ -1 +1 @@ -.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap}h1::after{border-bottom:.2em solid #eaab00;content:'';display:block;width:1.125em;padding-top:.1em}h1.no-dash::after{display:none}h2::after{border-bottom:4px solid #eaab00;content:'';display:block;width:40px;padding-top:.1em}h2.no-dash::after{display:none}h2.text-align-center:after{margin:0 auto}h3::after{border-bottom:3px solid #eaab00;content:'';display:block;width:30px;padding-top:.1em}h3.no-dash::after{display:none}h4::after{border-bottom:3px solid #eaab00;content:'';display:block;width:25px;padding-top:.1em}h4.no-dash::after{display:none}h5::after,h6::after{border-bottom:2px solid #eaab00;content:'';display:block;width:20px;padding-top:.1em}h5.no-dash::after,h6.no-dash::after{display:none}.horizontal-card__title:after,.horizontal-card__title h2:after,h2.vertical-link-card__title:after,.date-stacked-vertical-card__content-container h2:after,h2#menu-blockmain-menu:after,#footer h2:after,.field-hs-person-title h3:after,.view.duplicate-of-news h2.vertical-card__title:after,.view.hs-publications h2:after{content:none}.three-column-w-image .main-below::before{border-bottom:.25em solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:2.125em;margin-right:10px}.accent-dash::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-field-field-hs-publication-type .masonry-item--type::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-element-container .more-link{text-align:center}.views-element-container .decanter-button{margin-top:0}.views-field-field-hs-person-research .decanter-button--secondary{margin-bottom:0}.main-container .menu--main .menu-item--active-trail.menu-item--expanded>a,.main-container .menu--main a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary.ui-menu li.menu-item--active-trail .ui-menu-item-wrapper,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-content .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-header .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary a.ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button.ui-state-active:hover{border-bottom-color:#eaab00}.front .hs-basic-page.field-hs-page-hero{margin-bottom:.5em}.centered-font-lead{font-size:3rem;max-width:85rem;margin-right:auto;margin-left:auto} +.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap}h1::after,a.heading-link-h1::after{border-bottom:.2em solid #eaab00;content:'';display:block;width:1.125em;padding-top:.1em}h1.no-dash::after,a[data-extlink] h1:after,a.heading-link-h1.no-dash::after,a[data-extlink] a.heading-link-h1:after{content:unset}h2::after,a.heading-link-h2::after{border-bottom:4px solid #eaab00;content:'';display:block;width:40px;padding-top:.1em}h2.no-dash::after,a[data-extlink] h2:after,a.heading-link-h2.no-dash::after,a[data-extlink] a.heading-link-h2:after{content:unset}h2.text-align-center:after,a.heading-link-h2.text-align-center:after{margin:0 auto}h3::after,a.heading-link-h3::after{border-bottom:3px solid #eaab00;content:'';display:block;width:30px;padding-top:.1em}h3.no-dash::after,a[data-extlink] h3:after,a.heading-link-h3.no-dash::after,a[data-extlink] a.heading-link-h3:after{content:unset}h4::after,a.heading-link-h4::after{border-bottom:3px solid #eaab00;content:'';display:block;width:25px;padding-top:.1em}h4.no-dash::after,a[data-extlink] h4:after,a.heading-link-h4.no-dash::after,a[data-extlink] a.heading-link-h4:after{content:unset}h5::after,h6::after,a.heading-link-h5::after,a.heading-link-h6::after{border-bottom:2px solid #eaab00;content:'';display:block;width:20px;padding-top:.1em}h5.no-dash::after,a[data-extlink] h5:after,h6.no-dash::after,a[data-extlink] h6:after,a.heading-link-h5.no-dash::after,a[data-extlink] a.heading-link-h5:after,a.heading-link-h6.no-dash::after,a[data-extlink] a.heading-link-h6:after{content:unset}a[class*="heading-link-"]{display:block}.horizontal-card__title:after,.horizontal-card__title a[class*="heading-link"]:after,.horizontal-card__title h2:after,h2.vertical-link-card__title:after,.date-stacked-vertical-card__content-container h2:after,h2#menu-blockmain-menu:after,#footer h2:after,.field-hs-person-title h3:after,.view.duplicate-of-news h2.vertical-card__title:after,.view.hs-publications h2:after{content:unset}.three-column-w-image .main-below::before{border-bottom:.25em solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:2.125em;margin-right:10px}.accent-dash::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-field-field-hs-publication-type .masonry-item--type::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-element-container .more-link{text-align:center}.views-element-container .decanter-button{margin-top:0}.views-field-field-hs-person-research .decanter-button--secondary{margin-bottom:0}.main-container .menu--main .menu-item--active-trail.menu-item--expanded>a,.main-container .menu--main a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary.ui-menu li.menu-item--active-trail .ui-menu-item-wrapper,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-content .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-header .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary a.ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button.ui-state-active:hover{border-bottom-color:#eaab00}.front .hs-basic-page.field-hs-page-hero{margin-bottom:.5em}.centered-font-lead{font-size:3rem;max-width:85rem;margin-right:auto;margin-left:auto} diff --git a/docroot/themes/humsci/archaeology/css/ckeditor.css b/docroot/themes/humsci/archaeology/css/ckeditor.css index a33d162463..45501d27c1 100644 --- a/docroot/themes/humsci/archaeology/css/ckeditor.css +++ b/docroot/themes/humsci/archaeology/css/ckeditor.css @@ -1 +1 @@ -.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap}h1::after{border-bottom:.2em solid #eaab00;content:'';display:block;width:1.125em;padding-top:.1em}h1.no-dash::after{display:none}h2::after{border-bottom:4px solid #eaab00;content:'';display:block;width:40px;padding-top:.1em}h2.no-dash::after{display:none}h2.text-align-center:after{margin:0 auto}h3::after{border-bottom:3px solid #eaab00;content:'';display:block;width:30px;padding-top:.1em}h3.no-dash::after{display:none}h4::after{border-bottom:3px solid #eaab00;content:'';display:block;width:25px;padding-top:.1em}h4.no-dash::after{display:none}h5::after,h6::after{border-bottom:2px solid #eaab00;content:'';display:block;width:20px;padding-top:.1em}h5.no-dash::after,h6.no-dash::after{display:none}.horizontal-card__title:after,.horizontal-card__title h2:after,h2.vertical-link-card__title:after,.date-stacked-vertical-card__content-container h2:after,h2#menu-blockmain-menu:after,#footer h2:after,.field-hs-person-title h3:after,.view.duplicate-of-news h2.vertical-card__title:after,.view.hs-publications h2:after{content:none}.three-column-w-image .main-below::before{border-bottom:.25em solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:2.125em;margin-right:10px}.accent-dash::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-field-field-hs-publication-type .masonry-item--type::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-element-container .more-link{text-align:center}.views-element-container .decanter-button{margin-top:0}.views-field-field-hs-person-research .decanter-button--secondary{margin-bottom:0}.main-container .menu--main .menu-item--active-trail.menu-item--expanded>a,.main-container .menu--main a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary.ui-menu li.menu-item--active-trail .ui-menu-item-wrapper,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-content .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-header .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary a.ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button.ui-state-active:hover{border-bottom-color:#eaab00}.front .hs-basic-page.field-hs-page-hero{margin-bottom:.5em}.centered-font-lead{font-size:3rem;max-width:85rem;margin-right:auto;margin-left:auto} +.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap}h1::after,a.heading-link-h1::after{border-bottom:.2em solid #eaab00;content:'';display:block;width:1.125em;padding-top:.1em}h1.no-dash::after,a[data-extlink] h1:after,a.heading-link-h1.no-dash::after,a[data-extlink] a.heading-link-h1:after{content:unset}h2::after,a.heading-link-h2::after{border-bottom:4px solid #eaab00;content:'';display:block;width:40px;padding-top:.1em}h2.no-dash::after,a[data-extlink] h2:after,a.heading-link-h2.no-dash::after,a[data-extlink] a.heading-link-h2:after{content:unset}h2.text-align-center:after,a.heading-link-h2.text-align-center:after{margin:0 auto}h3::after,a.heading-link-h3::after{border-bottom:3px solid #eaab00;content:'';display:block;width:30px;padding-top:.1em}h3.no-dash::after,a[data-extlink] h3:after,a.heading-link-h3.no-dash::after,a[data-extlink] a.heading-link-h3:after{content:unset}h4::after,a.heading-link-h4::after{border-bottom:3px solid #eaab00;content:'';display:block;width:25px;padding-top:.1em}h4.no-dash::after,a[data-extlink] h4:after,a.heading-link-h4.no-dash::after,a[data-extlink] a.heading-link-h4:after{content:unset}h5::after,h6::after,a.heading-link-h5::after,a.heading-link-h6::after{border-bottom:2px solid #eaab00;content:'';display:block;width:20px;padding-top:.1em}h5.no-dash::after,a[data-extlink] h5:after,h6.no-dash::after,a[data-extlink] h6:after,a.heading-link-h5.no-dash::after,a[data-extlink] a.heading-link-h5:after,a.heading-link-h6.no-dash::after,a[data-extlink] a.heading-link-h6:after{content:unset}a[class*="heading-link-"]{display:block}.horizontal-card__title:after,.horizontal-card__title a[class*="heading-link"]:after,.horizontal-card__title h2:after,h2.vertical-link-card__title:after,.date-stacked-vertical-card__content-container h2:after,h2#menu-blockmain-menu:after,#footer h2:after,.field-hs-person-title h3:after,.view.duplicate-of-news h2.vertical-card__title:after,.view.hs-publications h2:after{content:unset}.three-column-w-image .main-below::before{border-bottom:.25em solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:2.125em;margin-right:10px}.accent-dash::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-field-field-hs-publication-type .masonry-item--type::before{border-bottom:2px solid #eaab00;content:'';display:inline-block;vertical-align:middle;width:20px;margin-right:10px}.views-element-container .more-link{text-align:center}.views-element-container .decanter-button{margin-top:0}.views-field-field-hs-person-research .decanter-button--secondary{margin-bottom:0}.main-container .menu--main .menu-item--active-trail.menu-item--expanded>a,.main-container .menu--main a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal a.is-active{border-left-color:#eaab00}.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary.ui-menu li.menu-item--active-trail .ui-menu-item-wrapper,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-content .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-widget-header .ui-state-active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary a.ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button:active,.js #header .decanter-main-menu--hover-reveal .ui-menu.decanter-nav-primary .ui-button.ui-state-active:hover{border-bottom-color:#eaab00}.front .hs-basic-page.field-hs-page-hero{margin-bottom:.5em}.centered-font-lead{font-size:3rem;max-width:85rem;margin-right:auto;margin-left:auto} diff --git a/docroot/themes/humsci/archaeology/package-lock.json b/docroot/themes/humsci/archaeology/package-lock.json index 8e0172e0fb..4bc41e3f48 100644 --- a/docroot/themes/humsci/archaeology/package-lock.json +++ b/docroot/themes/humsci/archaeology/package-lock.json @@ -1982,12 +1982,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2002,17 +2004,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2129,7 +2134,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2141,6 +2147,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2155,6 +2162,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2162,12 +2170,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2186,6 +2196,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2266,7 +2277,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2278,6 +2290,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -2399,6 +2412,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/docroot/themes/humsci/archaeology/scss/base.scss b/docroot/themes/humsci/archaeology/scss/base.scss index 8562a91194..5f13f14bf7 100644 --- a/docroot/themes/humsci/archaeology/scss/base.scss +++ b/docroot/themes/humsci/archaeology/scss/base.scss @@ -18,11 +18,13 @@ '../../su_humsci_theme/scss/utilities/mixins/index'; // Heading -h1 { +h1, +a.heading-link-h1 { @include heading-dash(0.2em, $color-sun, 1.125em); } -h2 { +h2, +a.heading-link-h2 { @include heading-dash(4px, $color-sun, 40px); // Headers with centered dash @@ -31,21 +33,30 @@ h2 { } } -h3 { +h3, +a.heading-link-h3 { @include heading-dash(3px, $color-sun, 30px); } -h4 { +h4, +a.heading-link-h4 { @include heading-dash(3px, $color-sun, 25px); } h5, -h6 { +h6, +a.heading-link-h5, +a.heading-link-h6 { @include heading-dash(2px, $color-sun, 20px); } +a[class*="heading-link-"] { + display: block; +} + // Headers without dash .horizontal-card__title, +.horizontal-card__title a[class*="heading-link"], .horizontal-card__title h2, h2.vertical-link-card__title, .date-stacked-vertical-card__content-container h2, @@ -55,7 +66,7 @@ h2#menu-blockmain-menu, .view.duplicate-of-news h2.vertical-card__title, .view.hs-publications h2 { &:after { - content: none; + content: unset; } } diff --git a/docroot/themes/humsci/su_humsci_theme/css/base/index.css b/docroot/themes/humsci/su_humsci_theme/css/base/index.css index 378836b69f..04f54ed539 100644 --- a/docroot/themes/humsci/su_humsci_theme/css/base/index.css +++ b/docroot/themes/humsci/su_humsci_theme/css/base/index.css @@ -1 +1 @@ -.node--unpublished{max-width:1170px;display:block;margin:0 auto;background-color:rgba(234,171,0,0.6);padding:20px}#footer{box-shadow:0 -2px 2px rgba(0,0,0,0.2);margin-top:3rem;padding-top:2em}@media screen and (min-width: 600px){#footer{margin-top:6rem}}@media screen and (min-width: 1201px){#footer{margin-top:10rem}}#footer h2{font-size:2.3rem}#footer a{text-decoration:none}.date-stacked{background:#2e2d29;bottom:-35px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);color:#fff;left:35px;position:absolute;text-align:center;margin-right:0;padding:20px 25px}.date-stacked .date-month{font-size:2.3rem;font-weight:100;line-height:1.2;text-transform:uppercase}.date-stacked .date-day{font-weight:400}#drupal-off-canvas li{border-bottom:1px solid #fff;padding:5px}#drupal-off-canvas a{font-size:14px}#drupal-off-canvas .view-form{color:#fff}.embedded-entity{margin:0 0 1em;width:fit-content;float:none}@media (min-width: 768px){.embedded-entity.align-left{margin-right:1em;margin-bottom:1em;width:auto;max-width:50%;float:left}}@media (min-width: 960px){.embedded-entity.align-left{max-width:75%}}@media (min-width: 768px){.embedded-entity.align-right{margin-bottom:1em;margin-left:1em;width:auto;max-width:50%;float:right}}@media (min-width: 960px){.embedded-entity.align-right{max-width:75%}}.views-exposed-form .form-item,.views-exposed-form .form-actions{margin-top:.5rem;margin-bottom:0}.views-exposed-form .form-item:first-child{margin-top:3rem}.views-exposed-form label{margin-top:1rem;margin-bottom:.5rem}.emphasized-text{font-weight:600;font-style:italic}.decanter-button a{color:#fff;text-decoration:none}.decanter-button a:hover{text-decoration:none}#footer__global-footer a span.ext{display:none}.label-inline{display:flex;flex-wrap:wrap;margin-bottom:.25em}.label-inline .field-label{padding-right:5px}.field-label{font-weight:600}span.media--type-image figure{position:relative;margin:0}span.media--type-image figure figcaption{position:absolute;background:rgba(255,255,255,0.75);padding:5px;opacity:0;bottom:0;width:100%;text-align:right;-webkit-transition:all 0.6s ease;-moz-transition:all 0.6s ease;-o-transition:all 0.6s ease}span.media--type-image figure:hover figcaption{opacity:1;left:0}span.media--type-image figure p{color:#4d4f53;font-size:1.7rem;margin-top:0;margin-bottom:0}figcaption{color:#4d4f53;font-size:1.7rem;margin-top:0}#header{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);margin-bottom:2em;padding-top:1em;padding-bottom:1em}.paragraph-item{margin-bottom:2.5em}.paragraph--type--hs-row .paragraph-item{margin-bottom:0}.paragraph.hs-hero-image img{width:100%}.paragraph-item h1:first-child,.paragraph-item h2:first-child,.paragraph-item h3:first-child,.paragraph-item h4:first-child,.paragraph-item h5:first-child,.paragraph-item h6:first-child{margin-top:0}.paragraph:first-child.paragraph--type--hs-hero-image{margin-top:-2em}.role--authenticated .paragraph:first-child.paragraph--type--hs-hero-image{margin-top:0}#search-region .search-block-form label,#search-region .views-exposed-filter-block.hs-search-search-page label{border:0;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(100%);height:1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{float:right;position:relative;margin-bottom:-7rem}@media screen and (min-width: 600px){#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{margin-top:-7rem;margin-bottom:0}}#search-region .search-block-form form.expanded input.button,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.button{z-index:999}#search-region .search-block-form form.expanded input.form-search,#search-region .search-block-form form.expanded input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input[type=text]{background:#fff;width:145px}#search-region .search-block-form form .js-form-item-search,#search-region .views-exposed-filter-block.hs-search-search-page form .js-form-item-search{margin:0}#search-region .search-block-form input.button,#search-region .views-exposed-filter-block.hs-search-search-page input.button{display:block;position:absolute;background:url("../../img/search.svg") no-repeat;background-size:45px 45px;top:5px;right:0;border:0;font-size:0;width:45px;height:45px;z-index:-999}#search-region .search-block-form input.form-search,#search-region .search-block-form input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page input[type=text]{background:url("../../img/search.svg") no-repeat center right;background-color:#fff;background-size:45px 45px;-webkit-transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;width:0;height:auto;border-radius:25px;border:0;cursor:pointer;box-shadow:0 0 0 1.5px #dad7cb;padding-right:32px}.user-is-tabbing #search-region .search-block-form input.form-search:hover,.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:hover,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{box-shadow:0 0 0 2px #b1040e;border:0}.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{background-size:45px 45px;cursor:text;width:145px;padding-right:50px;padding-left:15px}.block--lockup .block--lockup__site-name-and-slogan a{color:#2e2d29;display:inherit;text-decoration:none}.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap} +.node--unpublished{max-width:1170px;display:block;margin:0 auto;background-color:rgba(234,171,0,0.6);padding:20px}#footer{box-shadow:0 -2px 2px rgba(0,0,0,0.2);margin-top:3rem;padding-top:2em}@media screen and (min-width: 600px){#footer{margin-top:6rem}}@media screen and (min-width: 1201px){#footer{margin-top:10rem}}#footer h2{font-size:2.3rem}#footer a{text-decoration:none}.date-stacked{background:#2e2d29;bottom:-35px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);color:#fff;left:35px;position:absolute;text-align:center;margin-right:0;padding:20px 25px}.date-stacked .date-month{font-size:2.3rem;font-weight:100;line-height:1.2;text-transform:uppercase}.date-stacked .date-day{font-weight:400}#drupal-off-canvas li{border-bottom:1px solid #fff;padding:5px}#drupal-off-canvas a{font-size:14px}#drupal-off-canvas .view-form{color:#fff}.embedded-entity{margin:0 0 1em;width:fit-content;float:none}@media (min-width: 768px){.embedded-entity.align-left{margin-right:1em;margin-bottom:1em;width:auto;max-width:50%;float:left}}@media (min-width: 960px){.embedded-entity.align-left{max-width:75%}}@media (min-width: 768px){.embedded-entity.align-right{margin-bottom:1em;margin-left:1em;width:auto;max-width:50%;float:right}}@media (min-width: 960px){.embedded-entity.align-right{max-width:75%}}.views-exposed-form .form-item,.views-exposed-form .form-actions{margin-top:.5rem;margin-bottom:0}.views-exposed-form .form-item:first-child{margin-top:3rem}.views-exposed-form label{margin-top:1rem;margin-bottom:.5rem}.emphasized-text{font-weight:600;font-style:italic}.decanter-button a{color:#fff;text-decoration:none}.decanter-button a:hover{text-decoration:none}#footer__global-footer a span.ext{display:none}.label-inline{display:flex;flex-wrap:wrap;margin-bottom:.25em}.label-inline .field-label{padding-right:5px}.field-label{font-weight:600}span.media--type-image figure{position:relative;margin:0}span.media--type-image figure figcaption{position:absolute;background:rgba(255,255,255,0.75);padding:5px;opacity:0;bottom:0;width:100%;text-align:right;-webkit-transition:all 0.6s ease;-moz-transition:all 0.6s ease;-o-transition:all 0.6s ease}span.media--type-image figure:hover figcaption{opacity:1;left:0}span.media--type-image figure p{color:#4d4f53;font-size:1.7rem;margin-top:0;margin-bottom:0}figcaption{color:#4d4f53;font-size:1.7rem;margin-top:0}a[class*="heading-link-"]{text-decoration:none}a[data-extlink] h2,a[data-extlink] h3,a[data-extlink] h4,a[data-extlink] h5,a[data-extlink] h6{display:inline}a[data-extlink] .extlink{font-size:60%;padding:0 5px}a[data-extlink] .extlink .fa-arrow-right{transform:rotate(-45deg)}a[data-extlink] .extlink .visually-hidden{display:none}#header{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);margin-bottom:2em;padding-top:1em;padding-bottom:1em}.paragraph-item{margin-bottom:2.5em}.paragraph--type--hs-row .paragraph-item{margin-bottom:0}.paragraph.hs-hero-image img{width:100%}.paragraph-item h1:first-child,.paragraph-item h2:first-child,.paragraph-item h3:first-child,.paragraph-item h4:first-child,.paragraph-item h5:first-child,.paragraph-item h6:first-child{margin-top:0}.paragraph:first-child.paragraph--type--hs-hero-image{margin-top:-2em}.role--authenticated .paragraph:first-child.paragraph--type--hs-hero-image{margin-top:0}#search-region .search-block-form label,#search-region .views-exposed-filter-block.hs-search-search-page label{border:0;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(100%);height:1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{float:right;position:relative;margin-bottom:-7rem}@media screen and (min-width: 600px){#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{margin-top:-7rem;margin-bottom:0}}#search-region .search-block-form form.expanded input.button,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.button{z-index:999}#search-region .search-block-form form.expanded input.form-search,#search-region .search-block-form form.expanded input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input[type=text]{background:#fff;width:145px}#search-region .search-block-form form .js-form-item-search,#search-region .views-exposed-filter-block.hs-search-search-page form .js-form-item-search{margin:0}#search-region .search-block-form input.button,#search-region .views-exposed-filter-block.hs-search-search-page input.button{display:block;position:absolute;background:url("../../img/search.svg") no-repeat;background-size:45px 45px;top:5px;right:0;border:0;font-size:0;width:45px;height:45px;z-index:-999}#search-region .search-block-form input.form-search,#search-region .search-block-form input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page input[type=text]{background:url("../../img/search.svg") no-repeat center right;background-color:#fff;background-size:45px 45px;-webkit-transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;width:0;height:auto;border-radius:25px;border:0;cursor:pointer;box-shadow:0 0 0 1.5px #dad7cb;padding-right:32px}.user-is-tabbing #search-region .search-block-form input.form-search:hover,.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:hover,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{box-shadow:0 0 0 2px #b1040e;border:0}.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{background-size:45px 45px;cursor:text;width:145px;padding-right:50px;padding-left:15px}.block--lockup .block--lockup__site-name-and-slogan a{color:#2e2d29;display:inherit;text-decoration:none}.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap} diff --git a/docroot/themes/humsci/su_humsci_theme/js/su_humsci_theme.js b/docroot/themes/humsci/su_humsci_theme/js/su_humsci_theme.js index 4f19f6e304..14bc2d47d2 100644 --- a/docroot/themes/humsci/su_humsci_theme/js/su_humsci_theme.js +++ b/docroot/themes/humsci/su_humsci_theme/js/su_humsci_theme.js @@ -2,6 +2,11 @@ 'use strict'; Drupal.behaviors.suHumSciTheme = { attach: function (context, settings) { + var headings = ['h2', 'h3', 'h4', 'h5', 'h6']; + headings.map(function (heading) { + $('a:has(' + heading + ')', context).addClass('heading-link-' + heading); + }); + $('#search-region .search-block-form input[type=search], #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]', context).focus(function () { $(this).closest('form').addClass('expanded'); }).blur(function () { @@ -15,8 +20,8 @@ // Adds aria label to chosen input fields. // https://www.drupal.org/project/chosen/issues/2384865#comment-12568848 - $('body').on('chosen:ready', function(evt, params) { - $('.js-form-item.js-form-type-select', context).once('chosenAccessibilityFix').each(function(index, element) { + $('body').on('chosen:ready', function (evt, params) { + $('.js-form-item.js-form-type-select', context).once('chosenAccessibilityFix').each(function (index, element) { $(element).find('.chosen-container-multi input.chosen-search-input').attr('aria-label', $.trim($(element).find('label').text())); }); }); @@ -35,8 +40,8 @@ } window.addEventListener('keydown', handleFirstTab); - $('figure', context).each(function(i, figure){ - $(figure).imagesLoaded(function(){ + $('figure', context).each(function (i, figure) { + $(figure).imagesLoaded(function () { $(figure).find('figcaption, picture').css('max-width', $(figure).find('img').width()); }); }) diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/horizontal-card.html.twig b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/horizontal-card.html.twig index 7d8eb65247..44a969acb0 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/horizontal-card.html.twig +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/horizontal-card.html.twig @@ -34,7 +34,7 @@ {% endif %} {% if title %} -

{{ title }}

+
{{ title }}
{% endif %} {% if speaker %} diff --git a/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss b/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss index 1bf243fee3..26d7fe2a80 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss @@ -158,3 +158,33 @@ figure { figcaption { @include caption; } + +a[class*="heading-link-"] { + text-decoration: none; +} + +a[data-extlink] { + + h2, + h3, + h4, + h5, + h6 { + display: inline; + } + + .extlink { + font-size: 60%; + padding: 0 5px; + + .fa-arrow-right { + transform: rotate(-45deg); + } + + // Duplicated text "Link is External" occurs in screen readers. + // Hide this one from screen readers to prevent repeated text. + .visually-hidden { + display: none; + } + } +} diff --git a/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_heading-dash.scss b/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_heading-dash.scss index 498889d51c..00b654e885 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_heading-dash.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_heading-dash.scss @@ -15,9 +15,8 @@ @include padding(.1em null null); } - &.no-dash { - &::after { - display: none; - } + &.no-dash::after, + a[data-extlink] &:after { + content: unset; } } From c44cabecd0be2cb645b91eca682e06e7f3b8ba58 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Fri, 8 Feb 2019 15:06:56 -0800 Subject: [PATCH 09/25] cc fix --- .../humsci/su_humsci_admin/scss/humsci_admin.portal.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss b/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss index cc33c45675..dafc02ef36 100644 --- a/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss +++ b/docroot/themes/humsci/su_humsci_admin/scss/humsci_admin.portal.scss @@ -25,8 +25,8 @@ color: #b1040e; &:after { - content: "\f054"; - font-family: "Font Awesome 5 Free"; + content: '\f054'; + font-family: 'Font Awesome 5 Free'; font-weight: 900; font-style: normal; font-variant: normal; @@ -41,7 +41,7 @@ } h1 { - margin: 2.1rem 0 1.68rem 0; + margin: 2.1rem 0 1.68rem; font-weight: 200; line-height: 110%; font-size: 2.5rem; From b3b622a3408bfb64d41512d836132c8b60ff9e65 Mon Sep 17 00:00:00 2001 From: pookmish Date: Fri, 8 Feb 2019 16:26:27 -0800 Subject: [PATCH 10/25] Hs 113 invalidate capx content (#170) * HS-113 Invalidate migrate hashes and tags * working cache invalidation * language type fix --- .../src/Form/CapxImporterDeleteForm.php | 5 +- .../hs_capx/src/Form/CapxImporterForm.php | 58 ++++++++++++++++++- .../hs_capx/src/Overrides/ConfigOverrides.php | 6 +- 3 files changed, 63 insertions(+), 6 deletions(-) diff --git a/docroot/modules/humsci/hs_capx/src/Form/CapxImporterDeleteForm.php b/docroot/modules/humsci/hs_capx/src/Form/CapxImporterDeleteForm.php index 59982a6222..915086a094 100644 --- a/docroot/modules/humsci/hs_capx/src/Form/CapxImporterDeleteForm.php +++ b/docroot/modules/humsci/hs_capx/src/Form/CapxImporterDeleteForm.php @@ -2,6 +2,7 @@ namespace Drupal\hs_capx\Form; +use Drupal\Core\Cache\Cache; use Drupal\Core\Entity\EntityConfirmFormBase; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Url; @@ -37,17 +38,17 @@ public function getConfirmText() { */ public function submitForm(array &$form, FormStateInterface $form_state) { $this->entity->delete(); - drupal_set_message( $this->t('content @type: deleted @label.', [ '@type' => $this->entity->bundle(), '@label' => $this->entity->label(), ] - ) + ) ); $form_state->setRedirectUrl($this->getCancelUrl()); + Cache::invalidateTags(['migration_plugins', 'hs_capx_config']); } } diff --git a/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php b/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php index cf42cbf3ec..3400e494ee 100644 --- a/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php +++ b/docroot/modules/humsci/hs_capx/src/Form/CapxImporterForm.php @@ -3,6 +3,7 @@ namespace Drupal\hs_capx\Form; use Drupal\Core\Cache\Cache; +use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityFieldManagerInterface; use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityTypeManagerInterface; @@ -23,22 +24,38 @@ class CapxImporterForm extends EntityForm { */ protected $entityFieldManager; + /** + * Database connection service. + * + * @var \Drupal\Core\Database\Connection + */ + protected $database; + + /** + * The original entity before saving. + * + * @var \Drupal\hs_capx\Entity\CapxImporterInterface + */ + protected $originalEntity; + /** * {@inheritdoc} */ public static function create(ContainerInterface $container) { return new static( $container->get('entity_type.manager'), - $container->get('entity_field.manager') + $container->get('entity_field.manager'), + $container->get('database') ); } /** * {@inheritdoc} */ - public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager) { + public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityFieldManagerInterface $entity_field_manager, Connection $database) { $this->entityTypeManager = $entity_type_manager; $this->entityFieldManager = $entity_field_manager; + $this->database = $database; } /** @@ -49,6 +66,7 @@ public function form(array $form, FormStateInterface $form_state) { /** @var \Drupal\hs_capx\Entity\CapxImporterInterface $importer */ $importer = $this->entity; + $this->originalEntity = clone $importer; $form['label'] = [ '#type' => 'textfield', '#title' => $this->t('Label'), @@ -166,7 +184,6 @@ public function validateForm(array &$form, FormStateInterface $form_state) { * {@inheritdoc} */ public function save(array $form, FormStateInterface $form_state) { - Cache::invalidateTags(['migration_plugins']); // Add permission to execute importer. $role = $this->entityTypeManager->getStorage('user_role') ->load('site_manager'); @@ -186,11 +203,46 @@ public function save(array $form, FormStateInterface $form_state) { break; default: + $this->invalidateMigrationHashes(); drupal_set_message($this->t('Saved the %label Capx importer.', [ '%label' => $importer->label(), ])); } $form_state->setRedirectUrl($importer->toUrl('collection')); + + Cache::invalidateTags(['migration_plugins', 'hs_capx_config']); + } + + /** + * Invalidate migration mapper hashes to be updated on next import. + * + * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException + * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException + */ + protected function invalidateMigrationHashes() { + // If the importer hasn't been executed, the table will not be created. + if (!$this->database->schema()->tableExists('migrate_map_hs_capx')) { + return; + } + + $entity_query = $this->entityTypeManager->getStorage('node') + ->getQuery('OR'); + + // Find all node ids that are tagged with the fields. This allows us to only + // invalidate the hashes that are applicable. + foreach ($this->originalEntity->getFieldTags() as $field_name => $term_ids) { + foreach ($term_ids as $term_id) { + $entity_query->condition($field_name, $term_id); + } + } + + $entity_ids = array_keys($entity_query->execute()); + if ($entity_ids) { + $this->database->update('migrate_map_hs_capx') + ->condition('destid1', $entity_query->execute(), 'IN') + ->fields(['hash' => '']) + ->execute(); + } } } diff --git a/docroot/modules/humsci/hs_capx/src/Overrides/ConfigOverrides.php b/docroot/modules/humsci/hs_capx/src/Overrides/ConfigOverrides.php index 15e3d93fb4..c825881078 100644 --- a/docroot/modules/humsci/hs_capx/src/Overrides/ConfigOverrides.php +++ b/docroot/modules/humsci/hs_capx/src/Overrides/ConfigOverrides.php @@ -143,7 +143,11 @@ public function getCacheSuffix() { * {@inheritdoc} */ public function getCacheableMetadata($name) { - return new CacheableMetadata(); + $cacheable_data = new CacheableMetadata(); + if ($name == 'migrate_plus.migration.hs_capx' || $name == 'migrate_plus.migration.hs_capx_images') { + $cacheable_data->setCacheTags(['hs_capx_config']); + } + return $cacheable_data; } /** From 3cec6f7fc9066a2626087eddd1343c0f6be5713d Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 10:45:57 -0800 Subject: [PATCH 11/25] restore focus styles --- .../themes/humsci/su_humsci_theme/css/base/index.css | 2 +- docroot/themes/humsci/su_humsci_theme/css/ckeditor.css | 2 +- .../humsci/su_humsci_theme/scss/base/_global.scss | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docroot/themes/humsci/su_humsci_theme/css/base/index.css b/docroot/themes/humsci/su_humsci_theme/css/base/index.css index 04f54ed539..80b3c3627c 100644 --- a/docroot/themes/humsci/su_humsci_theme/css/base/index.css +++ b/docroot/themes/humsci/su_humsci_theme/css/base/index.css @@ -1 +1 @@ -.node--unpublished{max-width:1170px;display:block;margin:0 auto;background-color:rgba(234,171,0,0.6);padding:20px}#footer{box-shadow:0 -2px 2px rgba(0,0,0,0.2);margin-top:3rem;padding-top:2em}@media screen and (min-width: 600px){#footer{margin-top:6rem}}@media screen and (min-width: 1201px){#footer{margin-top:10rem}}#footer h2{font-size:2.3rem}#footer a{text-decoration:none}.date-stacked{background:#2e2d29;bottom:-35px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);color:#fff;left:35px;position:absolute;text-align:center;margin-right:0;padding:20px 25px}.date-stacked .date-month{font-size:2.3rem;font-weight:100;line-height:1.2;text-transform:uppercase}.date-stacked .date-day{font-weight:400}#drupal-off-canvas li{border-bottom:1px solid #fff;padding:5px}#drupal-off-canvas a{font-size:14px}#drupal-off-canvas .view-form{color:#fff}.embedded-entity{margin:0 0 1em;width:fit-content;float:none}@media (min-width: 768px){.embedded-entity.align-left{margin-right:1em;margin-bottom:1em;width:auto;max-width:50%;float:left}}@media (min-width: 960px){.embedded-entity.align-left{max-width:75%}}@media (min-width: 768px){.embedded-entity.align-right{margin-bottom:1em;margin-left:1em;width:auto;max-width:50%;float:right}}@media (min-width: 960px){.embedded-entity.align-right{max-width:75%}}.views-exposed-form .form-item,.views-exposed-form .form-actions{margin-top:.5rem;margin-bottom:0}.views-exposed-form .form-item:first-child{margin-top:3rem}.views-exposed-form label{margin-top:1rem;margin-bottom:.5rem}.emphasized-text{font-weight:600;font-style:italic}.decanter-button a{color:#fff;text-decoration:none}.decanter-button a:hover{text-decoration:none}#footer__global-footer a span.ext{display:none}.label-inline{display:flex;flex-wrap:wrap;margin-bottom:.25em}.label-inline .field-label{padding-right:5px}.field-label{font-weight:600}span.media--type-image figure{position:relative;margin:0}span.media--type-image figure figcaption{position:absolute;background:rgba(255,255,255,0.75);padding:5px;opacity:0;bottom:0;width:100%;text-align:right;-webkit-transition:all 0.6s ease;-moz-transition:all 0.6s ease;-o-transition:all 0.6s ease}span.media--type-image figure:hover figcaption{opacity:1;left:0}span.media--type-image figure p{color:#4d4f53;font-size:1.7rem;margin-top:0;margin-bottom:0}figcaption{color:#4d4f53;font-size:1.7rem;margin-top:0}a[class*="heading-link-"]{text-decoration:none}a[data-extlink] h2,a[data-extlink] h3,a[data-extlink] h4,a[data-extlink] h5,a[data-extlink] h6{display:inline}a[data-extlink] .extlink{font-size:60%;padding:0 5px}a[data-extlink] .extlink .fa-arrow-right{transform:rotate(-45deg)}a[data-extlink] .extlink .visually-hidden{display:none}#header{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);margin-bottom:2em;padding-top:1em;padding-bottom:1em}.paragraph-item{margin-bottom:2.5em}.paragraph--type--hs-row .paragraph-item{margin-bottom:0}.paragraph.hs-hero-image img{width:100%}.paragraph-item h1:first-child,.paragraph-item h2:first-child,.paragraph-item h3:first-child,.paragraph-item h4:first-child,.paragraph-item h5:first-child,.paragraph-item h6:first-child{margin-top:0}.paragraph:first-child.paragraph--type--hs-hero-image{margin-top:-2em}.role--authenticated .paragraph:first-child.paragraph--type--hs-hero-image{margin-top:0}#search-region .search-block-form label,#search-region .views-exposed-filter-block.hs-search-search-page label{border:0;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(100%);height:1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{float:right;position:relative;margin-bottom:-7rem}@media screen and (min-width: 600px){#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{margin-top:-7rem;margin-bottom:0}}#search-region .search-block-form form.expanded input.button,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.button{z-index:999}#search-region .search-block-form form.expanded input.form-search,#search-region .search-block-form form.expanded input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input[type=text]{background:#fff;width:145px}#search-region .search-block-form form .js-form-item-search,#search-region .views-exposed-filter-block.hs-search-search-page form .js-form-item-search{margin:0}#search-region .search-block-form input.button,#search-region .views-exposed-filter-block.hs-search-search-page input.button{display:block;position:absolute;background:url("../../img/search.svg") no-repeat;background-size:45px 45px;top:5px;right:0;border:0;font-size:0;width:45px;height:45px;z-index:-999}#search-region .search-block-form input.form-search,#search-region .search-block-form input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page input[type=text]{background:url("../../img/search.svg") no-repeat center right;background-color:#fff;background-size:45px 45px;-webkit-transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;width:0;height:auto;border-radius:25px;border:0;cursor:pointer;box-shadow:0 0 0 1.5px #dad7cb;padding-right:32px}.user-is-tabbing #search-region .search-block-form input.form-search:hover,.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:hover,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{box-shadow:0 0 0 2px #b1040e;border:0}.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{background-size:45px 45px;cursor:text;width:145px;padding-right:50px;padding-left:15px}.block--lockup .block--lockup__site-name-and-slogan a{color:#2e2d29;display:inherit;text-decoration:none}.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap} +.node--unpublished{max-width:1170px;display:block;margin:0 auto;background-color:rgba(234,171,0,0.6);padding:20px}#footer{box-shadow:0 -2px 2px rgba(0,0,0,0.2);margin-top:3rem;padding-top:2em}@media screen and (min-width: 600px){#footer{margin-top:6rem}}@media screen and (min-width: 1201px){#footer{margin-top:10rem}}#footer h2{font-size:2.3rem}#footer a{text-decoration:none}.date-stacked{background:#2e2d29;bottom:-35px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);color:#fff;left:35px;position:absolute;text-align:center;margin-right:0;padding:20px 25px}.date-stacked .date-month{font-size:2.3rem;font-weight:100;line-height:1.2;text-transform:uppercase}.date-stacked .date-day{font-weight:400}#drupal-off-canvas li{border-bottom:1px solid #fff;padding:5px}#drupal-off-canvas a{font-size:14px}#drupal-off-canvas .view-form{color:#fff}.embedded-entity{margin:0 0 1em;width:fit-content;float:none}@media (min-width: 768px){.embedded-entity.align-left{margin-right:1em;margin-bottom:1em;width:auto;max-width:50%;float:left}}@media (min-width: 960px){.embedded-entity.align-left{max-width:75%}}@media (min-width: 768px){.embedded-entity.align-right{margin-bottom:1em;margin-left:1em;width:auto;max-width:50%;float:right}}@media (min-width: 960px){.embedded-entity.align-right{max-width:75%}}.views-exposed-form .form-item,.views-exposed-form .form-actions{margin-top:.5rem;margin-bottom:0}.views-exposed-form .form-item:first-child{margin-top:3rem}.views-exposed-form label{margin-top:1rem;margin-bottom:.5rem}.emphasized-text{font-weight:600;font-style:italic}.decanter-button a{color:#fff;text-decoration:none}.decanter-button a:hover{text-decoration:none}#footer__global-footer a span.ext{display:none}.label-inline{display:flex;flex-wrap:wrap;margin-bottom:.25em}.label-inline .field-label{padding-right:5px}.field-label{font-weight:600}span.media--type-image figure{position:relative;margin:0}span.media--type-image figure figcaption{position:absolute;background:rgba(255,255,255,0.75);padding:5px;opacity:0;bottom:0;width:100%;text-align:right;-webkit-transition:all 0.6s ease;-moz-transition:all 0.6s ease;-o-transition:all 0.6s ease}span.media--type-image figure:hover figcaption{opacity:1;left:0}span.media--type-image figure p{color:#4d4f53;font-size:1.7rem;margin-top:0;margin-bottom:0}figcaption{color:#4d4f53;font-size:1.7rem;margin-top:0}a[class*="heading-link-"]{text-decoration:none}a[data-extlink] h2,a[data-extlink] h3,a[data-extlink] h4,a[data-extlink] h5,a[data-extlink] h6{display:inline}a[data-extlink] .extlink{font-size:60%;padding:0 5px}a[data-extlink] .extlink .fa-arrow-right{transform:rotate(-45deg)}a[data-extlink] .extlink .visually-hidden{display:none}body *:focus{outline:#4d90fe auto 5px}.brand-bar *:focus,.decanter-button *:focus{outline:#ffffff auto 5px}#header{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);margin-bottom:2em;padding-top:1em;padding-bottom:1em}.paragraph-item{margin-bottom:2.5em}.paragraph--type--hs-row .paragraph-item{margin-bottom:0}.paragraph.hs-hero-image img{width:100%}.paragraph-item h1:first-child,.paragraph-item h2:first-child,.paragraph-item h3:first-child,.paragraph-item h4:first-child,.paragraph-item h5:first-child,.paragraph-item h6:first-child{margin-top:0}.paragraph:first-child.paragraph--type--hs-hero-image{margin-top:-2em}.role--authenticated .paragraph:first-child.paragraph--type--hs-hero-image{margin-top:0}#search-region .search-block-form label,#search-region .views-exposed-filter-block.hs-search-search-page label{border:0;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(100%);height:1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{float:right;position:relative;margin-bottom:-7rem}@media screen and (min-width: 600px){#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{margin-top:-7rem;margin-bottom:0}}#search-region .search-block-form form.expanded input.button,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.button{z-index:999}#search-region .search-block-form form.expanded input.form-search,#search-region .search-block-form form.expanded input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input[type=text]{background:#fff;width:145px}#search-region .search-block-form form .js-form-item-search,#search-region .views-exposed-filter-block.hs-search-search-page form .js-form-item-search{margin:0}#search-region .search-block-form input.button,#search-region .views-exposed-filter-block.hs-search-search-page input.button{display:block;position:absolute;background:url("../../img/search.svg") no-repeat;background-size:45px 45px;top:5px;right:0;border:0;font-size:0;width:45px;height:45px;z-index:-999}#search-region .search-block-form input.form-search,#search-region .search-block-form input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page input[type=text]{background:url("../../img/search.svg") no-repeat center right;background-color:#fff;background-size:45px 45px;-webkit-transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;width:0;height:auto;border-radius:25px;border:0;cursor:pointer;box-shadow:0 0 0 1.5px #dad7cb;padding-right:32px}.user-is-tabbing #search-region .search-block-form input.form-search:hover,.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:hover,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{box-shadow:0 0 0 2px #b1040e;border:0}.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{background-size:45px 45px;cursor:text;width:145px;padding-right:50px;padding-left:15px}.block--lockup .block--lockup__site-name-and-slogan a{color:#2e2d29;display:inherit;text-decoration:none}.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap} diff --git a/docroot/themes/humsci/su_humsci_theme/css/ckeditor.css b/docroot/themes/humsci/su_humsci_theme/css/ckeditor.css index 320f34305c..8856818c4d 100644 --- a/docroot/themes/humsci/su_humsci_theme/css/ckeditor.css +++ b/docroot/themes/humsci/su_humsci_theme/css/ckeditor.css @@ -1 +1 @@ -.decanter-sr-only{position:absolute;left:-999em}.decanter-embed-container{padding-bottom:56.25%;position:relative;height:0;overflow:hidden;max-width:100%}.decanter-embed-container iframe,.decanter-embed-container object,.decanter-embed-container embed{position:absolute;top:0;left:0;width:100%;height:100%}img{display:block;height:auto;max-width:100%;margin:0;padding:0}input,textarea,select{appearance:none;border:.1rem solid #b6b1a9;border-radius:0;box-sizing:border-box;color:#2e2d29;display:block;font-size:2rem;height:4.8rem;line-height:1.3;margin:0.2em 0;max-width:46rem;outline:none;padding:1rem 0.7em;width:100%}input:focus,textarea:focus,select:focus{box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}label{display:block;margin-top:3rem;max-width:46rem}textarea{height:16rem}select{-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#fff;background-image:url("../img/arrow-down.png");background-image:url("../img/arrow-down.svg");background-position:right 1.3rem center;background-repeat:no-repeat;background-size:1.3rem}legend{font-size:3.3rem;font-weight:600}fieldset{border:none}.decanter-fieldset-inputs label{margin-top:0}[type=checkbox],[type=radio]{position:absolute;left:-999em}.lt-ie9 [type=checkbox],.lt-ie9 [type=radio]{border:0;float:left;margin:0.4em 0.4em 0 0;position:static;width:auto}[type=checkbox]+label,[type=radio]+label{cursor:pointer;font-weight:400;margin-bottom:0.5em}[type=checkbox]+label::before,[type=radio]+label::before{background:#fff;border-radius:3px;box-shadow:0 0 0 1px #b6b1a9;content:'\a0';display:inline-block;height:1.8rem;line-height:1.8rem;margin-right:0.6em;text-indent:0.15em;vertical-align:middle\0;width:1.8rem}[type=radio]+label::before{box-shadow:0 0 0 2px #fff,0 0 0 3px #b6b1a9;height:1.6rem;line-height:1.6rem;width:1.6rem;border-radius:100%}[type=checkbox]:checked+label::before,[type=radio]:checked+label::before{background-color:#b1040e;box-shadow:0 0 0 1px #b1040e}[type=radio]:checked+label::before{box-shadow:0 0 0 2px #fff,0 0 0 4px #b1040e}[type=radio]:focus+label::before{box-shadow:0 0 0 2px #fff,0 0 0 4px #b1040e,0 0 3px 4px #2e2d29,0 0 7px 4px #2e2d29}[type=checkbox]:checked+label::before,[type=checkbox]:checked:disabled+label::before{background-image:url("../img/check.png");background-image:url("../img/check.svg");background-position:50%;background-repeat:no-repeat}[type=checkbox]:focus+label::before{box-shadow:0 0 0 1px #fff,0 0 0 3px #b1040e}[type=checkbox]:disabled+label{color:#b6b1a9}[type=checkbox]:disabled+label::before,[type=radio]:disabled+label::before{background:#b6b1a9;cursor:not-allowed}[type=range]{-webkit-appearance:none;border:none;padding-left:0;width:100%}[type=range]:focus{box-shadow:none;outline:none}[type=range]::-webkit-slider-runnable-track{background:#4d4f53;border:1px solid #b6b1a9;cursor:pointer;height:1.2rem;width:100%}[type=range]::-moz-range-track{background:#b1040e;border:1px solid #b6b1a9;cursor:pointer;height:1.2rem;width:100%}[type=range]::-ms-track{background:transparent;color:transparent;cursor:pointer;height:1.2rem;width:100%}[type=range]::-webkit-slider-thumb{-webkit-appearance:none;border:1px solid #b6b1a9;height:2.2rem;border-radius:1.5rem;background:#4d4f53;cursor:pointer;margin-top:-.65rem;width:2.2rem}[type=range]::-moz-range-thumb{background:#4d4f53;border:1px solid #b6b1a9;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-thumb{background:#4d4f53;border:1px solid #b6b1a9;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-fill-lower{background:#4d4f53;border:1px solid #b6b1a9;border-radius:2rem}[type=range]::-ms-fill-upper{background:#4d4f53;border:1px solid #b6b1a9;border-radius:2rem}[type=range]:focus::-webkit-slider-thumb{border:2px solid #b6b1a9}[type=range]:focus::-moz-range-thumb{border:2px solid #b6b1a9}[type=range]:focus::-ms-thumb{border:2px solid #b6b1a9}a{color:#b1040e;text-decoration:underline}a:hover,a:active{color:#2e2d29}a:focus{outline:0}.decanter-external-link::after{background:url("../img/external-link.png") no-repeat 0 0;background:url("../img/external-link.svg") no-repeat 0 0;background-size:100%;content:'';display:inline-block;height:0.65em;width:0.65em;margin-bottom:-1px;margin-left:4px}.decanter-external-link:hover::after{background-image:url("../img/external-link-hover.png");background-image:url("../img/external-link-hover.svg")}.decanter-more-link::after{color:#b1040e;content:'\00BB';display:inline-block;margin-left:4px}.decanter-more-link:hover::after{color:#2e2d29}ul,ol{margin-top:1em;margin-bottom:1em;padding-left:1em}li{line-height:1.4;margin-bottom:.5em}li:last-child{margin-bottom:0}h1+ul,h1+ol,h2+ul,h2+ol,h3+ul,h3+ol,h4+ul,h4+ol,h5+ul,h5+ol,h6+ul,h6+ol,p+ul,p+ol{margin-top:0}.decanter-list-unstyled{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none}.decanter-list-unstyled>li{margin-bottom:0}.decanter-quote{padding:1em;overflow:hidden}.decanter-quote .decanter-quote__img{float:left;margin-right:1rem;border-radius:150px;border:7px solid;height:300px;width:300px;margin-right:2em}.decanter-quote .decanter-quote__body .decanter-quote__heading{font-size:2em;font-weight:600;margin-bottom:.5em}.decanter-quote .decanter-quote__body .decanter-quote__bio{margin:0}.decanter-quote .decanter-quote__body .decanter-quote__quote{font-size:1.5em;font-weight:600}table{border-spacing:0;min-width:100%;margin:2em 0}table th,table td{border:1px solid #b6b1a9;padding:1.5rem}table th{background-color:#dad7cb;color:#2e2d29;text-align:left}table td{background-color:#fff}table thead th,table thead td{background-color:#4d4f53}table tbody th{font-weight:400}.decanter-table--borderless thead tr{background-color:transparent}.decanter-table--borderless thead th{border-top:0}.decanter-table--borderless th,.decanter-table--borderless td{border-left:0;border-right:0}html{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:10px}body{color:#2e2d29;font-size:2rem}p{line-height:1.4;margin-top:1em;margin-bottom:1em}h1,h2,h3,h4,h5,h6{clear:both;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;line-height:1.2;margin-top:1.5em;margin-bottom:.5em}.decanter-sans h1,.decanter-sans h2,.decanter-sans h3,.decanter-sans h4,.decanter-sans h5,.decanter-sans h6{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif}.decanter-serif h1,.decanter-serif h2,.decanter-serif h3,.decanter-serif h4,.decanter-serif h5,.decanter-serif h6{font-family:"Crimson Text","Georgia","Times","Times New Roman",serif}.decanter-slab h1,.decanter-slab h2,.decanter-slab h3,.decanter-slab h4,.decanter-slab h5,.decanter-slab h6{font-family:"Roboto Slab","Georgia","Times","Times New Roman",serif}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{text-decoration:none}h1{font-size:4.3rem;font-weight:600}h1:first-child{margin-top:0}h2{font-size:3.3rem;font-weight:600}h3{font-size:2.3rem;font-weight:600}h4{font-size:2rem;font-weight:600}h5{font-size:1.8rem;font-weight:600}h6{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:1.6rem;font-weight:400;text-transform:uppercase}cite,var,address,dfn{font-style:normal}.decanter-sans p,.decanter-sans a,.decanter-sans li,.decanter-sans span{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif}.decanter-sans a{border-bottom:none;font-weight:600}.decanter-serif p,.decanter-serif a,.decanter-serif li,.decanter-serif span{font-family:"Crimson Text","Georgia","Times","Times New Roman",serif}.decanter-slab p,.decanter-slab a,.decanter-slab li,.decanter-slab span{font-family:"Roboto Slab","Georgia","Times","Times New Roman",serif}.decanter-font-lead{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2.3rem;font-weight:200;line-height:1.5;max-width:85rem}.decanter-font-splash{font-size:2.3rem;font-weight:600;margin-bottom:0}@media screen and (min-width: 481px){.decanter-font-splash{font-size:4.3rem;font-weight:600}.decanter-font-splash:first-child{margin-top:0}}@media screen and (min-width: 600px){.decanter-font-splash{font-size:5.5rem;font-weight:600}}.decanter-short-line-length{max-width:70rem}.decanter-caption{color:#4d4f53;font-size:1.7rem;margin-top:0}.decanter-credits{color:#4d4f53;font-size:1.7rem;font-style:italic;margin-top:0}.decanter-grid>:first-child,.decanter-grid-full>:first-child{margin-top:0}.decanter-grid>:last-child,.decanter-grid-full>:last-child{margin-bottom:0}.decanter-width-one-whole:first-child>:first-child,.decanter-width-one-half:first-child>:first-child,.decanter-width-one-third:first-child>:first-child,.decanter-width-two-thirds:first-child>:first-child,.decanter-width-one-fourth:first-child>:first-child,.decanter-width-three-fourths:first-child>:first-child,.decanter-width-one-sixth:first-child>:first-child,.decanter-width-five-sixths:first-child>:first-child,.decanter-width-one-twelfth:first-child>:first-child{margin-top:0}@media screen and (min-width: 600px){.decanter-width-one-whole>:first-child,.decanter-width-one-half>:first-child,.decanter-width-one-third>:first-child,.decanter-width-two-thirds>:first-child,.decanter-width-one-fourth>:first-child,.decanter-width-three-fourths>:first-child,.decanter-width-one-sixth>:first-child,.decanter-width-five-sixths>:first-child,.decanter-width-one-twelfth>:first-child{margin-top:0}}.decanter-width-one-whole:last-child>:last-child,.decanter-width-one-half:last-child>:last-child,.decanter-width-one-third:last-child>:last-child,.decanter-width-two-thirds:last-child>:last-child,.decanter-width-one-fourth:last-child>:last-child,.decanter-width-three-fourths:last-child>:last-child,.decanter-width-one-sixth:last-child>:last-child,.decanter-width-five-sixths:last-child>:last-child,.decanter-width-one-twelfth:last-child>:last-child{margin-bottom:0}@media screen and (min-width: 600px){.decanter-width-one-whole>:last-child,.decanter-width-one-half>:last-child,.decanter-width-one-third>:last-child,.decanter-width-two-thirds>:last-child,.decanter-width-one-fourth>:last-child,.decanter-width-three-fourths>:last-child,.decanter-width-one-sixth>:last-child,.decanter-width-five-sixths>:last-child,.decanter-width-one-twelfth>:last-child{margin-bottom:0}}.decanter-button,button,[type=button],[type=submit],[type=reset],[type=image]{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1rem 2rem;appearance:none;background-color:#b1040e;border:0;color:#fff;cursor:pointer;display:inline-block;font-size:2rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%}@media screen and (min-width: 481px){.decanter-button,button,[type=button],[type=submit],[type=reset],[type=image]{width:auto}}.decanter-button:hover,button:hover,[type=button]:hover,[type=submit]:hover,[type=reset]:hover,[type=image]:hover{background-color:#2e2d29;border-bottom:0;color:#fff;text-decoration:none}.decanter-button:focus,button:focus,[type=button]:focus,[type=submit]:focus,[type=reset]:focus,[type=image]:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-button--secondary{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1rem 2rem;appearance:none;background-color:#fff;border:0;box-shadow:inset 0 0 0 2px #b1040e;color:#b1040e;cursor:pointer;display:inline-block;font-size:2rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%}@media screen and (min-width: 481px){.decanter-button--secondary{width:auto}}.decanter-button--secondary:hover{background-color:#fff;border-bottom:0;box-shadow:inset 0 0 0 2px #2e2d29;color:#2e2d29;text-decoration:none}.decanter-button--secondary:focus{background-color:#fff;box-shadow:inset 0 0 0 2px #2e2d29,0 0 3px #4d4f53,0 0 7px #4d4f53;color:#2e2d29}.decanter-button--big{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1.5rem 3rem;appearance:none;background-color:#b1040e;border:0;color:#fff;cursor:pointer;display:inline-block;font-size:2.3rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%}@media screen and (min-width: 481px){.decanter-button--big{width:auto}}.decanter-button--big:hover{background-color:#2e2d29;border-bottom:0;color:#fff;text-decoration:none}.decanter-button--big:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-button--unstyled{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0}.decanter-button--unstyled:hover{background-color:transparent}.decanter-media-block__img{float:left;margin-right:1rem}.decanter-media-block__body{overflow:hidden}.decanter-skipnav{background:transparent;color:#2e2d29;left:0;position:absolute;top:-4.2rem;transition:all 0.2s ease-in-out;z-index:100;padding:1rem 1.5rem}.decanter-skipnav:focus{background:#fff;left:0;outline:0;position:absolute;top:0;transition:all 0.2s ease-in-out}.decanter-alert{background-color:#f4f4f4;background-position:1rem 2rem;background-repeat:no-repeat;background-size:4rem;margin-top:1.5em;padding:1em}@media screen and (min-width: 600px){.decanter-alert{background-size:5.2rem}}.decanter-alert a{color:#006cb8}.decanter-alert a:focus,.decanter-alert a:hover{color:#00548f}.decanter-alert ul{margin-top:1em;margin-bottom:0;padding-left:1em}.decanter-alert .decanter-alert__body{display:table-cell;vertical-align:top;padding-left:3.5rem}@media screen and (min-width: 600px){.decanter-alert .decanter-alert__body{padding-left:5rem}}.decanter-alert .decanter-alert__body p:first-child{margin-top:.8rem}.decanter-alert .decanter-alert__body p:last-child{margin-bottom:.8rem}.decanter-alert .decanter-alert__body .decanter-alert__heading{margin-top:0;margin-bottom:.3rem}@media screen and (min-width: 600px){.decanter-alert .decanter-alert__body .decanter-alert__heading{margin-top:.3rem}}.decanter-alert .decanter-alert__body .decanter-alert__text{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;margin-top:0;margin-bottom:0}.decanter-alert-success{background-color:rgba(23,94,84,0.6);background-image:url("../img/success.png");background-image:url("../img/success.svg")}.decanter-alert-warning{background-color:rgba(234,171,0,0.6);background-image:url("../img/warning.png");background-image:url("../img/warning.svg")}.decanter-alert-error{background-color:rgba(177,4,14,0.5);background-image:url("../img/error.png");background-image:url("../img/error.svg")}.decanter-alert-info{background-color:rgba(0,152,219,0.6);background-image:url("../img/info.png");background-image:url("../img/info.svg")}.decanter-icon-block{padding:1em;overflow:hidden;display:block}.decanter-icon-block .decanter-icon-block__img{float:left;margin-right:1rem;margin-right:1.5625em}.decanter-icon-block .decanter-icon-block__body .decanter-icon-block__heading{font-size:1.25em;font-weight:600;margin:0}.decanter-icon-block .decanter-icon-block__body .decanter-icon-block__detail{margin-top:.3em;margin-bottom:.3em}.decanter-icon-block .decanter-icon-block__body .decanter-icon-block__link{margin-top:.25em;margin-bottom:.25em}.decanter-icon-grid .decanter-icon-grid__row .decanter-media-block{margin-bottom:3rem}@media screen and (min-width: 600px){.decanter-icon-grid .decanter-icon-grid__row .decanter-media-block{margin-bottom:6rem}}@media screen and (min-width: 600px){.decanter-icon-grid .decanter-icon-grid__row:last-child .decanter-media-block{margin-bottom:0}}.decanter-icon-grid .decanter-icon-grid__row:last-child .decanter-media-block:last-child{margin-bottom:0}.decanter-icon-grid .decanter-media-block__img{margin-right:3rem}.decanter-icon-grid .decanter-media-block__body>:first-child{margin-top:0}.decanter-nav{position:fixed;top:0;right:0;bottom:0;left:auto;padding:2rem;background:transparent;border-left:1px solid #4d4f53;border-right:0;display:flex;flex-direction:column;overflow-y:auto;transform:translateX(26rem);width:26rem;z-index:9000}@media screen and (min-width: 951px){.decanter-nav{padding-top:5rem;padding-right:0;padding-bottom:0;border-left:none;display:block;float:right;overflow-y:visible;position:relative;transform:translateX(0);width:auto}}.decanter-nav.is-visible{transform:translateX(0);transition:all 0.3s ease-in-out}.decanter-nav nav{margin-top:6rem;min-height:100%}@media screen and (min-width: 951px){.decanter-nav nav{margin-top:0}}.decanter-nav .decanter-nav__current{border-left:4px solid #b1040e;color:#2e2d29;font-weight:600;padding-left:1.4rem}.decanter-nav .decanter-button{width:100%}.decanter-nav__link{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}@media screen and (min-width: 951px){.decanter-nav__link:hover{border-bottom:0.2rem solid #2e2d29;padding-bottom:1rem}}@media screen and (min-width: 951px){.decanter-nav__container{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;max-width:1220px}.decanter-nav__container::after{clear:both;content:"";display:block}}.decanter-nav-primary{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;order:2}.decanter-nav-primary>li{margin-bottom:0}.decanter-nav-primary>li{background-color:transparent;font-size:2rem}.decanter-nav-primary>li:first-child{border-top:none}.decanter-nav-primary a{border:none;color:#b1040e;display:block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;line-height:1.3;text-decoration:none;padding:.85rem 1rem .85rem 1.8rem}.decanter-nav-primary a:hover,.decanter-nav-primary a:focus{color:#2e2d29;text-decoration:underline}.decanter-nav-primary a.decanter-nav__current{border-left:0.2rem solid #2e2d29;color:#2e2d29;font-weight:600;padding-left:1.4rem}.decanter-nav-primary a.decanter-nav__current:hover,.decanter-nav-primary a.decanter-nav__current:focus{text-decoration:none}@media screen and (min-width: 951px){.decanter-nav-primary{display:inline}}@media screen and (min-width: 951px){.decanter-nav-primary li{border-top:none}}.decanter-nav-primary>li,.decanter-nav-primary.decanter-accordion>li{background-color:transparent;width:auto}@media screen and (min-width: 951px){.decanter-nav-primary>li,.decanter-nav-primary.decanter-accordion>li{display:inline-block}}@media screen and (min-width: 951px){.decanter-nav-primary>li>a,.decanter-nav-primary.decanter-accordion>li>a{padding:1.3rem 1.5rem 1.7rem;color:#b1040e;font-size:1.8rem;font-weight:600;line-height:1.2}}.decanter-nav-primary>li>a:hover,.decanter-nav-primary.decanter-accordion>li>a:hover{color:#2e2d29;text-decoration:none}@media screen and (min-width: 951px){.decanter-nav-primary>li>a:hover,.decanter-nav-primary.decanter-accordion>li>a:hover{background-color:transparent}}.decanter-nav-primary button{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;padding:1.4rem 1.5rem 1rem 1.8rem;font-weight:400}.decanter-nav-primary button:hover{background-color:transparent}@media screen and (min-width: 951px){.decanter-nav-primary button{padding-right:3rem;padding-bottom:1.9rem;padding-left:1.5rem;color:#b1040e;font-size:1.8rem;font-weight:600;width:initial}}.decanter-nav-primary button:focus,.decanter-nav-primary button:active{background-color:transparent;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-nav-primary button:hover{color:#2e2d29}@media screen and (min-width: 951px){.decanter-nav-primary button:hover{background-color:transparent}}.decanter-nav-primary button[aria-expanded=false]{background-image:url("../img/plus.png");background-image:url("../img/plus.svg");background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width: 951px){.decanter-nav-primary button[aria-expanded=false]{background-image:url("../img/arrow-down.png");background-image:url("../img/arrow-down.svg");background-position:right 1.5rem top 44%}.decanter-nav-primary button[aria-expanded=false]:hover{background-image:url("../img/arrow-down-hover.png");background-image:url("../img/arrow-down-hover.svg");background-position:right 1.5rem top 58%}}.decanter-nav-primary button[aria-expanded=true]{background-image:url("../img/minus.png");background-image:url("../img/minus.svg");background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width: 951px){.decanter-nav-primary button[aria-expanded=true]{background-color:#b1040e;background-image:url("../img/arrow-down-hover.png");background-image:url("../img/arrow-down-hover.svg");background-position:right 1.5rem top 58%;color:#fff;border-bottom:0.2rem solid #2e2d29;padding-bottom:1rem}.decanter-nav-primary button[aria-expanded=true]:hover{background-color:#b1040e;background-position:right 1.5rem top 58%}}@media screen and (min-width: 951px){.decanter-nav-primary a.decanter-nav__current{border-left:0;padding-left:1.5rem;border-bottom:0.2rem solid #2e2d29;padding-bottom:1rem}}@media screen and (min-width: 951px){.decanter-nav-submenu{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;padding-top:1.15rem;padding-bottom:1.15rem;background-color:#b1040e;min-width:21.5rem;width:auto;position:absolute}.decanter-nav-submenu>li{margin-bottom:0}}.decanter-nav-submenu[aria-hidden=true]{display:none}@media screen and (min-width: 951px){.decanter-nav-submenu a{color:#fff;padding-left:1.5rem}}@media screen and (min-width: 951px){.decanter-nav-submenu a:hover{background-color:#b1040e;color:#fff;text-decoration:underline}}.decanter-nav-submenu li{font-size:1.8rem;margin-bottom:0}.decanter-nav__overlay{position:fixed;top:0;right:0;bottom:0;left:0;background:#2e2d29;opacity:0;transition:all 0.2s ease-in-out;visibility:hidden;z-index:8000}.decanter-nav__overlay.is-visible{opacity:0.6;visibility:visible}.decanter-nav__close{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;margin:-1.2rem -1.5rem 2.4rem auto;float:right;height:4.4rem;text-align:center;width:4.4rem}.decanter-nav__close:hover{background-color:transparent}@media screen and (min-width: 951px){.decanter-nav__close{display:none}}.decanter-nav__close img{width:1.3rem}.decanter-mobile-nav--active{overflow:hidden}.decanter-main-menu{width:100%;z-index:7000}.decanter-main-menu a{border-bottom:none}.decanter-main-menu .decanter-main-menu__btn{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;background-color:#b1040e;color:#fff;display:inline;float:right;font-size:1.6rem;height:4rem;line-height:4rem;text-align:center;text-decoration:none;text-transform:uppercase;width:5.8rem}.decanter-main-menu .decanter-main-menu__btn:hover{background-color:transparent}@media screen and (min-width: 951px){.decanter-main-menu .decanter-main-menu__btn{display:none}}.decanter-main-menu .decanter-main-menu__btn:hover{color:#fff;background-color:#b1040e}.decanter-main-menu .decanter-main-menu__btn:visited{color:#fff}@media screen and (min-width: 951px){.decanter-megamenu{padding-top:3.15rem;padding-bottom:3.15rem;left:-1rem;width:100%}}@media screen and (min-width: 951px){.decanter-megamenu::before{background-color:#b1040e;content:'';display:block;height:100%;position:absolute;top:0;width:1000%;right:100%}}@media screen and (min-width: 951px){.decanter-megamenu::after{background-color:#b1040e;content:'';display:block;height:100%;position:absolute;top:0;width:1000%;left:100%}}@media screen and (min-width: 951px){.decanter-megamenu .decanter-megamenu__col{float:left;display:block;margin-right:2.3576520234%;width:23.2317609825%}.decanter-megamenu .decanter-megamenu__col:last-child{margin-right:0}.decanter-megamenu .decanter-megamenu__col:nth-child(2n){float:left;display:block;margin-right:2.3576520234%;width:23.2317609825%}.decanter-megamenu .decanter-megamenu__col:nth-child(2n):last-child{margin-right:0}.decanter-megamenu .decanter-megamenu__col:nth-child(4n){margin-right:0}}.decanter-megamenu .decanter-megamenu__col>ul{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none}.decanter-megamenu .decanter-megamenu__col>ul>li{margin-bottom:0}@media screen and (min-width: 951px){.decanter-megamenu .decanter-nav{width:100%;padding-top:0;padding-left:0}}.decanter-megamenu .decanter-nav__inner{display:flex;flex-direction:column}@media screen and (min-width: 951px){.decanter-megamenu .decanter-nav__inner{display:block;float:right;margin-top:-4.8rem}}@media screen and (min-width: 951px){.decanter-megamenu .decanter-nav-submenu .decanter-grid-full{margin-left:-1.8rem}}.decanter-sidenav__list{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none}.decanter-sidenav__list>li{margin-bottom:0}.decanter-sidenav__list>li{background-color:transparent;font-size:2rem}.decanter-sidenav__list>li:first-child{border-top:none}.decanter-sidenav__list a{border:none;color:#b1040e;display:block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;line-height:1.3;text-decoration:none;padding:.85rem 1rem .85rem 1.8rem}.decanter-sidenav__list a:hover,.decanter-sidenav__list a:focus{color:#2e2d29;text-decoration:underline}.decanter-sidenav__list a.decanter-nav__current{border-left:0.2rem solid #2e2d29;color:#2e2d29;font-weight:600;padding-left:1.4rem}.decanter-sidenav__list a.decanter-nav__current:hover,.decanter-sidenav__list a.decanter-nav__current:focus{text-decoration:none}.decanter-sidenav__sublist{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;margin:0;width:100%}.decanter-sidenav__sublist>li{margin-bottom:0}.decanter-sidenav__sublist li{border:none;font-size:1.8rem}.decanter-sidenav__sublist a{line-height:1.2;padding-left:2.8rem}.decanter-sidenav__sublist a:hover,.decanter-sidenav__sublist a.decanter-nav__current{border:none;padding-left:2.8rem}.decanter-sidenav__sublist .decanter-sidenav__sublist a{padding-left:3.8rem}.decanter-sidenav__sublist .decanter-sidenav__sublist a:hover{padding-left:3.8rem}.decanter-accordion{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;margin:0;padding:0;color:#2e2d29;width:100%}.decanter-accordion>li{margin-bottom:0}.decanter-accordion>ul li ul{list-style:disc}.decanter-accordion>ul li ul>li>ul{list-style:circle}.decanter-accordion>ul li ul>li>ul>li>ul{list-style:square}.decanter-accordion+.decanter-accordion{margin-top:1rem}.decanter-accordion>li{background-color:#4d4f53;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;list-style:none;width:100%;margin-bottom:6px}.decanter-accordion .decanter-accordion__content{background-color:#fff;overflow:auto;padding:3rem}.decanter-accordion .decanter-accordion__content>*:first-child{margin-top:0}.decanter-accordion .decanter-accordion__content>*:last-child{margin-bottom:0}.decanter-accordion .decanter-accordion__content:not([aria-hidden]){position:absolute;left:-999em}.decanter-accordion .decanter-accordion__content[aria-hidden=true]{display:none}.decanter-accordion .decanter-accordion__button{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;margin:0;padding:1.5rem 5.5rem 1.5rem 3rem;background-color:#b1040e;background-image:url("../img/minus.png");background-image:url("../img/minus.svg");background-position:right 3rem center;background-repeat:no-repeat;background-size:13px;color:#fff;cursor:pointer;display:inline-block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-weight:600;width:100%}.decanter-accordion .decanter-accordion__button:hover{background-color:transparent}.decanter-accordion .decanter-accordion__button:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-accordion .decanter-accordion__button:hover{background-color:#2e2d29}.decanter-accordion .decanter-accordion__button h1,.decanter-accordion .decanter-accordion__button h2,.decanter-accordion .decanter-accordion__button h3,.decanter-accordion .decanter-accordion__button h4,.decanter-accordion .decanter-accordion__button h5,.decanter-accordion .decanter-accordion__button h6{margin:0}.decanter-accordion .decanter-accordion__button[aria-expanded=false]{background-image:url("../img/plus.png");background-image:url("../img/plus.svg");background-repeat:no-repeat;background-size:1.3rem}.decanter-accordion--bordered .decanter-accordion__content{border-bottom:1px solid #b6b1a9;border-left:1px solid #b6b1a9;border-right:1px solid #b6b1a9}.hide-logged-in:hover{outline:1px dashed #ffc0cb}.hide-logged-in:hover:before{content:'Visible to logged out users';font-size:10px;position:absolute;z-index:99;background:#fff;border:1px solid}.hide-logged-out:hover{outline:1px dashed #ffc0cb}.hide-logged-out:hover:before{content:'Hidden to logged out users';font-size:10px;position:absolute;z-index:99;background:#fff;border:1px solid}.cke_editable.cke_show_borders table.cke_show_border>tr>th,.cke_editable.cke_show_borders table.cke_show_border>tr>td,.cke_editable.cke_show_borders table.cke_show_border>tbody>tr>th,.cke_editable.cke_show_borders table.cke_show_border>tbody>tr>td{border:1px solid #b6b1a9}.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>thead>tr{background-color:transparent}.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>thead>tr>td,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>thead>tr>th{border-top:0}.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tr>th,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tr>td,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tbody>tr>th,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tbody>tr>td{border-width:1px 0} +.decanter-sr-only{position:absolute;left:-999em}.decanter-embed-container{padding-bottom:56.25%;position:relative;height:0;overflow:hidden;max-width:100%}.decanter-embed-container iframe,.decanter-embed-container object,.decanter-embed-container embed{position:absolute;top:0;left:0;width:100%;height:100%}input,textarea,select{appearance:none;border:.1rem solid #b6b1a9;border-radius:0;box-sizing:border-box;color:#2e2d29;display:block;font-size:2rem;height:4.8rem;line-height:1.3;margin:0.2em 0;max-width:46rem;outline:none;padding:1rem 0.7em;width:100%}input:focus,textarea:focus,select:focus{box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}label{display:block;margin-top:3rem;max-width:46rem}textarea{height:16rem}select{-moz-appearance:none;-webkit-appearance:none;appearance:none;background-color:#fff;background-image:url("../img/arrow-down.png");background-image:url("../img/arrow-down.svg");background-position:right 1.3rem center;background-repeat:no-repeat;background-size:1.3rem}legend{font-size:3.3rem;font-weight:600}fieldset{border:none}.decanter-fieldset-inputs label{margin-top:0}[type=checkbox],[type=radio]{position:absolute;left:-999em}.lt-ie9 [type=checkbox],.lt-ie9 [type=radio]{border:0;float:left;margin:0.4em 0.4em 0 0;position:static;width:auto}[type=checkbox]+label,[type=radio]+label{cursor:pointer;font-weight:400;margin-bottom:0.5em}[type=checkbox]+label::before,[type=radio]+label::before{background:#fff;border-radius:3px;box-shadow:0 0 0 1px #b6b1a9;content:'\a0';display:inline-block;height:1.8rem;line-height:1.8rem;margin-right:0.6em;text-indent:0.15em;vertical-align:middle\0;width:1.8rem}[type=radio]+label::before{box-shadow:0 0 0 2px #fff,0 0 0 3px #b6b1a9;height:1.6rem;line-height:1.6rem;width:1.6rem;border-radius:100%}[type=checkbox]:checked+label::before,[type=radio]:checked+label::before{background-color:#b1040e;box-shadow:0 0 0 1px #b1040e}[type=radio]:checked+label::before{box-shadow:0 0 0 2px #fff,0 0 0 4px #b1040e}[type=radio]:focus+label::before{box-shadow:0 0 0 2px #fff,0 0 0 4px #b1040e,0 0 3px 4px #2e2d29,0 0 7px 4px #2e2d29}[type=checkbox]:checked+label::before,[type=checkbox]:checked:disabled+label::before{background-image:url("../img/check.png");background-image:url("../img/check.svg");background-position:50%;background-repeat:no-repeat}[type=checkbox]:focus+label::before{box-shadow:0 0 0 1px #fff,0 0 0 3px #b1040e}[type=checkbox]:disabled+label{color:#b6b1a9}[type=checkbox]:disabled+label::before,[type=radio]:disabled+label::before{background:#b6b1a9;cursor:not-allowed}[type=range]{-webkit-appearance:none;border:none;padding-left:0;width:100%}[type=range]:focus{box-shadow:none;outline:none}[type=range]::-webkit-slider-runnable-track{background:#4d4f53;border:1px solid #b6b1a9;cursor:pointer;height:1.2rem;width:100%}[type=range]::-moz-range-track{background:#b1040e;border:1px solid #b6b1a9;cursor:pointer;height:1.2rem;width:100%}[type=range]::-ms-track{background:transparent;color:transparent;cursor:pointer;height:1.2rem;width:100%}[type=range]::-webkit-slider-thumb{-webkit-appearance:none;border:1px solid #b6b1a9;height:2.2rem;border-radius:1.5rem;background:#4d4f53;cursor:pointer;margin-top:-.65rem;width:2.2rem}[type=range]::-moz-range-thumb{background:#4d4f53;border:1px solid #b6b1a9;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-thumb{background:#4d4f53;border:1px solid #b6b1a9;border-radius:1.5rem;cursor:pointer;height:2.2rem;width:2.2rem}[type=range]::-ms-fill-lower{background:#4d4f53;border:1px solid #b6b1a9;border-radius:2rem}[type=range]::-ms-fill-upper{background:#4d4f53;border:1px solid #b6b1a9;border-radius:2rem}[type=range]:focus::-webkit-slider-thumb{border:2px solid #b6b1a9}[type=range]:focus::-moz-range-thumb{border:2px solid #b6b1a9}[type=range]:focus::-ms-thumb{border:2px solid #b6b1a9}a{color:#b1040e;text-decoration:underline}a:hover,a:active{color:#2e2d29}a:focus{outline:0}.decanter-external-link::after{background:url("../img/external-link.png") no-repeat 0 0;background:url("../img/external-link.svg") no-repeat 0 0;background-size:100%;content:'';display:inline-block;height:0.65em;width:0.65em;margin-bottom:-1px;margin-left:4px}.decanter-external-link:hover::after{background-image:url("../img/external-link-hover.png");background-image:url("../img/external-link-hover.svg")}.decanter-more-link::after{color:#b1040e;content:'\00BB';display:inline-block;margin-left:4px}.decanter-more-link:hover::after{color:#2e2d29}ul,ol{margin-top:1em;margin-bottom:1em;padding-left:1em}li{line-height:1.4;margin-bottom:.5em}li:last-child{margin-bottom:0}h1+ul,h1+ol,h2+ul,h2+ol,h3+ul,h3+ol,h4+ul,h4+ol,h5+ul,h5+ol,h6+ul,h6+ol,p+ul,p+ol{margin-top:0}.decanter-list-unstyled{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none}.decanter-list-unstyled>li{margin-bottom:0}.decanter-quote{padding:1em;overflow:hidden}.decanter-quote .decanter-quote__img{float:left;margin-right:1rem;border-radius:150px;border:7px solid;height:300px;width:300px;margin-right:2em}.decanter-quote .decanter-quote__body .decanter-quote__heading{font-size:2em;font-weight:600;margin-bottom:.5em}.decanter-quote .decanter-quote__body .decanter-quote__bio{margin:0}.decanter-quote .decanter-quote__body .decanter-quote__quote{font-size:1.5em;font-weight:600}table{border-spacing:0;min-width:100%;margin:2em 0}table th,table td{border:1px solid #b6b1a9;padding:1.5rem}table th{background-color:#dad7cb;color:#2e2d29;text-align:left}table td{background-color:#fff}table thead th,table thead td{background-color:#4d4f53}table tbody th{font-weight:400}.decanter-table--borderless thead tr{background-color:transparent}.decanter-table--borderless thead th{border-top:0}.decanter-table--borderless th,.decanter-table--borderless td{border-left:0;border-right:0}html{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:10px}body{color:#2e2d29;font-size:2rem}p{line-height:1.4;margin-top:1em;margin-bottom:1em}h1,h2,h3,h4,h5,h6{clear:both;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;line-height:1.2;margin-top:1.5em;margin-bottom:.5em}.decanter-sans h1,.decanter-sans h2,.decanter-sans h3,.decanter-sans h4,.decanter-sans h5,.decanter-sans h6{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif}.decanter-serif h1,.decanter-serif h2,.decanter-serif h3,.decanter-serif h4,.decanter-serif h5,.decanter-serif h6{font-family:"Crimson Text","Georgia","Times","Times New Roman",serif}.decanter-slab h1,.decanter-slab h2,.decanter-slab h3,.decanter-slab h4,.decanter-slab h5,.decanter-slab h6{font-family:"Roboto Slab","Georgia","Times","Times New Roman",serif}h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{text-decoration:none}h1{font-size:4.3rem;font-weight:600}h2{font-size:3.3rem;font-weight:600}h3{font-size:2.3rem;font-weight:600}h4{font-size:2rem;font-weight:600}h5{font-size:1.8rem;font-weight:600}h6{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:1.6rem;font-weight:400;text-transform:uppercase}cite,var,address,dfn{font-style:normal}.decanter-sans p,.decanter-sans a,.decanter-sans li,.decanter-sans span{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif}.decanter-sans a{border-bottom:none;font-weight:600}.decanter-serif p,.decanter-serif a,.decanter-serif li,.decanter-serif span{font-family:"Crimson Text","Georgia","Times","Times New Roman",serif}.decanter-slab p,.decanter-slab a,.decanter-slab li,.decanter-slab span{font-family:"Roboto Slab","Georgia","Times","Times New Roman",serif}.decanter-font-lead{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2.3rem;font-weight:200;line-height:1.5;max-width:85rem}.decanter-font-splash{font-size:2.3rem;font-weight:600;margin-bottom:0}@media screen and (min-width: 481px){.decanter-font-splash{font-size:4.3rem;font-weight:600}}@media screen and (min-width: 600px){.decanter-font-splash{font-size:5.5rem;font-weight:600}}.decanter-short-line-length{max-width:70rem}.decanter-caption{color:#4d4f53;font-size:1.7rem;margin-top:0}.decanter-credits{color:#4d4f53;font-size:1.7rem;font-style:italic;margin-top:0}.decanter-grid>:first-child,.decanter-grid-full>:first-child{margin-top:0}.decanter-grid>:last-child,.decanter-grid-full>:last-child{margin-bottom:0}.decanter-width-one-whole:first-child>:first-child,.decanter-width-one-half:first-child>:first-child,.decanter-width-one-third:first-child>:first-child,.decanter-width-two-thirds:first-child>:first-child,.decanter-width-one-fourth:first-child>:first-child,.decanter-width-three-fourths:first-child>:first-child,.decanter-width-one-sixth:first-child>:first-child,.decanter-width-five-sixths:first-child>:first-child,.decanter-width-one-twelfth:first-child>:first-child{margin-top:0}@media screen and (min-width: 600px){.decanter-width-one-whole>:first-child,.decanter-width-one-half>:first-child,.decanter-width-one-third>:first-child,.decanter-width-two-thirds>:first-child,.decanter-width-one-fourth>:first-child,.decanter-width-three-fourths>:first-child,.decanter-width-one-sixth>:first-child,.decanter-width-five-sixths>:first-child,.decanter-width-one-twelfth>:first-child{margin-top:0}}.decanter-width-one-whole:last-child>:last-child,.decanter-width-one-half:last-child>:last-child,.decanter-width-one-third:last-child>:last-child,.decanter-width-two-thirds:last-child>:last-child,.decanter-width-one-fourth:last-child>:last-child,.decanter-width-three-fourths:last-child>:last-child,.decanter-width-one-sixth:last-child>:last-child,.decanter-width-five-sixths:last-child>:last-child,.decanter-width-one-twelfth:last-child>:last-child{margin-bottom:0}@media screen and (min-width: 600px){.decanter-width-one-whole>:last-child,.decanter-width-one-half>:last-child,.decanter-width-one-third>:last-child,.decanter-width-two-thirds>:last-child,.decanter-width-one-fourth>:last-child,.decanter-width-three-fourths>:last-child,.decanter-width-one-sixth>:last-child,.decanter-width-five-sixths>:last-child,.decanter-width-one-twelfth>:last-child{margin-bottom:0}}.decanter-button,a.decanter-button,button,[type=button],[type=submit],[type=reset],[type=image]{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1rem 2rem;appearance:none;background-color:#b1040e;border:0;color:#fff;cursor:pointer;display:inline-block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%}@media screen and (min-width: 481px){.decanter-button,a.decanter-button,button,[type=button],[type=submit],[type=reset],[type=image]{width:auto}}.decanter-button:hover,a.decanter-button:hover,button:hover,[type=button]:hover,[type=submit]:hover,[type=reset]:hover,[type=image]:hover{background-color:#2e2d29;border-bottom:0;color:#fff;text-decoration:none}.decanter-button:focus,a.decanter-button:focus,button:focus,[type=button]:focus,[type=submit]:focus,[type=reset]:focus,[type=image]:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-button--secondary,a.decanter-button--secondary{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1rem 2rem;appearance:none;background-color:#fff;border:0;box-shadow:inset 0 0 0 2px #b1040e;color:#b1040e;cursor:pointer;display:inline-block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%}@media screen and (min-width: 481px){.decanter-button--secondary,a.decanter-button--secondary{width:auto}}.decanter-button--secondary:hover,a.decanter-button--secondary:hover{background-color:#fff;border-bottom:0;box-shadow:inset 0 0 0 2px #2e2d29;color:#2e2d29;text-decoration:none}.decanter-button--secondary:focus,a.decanter-button--secondary:focus{background-color:#fff;box-shadow:inset 0 0 0 2px #2e2d29,0 0 3px #4d4f53,0 0 7px #4d4f53;color:#2e2d29}.decanter-button--big,a.decanter-button--big{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1.5rem 3rem;appearance:none;background-color:#b1040e;border:0;color:#fff;cursor:pointer;display:inline-block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2.3rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%}@media screen and (min-width: 481px){.decanter-button--big,a.decanter-button--big{width:auto}}.decanter-button--big:hover,a.decanter-button--big:hover{background-color:#2e2d29;border-bottom:0;color:#fff;text-decoration:none}.decanter-button--big:focus,a.decanter-button--big:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-button--unstyled,a.decanter-button--unstyled{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0}.decanter-button--unstyled:hover,a.decanter-button--unstyled:hover{background-color:transparent}.decanter-media-block__img{float:left;margin-right:1rem}.decanter-media-block__body{overflow:hidden}.decanter-skipnav{background:transparent;color:#2e2d29;left:0;position:absolute;top:-4.2rem;transition:all 0.2s ease-in-out;z-index:100;padding:1rem 1.5rem}.decanter-skipnav:focus{background:#fff;left:0;outline:0;position:absolute;top:0;transition:all 0.2s ease-in-out}.decanter-alert{background-color:#f4f4f4;background-position:1rem 2rem;background-repeat:no-repeat;background-size:4rem;margin-top:1.5em;padding:1em}@media screen and (min-width: 600px){.decanter-alert{background-size:5.2rem}}.decanter-alert a{color:#006cb8}.decanter-alert a:focus,.decanter-alert a:hover{color:#00548f}.decanter-alert ul{margin-top:1em;margin-bottom:0;padding-left:1em}.decanter-alert .decanter-alert__body{display:table-cell;vertical-align:top;padding-left:3.5rem}@media screen and (min-width: 600px){.decanter-alert .decanter-alert__body{padding-left:5rem}}.decanter-alert .decanter-alert__body p:first-child{margin-top:.8rem}.decanter-alert .decanter-alert__body p:last-child{margin-bottom:.8rem}.decanter-alert .decanter-alert__body .decanter-alert__heading{margin-top:0;margin-bottom:.3rem}@media screen and (min-width: 600px){.decanter-alert .decanter-alert__body .decanter-alert__heading{margin-top:.3rem}}.decanter-alert .decanter-alert__body .decanter-alert__text{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;margin-top:0;margin-bottom:0}.decanter-alert-success{background-color:rgba(23,94,84,0.6);background-image:url("../img/success.png");background-image:url("../img/success.svg")}.decanter-alert-warning{background-color:rgba(234,171,0,0.6);background-image:url("../img/warning.png");background-image:url("../img/warning.svg")}.decanter-alert-error{background-color:rgba(177,4,14,0.5);background-image:url("../img/error.png");background-image:url("../img/error.svg")}.decanter-alert-info{background-color:rgba(0,152,219,0.6);background-image:url("../img/info.png");background-image:url("../img/info.svg")}.decanter-icon-block{padding:1em;overflow:hidden;display:block}.decanter-icon-block .decanter-icon-block__img{float:left;margin-right:1rem;margin-right:1.5625em}.decanter-icon-block .decanter-icon-block__body .decanter-icon-block__heading{font-size:1.25em;font-weight:600;margin:0}.decanter-icon-block .decanter-icon-block__body .decanter-icon-block__detail{margin-top:.3em;margin-bottom:.3em}.decanter-icon-block .decanter-icon-block__body .decanter-icon-block__link{margin-top:.25em;margin-bottom:.25em}.decanter-icon-grid .decanter-icon-grid__row .decanter-media-block{margin-bottom:3rem}@media screen and (min-width: 600px){.decanter-icon-grid .decanter-icon-grid__row .decanter-media-block{margin-bottom:6rem}}@media screen and (min-width: 600px){.decanter-icon-grid .decanter-icon-grid__row:last-child .decanter-media-block{margin-bottom:0}}.decanter-icon-grid .decanter-icon-grid__row:last-child .decanter-media-block:last-child{margin-bottom:0}.decanter-icon-grid .decanter-media-block__img{margin-right:3rem}.decanter-icon-grid .decanter-media-block__body>:first-child{margin-top:0}.decanter-nav{position:fixed;top:0;right:0;bottom:0;left:auto;padding:2rem;background:transparent;border-left:1px solid #4d4f53;border-right:0;display:flex;flex-direction:column;overflow-y:auto;transform:translateX(26rem);width:26rem;z-index:9000}@media screen and (min-width: 951px){.decanter-nav{padding-top:5rem;padding-right:0;padding-bottom:0;border-left:none;display:block;float:right;overflow-y:visible;position:relative;transform:translateX(0);width:auto}}.decanter-nav.is-visible{transform:translateX(0);transition:all 0.3s ease-in-out}.decanter-nav nav{margin-top:6rem;min-height:100%}@media screen and (min-width: 951px){.decanter-nav nav{margin-top:0}}.decanter-nav .decanter-nav__current{border-left:4px solid #b1040e;color:#2e2d29;font-weight:600;padding-left:1.4rem}.decanter-nav .decanter-button{width:100%}.decanter-nav__link{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased}@media screen and (min-width: 951px){.decanter-nav__link:hover{border-bottom:0.2rem solid #2e2d29;padding-bottom:1rem}}@media screen and (min-width: 951px){.decanter-nav__container{max-width:1200px;margin-left:auto;margin-right:auto;padding-right:3rem;padding-left:3rem;max-width:1220px}.decanter-nav__container::after{clear:both;content:"";display:block}}.decanter-nav-primary{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;order:2}.decanter-nav-primary>li{margin-bottom:0}.decanter-nav-primary>li{background-color:transparent;font-size:2rem}.decanter-nav-primary>li:first-child{border-top:none}.decanter-nav-primary a{border:none;color:#b1040e;display:block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;line-height:1.3;text-decoration:none;padding:.85rem 1rem .85rem 1.8rem}.decanter-nav-primary a:hover,.decanter-nav-primary a:focus{color:#2e2d29;text-decoration:underline}.decanter-nav-primary a.decanter-nav__current{border-left:0.2rem solid #2e2d29;color:#2e2d29;font-weight:600;padding-left:1.4rem}.decanter-nav-primary a.decanter-nav__current:hover,.decanter-nav-primary a.decanter-nav__current:focus{text-decoration:none}@media screen and (min-width: 951px){.decanter-nav-primary{display:inline}}@media screen and (min-width: 951px){.decanter-nav-primary li{border-top:none}}.decanter-nav-primary>li,.decanter-nav-primary.decanter-accordion>li{background-color:transparent;width:auto}@media screen and (min-width: 951px){.decanter-nav-primary>li,.decanter-nav-primary.decanter-accordion>li{display:inline-block}}@media screen and (min-width: 951px){.decanter-nav-primary>li>a,.decanter-nav-primary.decanter-accordion>li>a{padding:1.3rem 1.5rem 1.7rem;color:#b1040e;font-size:1.8rem;font-weight:600;line-height:1.2}}.decanter-nav-primary>li>a:hover,.decanter-nav-primary.decanter-accordion>li>a:hover{color:#2e2d29;text-decoration:none}@media screen and (min-width: 951px){.decanter-nav-primary>li>a:hover,.decanter-nav-primary.decanter-accordion>li>a:hover{background-color:transparent}}.decanter-nav-primary button{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;padding:1.4rem 1.5rem 1rem 1.8rem;font-weight:400}.decanter-nav-primary button:hover{background-color:transparent}@media screen and (min-width: 951px){.decanter-nav-primary button{padding-right:3rem;padding-bottom:1.9rem;padding-left:1.5rem;color:#b1040e;font-size:1.8rem;font-weight:600;width:initial}}.decanter-nav-primary button:focus,.decanter-nav-primary button:active{background-color:transparent;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-nav-primary button:hover{color:#2e2d29}@media screen and (min-width: 951px){.decanter-nav-primary button:hover{background-color:transparent}}.decanter-nav-primary button[aria-expanded=false]{background-image:url("../img/plus.png");background-image:url("../img/plus.svg");background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width: 951px){.decanter-nav-primary button[aria-expanded=false]{background-image:url("../img/arrow-down.png");background-image:url("../img/arrow-down.svg");background-position:right 1.5rem top 44%}.decanter-nav-primary button[aria-expanded=false]:hover{background-image:url("../img/arrow-down-hover.png");background-image:url("../img/arrow-down-hover.svg");background-position:right 1.5rem top 58%}}.decanter-nav-primary button[aria-expanded=true]{background-image:url("../img/minus.png");background-image:url("../img/minus.svg");background-repeat:no-repeat;background-position:right 0 center;background-size:1rem}@media screen and (min-width: 951px){.decanter-nav-primary button[aria-expanded=true]{background-color:#b1040e;background-image:url("../img/arrow-down-hover.png");background-image:url("../img/arrow-down-hover.svg");background-position:right 1.5rem top 58%;color:#fff;border-bottom:0.2rem solid #2e2d29;padding-bottom:1rem}.decanter-nav-primary button[aria-expanded=true]:hover{background-color:#b1040e;background-position:right 1.5rem top 58%}}@media screen and (min-width: 951px){.decanter-nav-primary a.decanter-nav__current{border-left:0;padding-left:1.5rem;border-bottom:0.2rem solid #2e2d29;padding-bottom:1rem}}@media screen and (min-width: 951px){.decanter-nav-submenu{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;padding-top:1.15rem;padding-bottom:1.15rem;background-color:#b1040e;min-width:21.5rem;width:auto;position:absolute}.decanter-nav-submenu>li{margin-bottom:0}}.decanter-nav-submenu[aria-hidden=true]{display:none}@media screen and (min-width: 951px){.decanter-nav-submenu a{color:#fff;padding-left:1.5rem}}@media screen and (min-width: 951px){.decanter-nav-submenu a:hover{background-color:#b1040e;color:#fff;text-decoration:underline}}.decanter-nav-submenu li{font-size:1.8rem;margin-bottom:0}.decanter-nav__overlay{position:fixed;top:0;right:0;bottom:0;left:0;background:#2e2d29;opacity:0;transition:all 0.2s ease-in-out;visibility:hidden;z-index:8000}.decanter-nav__overlay.is-visible{opacity:0.6;visibility:visible}.decanter-nav__close{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;margin:-1.2rem -1.5rem 2.4rem auto;float:right;height:4.4rem;text-align:center;width:4.4rem}.decanter-nav__close:hover{background-color:transparent}@media screen and (min-width: 951px){.decanter-nav__close{display:none}}.decanter-nav__close img{width:1.3rem}.decanter-mobile-nav--active{overflow:hidden}.decanter-main-menu{width:100%;z-index:7000}.decanter-main-menu a{border-bottom:none}.decanter-main-menu .decanter-main-menu__btn{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;background-color:#b1040e;color:#fff;display:inline;float:right;font-size:1.6rem;height:4rem;line-height:4rem;text-align:center;text-decoration:none;text-transform:uppercase;width:5.8rem}.decanter-main-menu .decanter-main-menu__btn:hover{background-color:transparent}@media screen and (min-width: 951px){.decanter-main-menu .decanter-main-menu__btn{display:none}}.decanter-main-menu .decanter-main-menu__btn:hover{color:#fff;background-color:#b1040e}.decanter-main-menu .decanter-main-menu__btn:visited{color:#fff}@media screen and (min-width: 951px){.decanter-megamenu{padding-top:3.15rem;padding-bottom:3.15rem;left:-1rem;width:100%}}@media screen and (min-width: 951px){.decanter-megamenu::before{background-color:#b1040e;content:'';display:block;height:100%;position:absolute;top:0;width:1000%;right:100%}}@media screen and (min-width: 951px){.decanter-megamenu::after{background-color:#b1040e;content:'';display:block;height:100%;position:absolute;top:0;width:1000%;left:100%}}@media screen and (min-width: 951px){.decanter-megamenu .decanter-megamenu__col{float:left;display:block;margin-right:2.3576520234%;width:23.2317609825%}.decanter-megamenu .decanter-megamenu__col:last-child{margin-right:0}.decanter-megamenu .decanter-megamenu__col:nth-child(2n){float:left;display:block;margin-right:2.3576520234%;width:23.2317609825%}.decanter-megamenu .decanter-megamenu__col:nth-child(2n):last-child{margin-right:0}.decanter-megamenu .decanter-megamenu__col:nth-child(4n){margin-right:0}}.decanter-megamenu .decanter-megamenu__col>ul{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none}.decanter-megamenu .decanter-megamenu__col>ul>li{margin-bottom:0}@media screen and (min-width: 951px){.decanter-megamenu .decanter-nav{width:100%;padding-top:0;padding-left:0}}.decanter-megamenu .decanter-nav__inner{display:flex;flex-direction:column}@media screen and (min-width: 951px){.decanter-megamenu .decanter-nav__inner{display:block;float:right;margin-top:-4.8rem}}@media screen and (min-width: 951px){.decanter-megamenu .decanter-nav-submenu .decanter-grid-full{margin-left:-1.8rem}}.decanter-sidenav__list{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none}.decanter-sidenav__list>li{margin-bottom:0}.decanter-sidenav__list>li{background-color:transparent;font-size:2rem}.decanter-sidenav__list>li:first-child{border-top:none}.decanter-sidenav__list a{border:none;color:#b1040e;display:block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;line-height:1.3;text-decoration:none;padding:.85rem 1rem .85rem 1.8rem}.decanter-sidenav__list a:hover,.decanter-sidenav__list a:focus{color:#2e2d29;text-decoration:underline}.decanter-sidenav__list a.decanter-nav__current{border-left:0.2rem solid #2e2d29;color:#2e2d29;font-weight:600;padding-left:1.4rem}.decanter-sidenav__list a.decanter-nav__current:hover,.decanter-sidenav__list a.decanter-nav__current:focus{text-decoration:none}.decanter-sidenav__sublist{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;margin:0;width:100%}.decanter-sidenav__sublist>li{margin-bottom:0}.decanter-sidenav__sublist li{border:none;font-size:1.8rem}.decanter-sidenav__sublist a{line-height:1.2;padding-left:2.8rem}.decanter-sidenav__sublist a:hover,.decanter-sidenav__sublist a.decanter-nav__current{border:none;padding-left:2.8rem}.decanter-sidenav__sublist .decanter-sidenav__sublist a{padding-left:3.8rem}.decanter-sidenav__sublist .decanter-sidenav__sublist a:hover{padding-left:3.8rem}.decanter-accordion{margin-top:0;margin-bottom:0;padding-left:0;list-style-type:none;margin:0;padding:0;color:#2e2d29;width:100%}.decanter-accordion>li{margin-bottom:0}.decanter-accordion>ul li ul{list-style:disc}.decanter-accordion>ul li ul>li>ul{list-style:circle}.decanter-accordion>ul li ul>li>ul>li>ul{list-style:square}.decanter-accordion+.decanter-accordion{margin-top:1rem}.decanter-accordion>li{background-color:#4d4f53;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;list-style:none;width:100%;margin-bottom:6px}.decanter-accordion .decanter-accordion__content{background-color:#fff;overflow:auto;padding:3rem}.decanter-accordion .decanter-accordion__content>*:first-child{margin-top:0}.decanter-accordion .decanter-accordion__content>*:last-child{margin-bottom:0}.decanter-accordion .decanter-accordion__content:not([aria-hidden]){position:absolute;left:-999em}.decanter-accordion .decanter-accordion__content[aria-hidden=true]{display:none}.decanter-accordion .decanter-accordion__button{background-color:transparent;border:0;font-weight:400;outline:0;text-align:left;-webkit-font-smoothing:auto;margin:0;padding:0;margin:0;padding:1.5rem 5.5rem 1.5rem 3rem;background-color:#b1040e;background-image:url("../img/minus.png");background-image:url("../img/minus.svg");background-position:right 3rem center;background-repeat:no-repeat;background-size:13px;color:#fff;cursor:pointer;display:inline-block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-weight:600;width:100%}.decanter-accordion .decanter-accordion__button:hover{background-color:transparent}.decanter-accordion .decanter-accordion__button:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53}.decanter-accordion .decanter-accordion__button:hover{background-color:#2e2d29}.decanter-accordion .decanter-accordion__button h1,.decanter-accordion .decanter-accordion__button h2,.decanter-accordion .decanter-accordion__button h3,.decanter-accordion .decanter-accordion__button h4,.decanter-accordion .decanter-accordion__button h5,.decanter-accordion .decanter-accordion__button h6{margin:0}.decanter-accordion .decanter-accordion__button[aria-expanded=false]{background-image:url("../img/plus.png");background-image:url("../img/plus.svg");background-repeat:no-repeat;background-size:1.3rem}.decanter-accordion--bordered .decanter-accordion__content{border-bottom:1px solid #b6b1a9;border-left:1px solid #b6b1a9;border-right:1px solid #b6b1a9}.hide-logged-in:hover{outline:1px dashed #ffc0cb}.hide-logged-in:hover:before{content:'Visible to logged out users';font-size:10px;position:absolute;z-index:99;background:#fff;border:1px solid}.hide-logged-out:hover{outline:1px dashed #ffc0cb}.hide-logged-out:hover:before{content:'Hidden to logged out users';font-size:10px;position:absolute;z-index:99;background:#fff;border:1px solid}.cke_editable.cke_show_borders table.cke_show_border>tr>th,.cke_editable.cke_show_borders table.cke_show_border>tr>td,.cke_editable.cke_show_borders table.cke_show_border>tbody>tr>th,.cke_editable.cke_show_borders table.cke_show_border>tbody>tr>td{border:1px solid #b6b1a9}.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>thead>tr{background-color:transparent}.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>thead>tr>td,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>thead>tr>th{border-top:0}.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tr>th,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tr>td,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tbody>tr>th,.cke_editable.cke_show_borders table.cke_show_border.decanter-table--borderless>tbody>tr>td{border-width:1px 0} diff --git a/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss b/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss index 26d7fe2a80..9c6b483e9b 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss @@ -188,3 +188,13 @@ a[data-extlink] { } } } + +// Decanter unsets focus style provided by the browser. We NEED this. +body *:focus { + outline: rgb(77, 144, 254) auto 5px; +} + +.brand-bar *:focus, +.decanter-button *:focus { + outline: #ffffff auto 5px; +} From c74838c5c292061b7ad44fadca6262b4a63ede7a Mon Sep 17 00:00:00 2001 From: pookmish Date: Wed, 13 Feb 2019 13:05:59 -0800 Subject: [PATCH 12/25] HSD8-576 view field title (#184) * HSD8-576 Allow user to display view title * Added states to the form elements * correct translation call --- ....field.paragraph.hs_view.field_hs_view.yml | 4 +- .../hs_field_helpers/hs_field_helpers.install | 69 ++++++++++++++ .../hs_field_helpers/hs_field_helpers.module | 27 ------ .../HsViewfieldFormatterDefault.php | 74 +++++++++++++++ .../Field/FieldType/HsViewfieldItem.php | 92 +++++++++++++++++++ .../FieldWidget/HsViewfieldWidgetSelect.php | 75 +++++++++++++++ .../templates/field/viewfield-item.html.twig | 63 +++++++++++++ 7 files changed, 375 insertions(+), 29 deletions(-) create mode 100644 docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php create mode 100644 docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldType/HsViewfieldItem.php create mode 100644 docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php create mode 100644 docroot/themes/humsci/su_humsci_theme/templates/field/viewfield-item.html.twig diff --git a/config/default/field.field.paragraph.hs_view.field_hs_view.yml b/config/default/field.field.paragraph.hs_view.field_hs_view.yml index edace7c751..b7b2393757 100644 --- a/config/default/field.field.paragraph.hs_view.field_hs_view.yml +++ b/config/default/field.field.paragraph.hs_view.field_hs_view.yml @@ -15,13 +15,12 @@ third_party_settings: - block_content - files - frontpage - - media - - user_admin_people - content_recent - redirect - redirect_404 - media_entity_browser - taxonomy_term + - user_admin_people - watchdog - who_s_new - who_s_online @@ -46,6 +45,7 @@ settings: feed: 0 default: 0 page: 0 + allow_title_customizing: 1 handler: 'default:view' handler_settings: { } field_type: viewfield diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install index d30f26ac73..bdc118bbb5 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install @@ -12,6 +12,30 @@ function hs_field_helpers_install() { module_set_weight('hs_field_helpers', 10); } +/** + * Implements hook_uninstall(). + */ +function hs_field_helpers_uninstall() { + $database_schema = \Drupal::database()->schema(); + $viewfields = \Drupal::service('entity_field.manager') + ->getFieldMapByFieldType('viewfield'); + + $columns = ['show_title', 'override_title', 'overridden_title']; + + foreach ($viewfields as $entity_type => $fields) { + foreach (array_keys($fields) as $field_name) { + foreach ($columns as $column_name) { + if ($database_schema->tableExists("{$entity_type}__{$field_name}")) { + $database_schema->dropField("{$entity_type}__{$field_name}", "{$field_name}_{$column_name}"); + } + if ($database_schema->tableExists("{$entity_type}_revision__{$field_name}")) { + $database_schema->dropField("{$entity_type}_revision__{$field_name}", "{$field_name}_{$column_name}"); + } + } + } + } +} + /** * Install hs_migrate module that now contains the migrate plugins and cron. */ @@ -25,3 +49,48 @@ function hs_field_helpers_update_8001() { function hs_field_helpers_update_8002() { \Drupal::service('module_installer')->install(['hs_views_helper']); } + + +/** + * Add columns to view field tables for title customization. + */ +function hs_field_helpers_update_8003() { + $database_schema = \Drupal::database()->schema(); + $viewfields = \Drupal::service('entity_field.manager') + ->getFieldMapByFieldType('viewfield'); + + $schema['show_title'] = [ + 'description' => 'Show the title of the view.', + 'type' => 'int', + 'size' => 'small', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ]; + $schema['override_title'] = [ + 'description' => 'Override the title of the view.', + 'type' => 'int', + 'size' => 'small', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ]; + $schema['overridden_title'] = [ + 'description' => 'Customize view title.', + 'type' => 'varchar', + 'length' => 255, + ]; + + foreach ($viewfields as $entity_type => $fields) { + foreach (array_keys($fields) as $field_name) { + foreach ($schema as $new_column => $column_spec) { + if ($database_schema->tableExists("{$entity_type}__{$field_name}")) { + $database_schema->addField("{$entity_type}__{$field_name}", "{$field_name}_{$new_column}", $column_spec); + } + if ($database_schema->tableExists("{$entity_type}_revision__{$field_name}")) { + $database_schema->addField("{$entity_type}_revision__{$field_name}", "{$field_name}_{$new_column}", $column_spec); + } + } + } + } +} diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module index 4366718d6e..8e3fb3d710 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module @@ -87,20 +87,6 @@ function hs_field_helpers_entity_view_mode_alter(&$view_mode, EntityInterface $e } } -/** - * Implements hook_field_widget_info_alter(). - */ -function hs_field_helpers_field_widget_info_alter(array &$info) { - $info['options_select']['field_types'][] = 'display_mode_field'; -} - -/** - * Implements hook_field_formatter_info_alter(). - */ -function hs_field_helpers_field_formatter_info_alter(array &$info) { - $info['list_default']['field_types'][] = 'display_mode_field'; -} - /** * Implements hook_preprocess(). */ @@ -251,19 +237,6 @@ function hs_field_helpers_field_widget_form_alter(&$element, FormStateInterface $widget = $context['widget']; switch ($widget->getPluginId()) { - case 'viewfield_select': - /** @var \Drupal\field\Entity\FieldConfig $field_config */ - $field_config = $context['items']->getFieldDefinition(); - // Strip the view options as defined by the exclude views settings. - // @see hs_field_helpers_form_field_config_edit_form_alter(). - if ($excluded_views = $field_config->getThirdPartySetting('hs_field_helpers', 'excluded_views')) { - $element['target_id']['#options'] = array_diff_key($element['target_id']['#options'], array_flip($excluded_views)); - } - // Chosen & Material Admin conflicts with this select list during ajax. - // The easiest way to fix is to disable those libraries. - $element['display_id']['#attributes']['class'][] = 'browser-default'; - break; - case 'daterange_datelist': case 'daterange_default': // To simulate the same field functionality as we had in D7, we need to diff --git a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php new file mode 100644 index 0000000000..2fd7802c05 --- /dev/null +++ b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldFormatter/HsViewfieldFormatterDefault.php @@ -0,0 +1,74 @@ +getFieldValues($items) as $delta => $value) { + // Either the view is empty or the user doesn't want to display the title. + if (!$value['show_title'] || !$this->viewHasResults($elements[$delta]['#content']['#view'])) { + continue; + } + + $elements[$delta]['#label_display'] = 'above'; + if ($value['override_title'] && $value['overridden_title']) { + $elements[$delta]['#title'] = $value['overridden_title']; + } + } + return $elements; + } + + /** + * Get the values from the entity or from the items. + * + * @param \Drupal\Core\Field\FieldItemListInterface $items + * Field list items. + * + * @return array + * Keyed array of field values. + */ + protected function getFieldValues(FieldItemListInterface $items) { + if ($this->getFieldSetting('force_default')) { + $values = $this->fieldDefinition->getDefaultValue($items->getEntity()); + } + else { + $values = []; + foreach ($items as $delta => $item) { + $values[$delta] = $item->getValue(); + } + } + return $values; + } + + /** + * Check if there is something to display from the view. + * + * @param \Drupal\views\ViewExecutable $view + * Executed view object. + * + * @return bool + * If the view has results or an empty result display. + */ + protected function viewHasResults(ViewExecutable $view) { + if ($view->result || $view->empty) { + return TRUE; + } + } + +} diff --git a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldType/HsViewfieldItem.php b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldType/HsViewfieldItem.php new file mode 100644 index 0000000000..5e467437d6 --- /dev/null +++ b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldType/HsViewfieldItem.php @@ -0,0 +1,92 @@ + 'checkbox', + '#title' => $this->t('Allow customized view title'), + '#description' => $this->t('Let the user choose to display the view title and customize it'), + '#default_value' => $this->getSetting('allow_title_customizing'), + '#weight' => -10, + ]; + return $form; + } + + /** + * {@inheritdoc} + */ + public static function schema(FieldStorageDefinitionInterface $field_definition) { + $schema = parent::schema($field_definition); + $schema['columns']['show_title'] = [ + 'description' => 'Show the title of the view.', + 'type' => 'int', + 'size' => 'small', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ]; + $schema['columns']['override_title'] = [ + 'description' => 'Override the title of the view.', + 'type' => 'int', + 'size' => 'small', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ]; + $schema['columns']['overridden_title'] = [ + 'description' => 'Customize view title.', + 'type' => 'varchar', + 'length' => 255, + ]; + return $schema; + } + + /** + * {@inheritdoc} + */ + public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) { + $properties = parent::propertyDefinitions($field_definition); + + $properties['show_title'] = DataDefinition::create('integer') + ->setLabel(t('Show View Title')) + ->setDescription(t('Display the view title in render')); + + $properties['override_title'] = DataDefinition::create('integer') + ->setLabel(t('Override View Title')) + ->setDescription(t('Override the view title in render')); + + $properties['overridden_title'] = DataDefinition::create('string') + ->setLabel(t('Overridden Title')) + ->setDescription(t('Custom view title')); + + return $properties; + } + +} diff --git a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php new file mode 100644 index 0000000000..2fef1060ff --- /dev/null +++ b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php @@ -0,0 +1,75 @@ +get($delta); + $item_values = $item->getValue(); + $item_values += [ + 'show_title' => 0, + 'override_title' => 0, + 'overridden_title' => '', + ]; + + // Strip the view options as defined by the exclude views settings. + // @see hs_field_helpers_form_field_config_edit_form_alter(). + if ($excluded_views = $this->fieldDefinition->getThirdPartySetting('hs_field_helpers', 'excluded_views')) { + $element['target_id']['#options'] = array_diff_key($element['target_id']['#options'], array_flip($excluded_views)); + } + // Chosen & Material Admin conflicts with this select list during ajax. + // The easiest way to fix is to disable those libraries. + $element['display_id']['#attributes']['class'][] = 'browser-default'; + + $form_state_keys = [$this->fieldDefinition->getName(), $delta]; + if (!empty($form['#parents'])) { + $form_state_keys = array_merge($form['#parents'], $form_state_keys); + } + $primary_field_name = $form_state_keys[0] . '[' . implode('][', array_slice($form_state_keys, 1)) . '][show_title]'; + $secondary_field_name = $form_state_keys[0] . '[' . implode('][', array_slice($form_state_keys, 1)) . '][override_title]'; + $primary_visible_test = [':input[name="' . $primary_field_name . '"]' => ['checked' => TRUE]]; + $secondary_visible_test = [':input[name="' . $secondary_field_name . '"]' => ['checked' => TRUE]]; + + if ($items->getFieldDefinition()->getSetting('allow_title_customizing')) { + $element['show_title'] = [ + '#type' => 'checkbox', + '#title' => $this->t('Show view title'), + '#weight' => -10, + '#default_value' => $item_values['show_title'], + ]; + $element['override_title'] = [ + '#type' => 'checkbox', + '#title' => $this->t('Override view title'), + '#weight' => -9, + '#default_value' => $item_values['override_title'], + '#states' => ['visible' => $primary_visible_test], + ]; + $element['overridden_title'] = [ + '#type' => 'textfield', + '#title' => $this->t('Custom title'), + '#weight' => -8, + '#default_value' => $item_values['overridden_title'], + '#states' => ['visible' => $secondary_visible_test], + ]; + } + return $element; + } + +} diff --git a/docroot/themes/humsci/su_humsci_theme/templates/field/viewfield-item.html.twig b/docroot/themes/humsci/su_humsci_theme/templates/field/viewfield-item.html.twig new file mode 100644 index 0000000000..742e56c1df --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/templates/field/viewfield-item.html.twig @@ -0,0 +1,63 @@ +{# +/** + * @file + * Default theme implementation to display a viewfield item. + * + * Instead of overriding the theming for all fields, you can also just override + * theming for a subset of fields using + * @link themeable Theme hook suggestions. @endlink For example, + * here are some theme hook suggestions that can be used for a field_foo field + * on an article node type: + * - viewfield-item--my-view--my-view-display.html.twig + * - viewfield-item--my-view-display.html.twig + * - viewfield-item--my-view.html.twig + * - viewfield-item--field-foo--my-view--my-view-display.html.twig + * - viewfield-item--field-foo--my-view-display.html.twig + * - viewfield-item--field-foo--my-view.html.twig + * - viewfield-item--field-foo--2.html.twig + * - viewfield-item--field-foo.html.twig + * - viewfield-item.html.twig + * + * Available variables: + * - title: The title of this item if visible. + * - content: The content of this item. + * - attributes: array of HTML attributes populated by modules, intended to + * be added to the main container tag of this template. + * - title_attributes: Same as attributes, except applied to the main title + * tag that appears in the template. + * - title_prefix: Additional output populated by modules, intended to be + * displayed in front of the main title tag that appears in the template. + * - title_suffix: Additional output populated by modules, intended to be + * displayed after the main title tag that appears in the template. + * - delta: Ordinal specifying the item number in the field. + * - entity: The entity object. + * - view_mode: View mode; e.g., 'full', 'teaser', etc. + * + * @see template_preprocess_viewfield_item() + * + * @ingroup themeable + */ +#} +{% +set classes = [ + 'field__item', + 'field__item-label-' ~ label_display, +] +%} +{% +set title_classes = [ + 'field__item__label', + label_display == 'visually_hidden' ? 'visually-hidden', +] +%} + + + {{ title_prefix }} + {% if not label_hidden %} + {{ label }} + {% endif %} + {{ title_suffix }} + {% block content %} + {{ content }} + {% endblock %} + From f05470d7c76d6859042d6e42a7288550217f9fa2 Mon Sep 17 00:00:00 2001 From: pookmish Date: Wed, 13 Feb 2019 13:53:29 -0800 Subject: [PATCH 13/25] HSD8-515 color module (#147) * HSD8-515 Color module discovery * progress * working colors * changed color keys * night colors * added comments --- .../humsci/su_humsci_theme/Gruntfile.js | 6 +- .../humsci/su_humsci_theme/color/color.inc | 130 ++++++++++++++ .../humsci/su_humsci_theme/color/preview.css | 1 + .../humsci/su_humsci_theme/color/preview.html | 90 ++++++++++ .../humsci/su_humsci_theme/color/preview.js | 54 ++++++ .../humsci/su_humsci_theme/color/preview.scss | 162 ++++++++++++++++++ .../humsci/su_humsci_theme/css/base/index.css | 2 +- .../humsci/su_humsci_theme/css/colors.css | 1 + .../css/date-stacked-vertical-card.css | 2 +- .../horizontal-card/css/horizontal-card.css | 2 +- .../masonry-item/css/masonry-item.css | 2 +- .../vertical-card/css/vertical-card.css | 2 +- .../css/vertical-link-card.css | 2 +- .../su_humsci_theme/scss/base/_footer.scss | 8 - .../su_humsci_theme/scss/base/_header.scss | 1 - .../scss/base/_paragraphs.scss | 5 - .../humsci/su_humsci_theme/scss/colors.scss | 94 ++++++++++ .../scss/utilities/mixins/_card.scss | 1 - .../su_humsci_theme.libraries.yml | 12 ++ 19 files changed, 554 insertions(+), 23 deletions(-) create mode 100644 docroot/themes/humsci/su_humsci_theme/color/color.inc create mode 100644 docroot/themes/humsci/su_humsci_theme/color/preview.css create mode 100644 docroot/themes/humsci/su_humsci_theme/color/preview.html create mode 100644 docroot/themes/humsci/su_humsci_theme/color/preview.js create mode 100644 docroot/themes/humsci/su_humsci_theme/color/preview.scss create mode 100644 docroot/themes/humsci/su_humsci_theme/css/colors.css create mode 100644 docroot/themes/humsci/su_humsci_theme/scss/colors.scss diff --git a/docroot/themes/humsci/su_humsci_theme/Gruntfile.js b/docroot/themes/humsci/su_humsci_theme/Gruntfile.js index a42a87566c..85cff27f4a 100644 --- a/docroot/themes/humsci/su_humsci_theme/Gruntfile.js +++ b/docroot/themes/humsci/su_humsci_theme/Gruntfile.js @@ -30,7 +30,7 @@ module.exports = function(grunt) { } }, css: { - files: ['scss/**/*.scss', 'scss/**/**/*.scss', 'patterns/**/**/scss/*.scss'], + files: ['scss/**/*.scss', 'scss/**/**/*.scss', 'patterns/**/**/scss/*.scss', 'color/*.scss'], tasks: ['sass'], options: { interrupt: true @@ -102,7 +102,9 @@ module.exports = function(grunt) { precision: 10 }, dist: { - files: [{ + files: [ + {"color/preview.css": "color/preview.scss"}, + { expand: true, cwd: 'scss', src: ['**/[a-z]*.scss'], diff --git a/docroot/themes/humsci/su_humsci_theme/color/color.inc b/docroot/themes/humsci/su_humsci_theme/color/color.inc new file mode 100644 index 0000000000..5423dc7fd7 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/color/color.inc @@ -0,0 +1,130 @@ + [ + 'base' => t('Base'), + 'link' => t('Link'), + 'text' => t('Text'), + + 'button' => t('Button Background'), + 'buttoncolor' => t('Button Color'), + + 'branding' => t('Branding background'), + 'brandingcolor' => t('Branding color'), + + 'header' => t('Header background'), + 'headertext' => t('Header text'), + 'headerlink' => t('Header link'), + + 'main' => t('Main background'), + 'maintext' => t('Main text'), + 'mainlink' => t('Main links'), + + 'footer' => t('Footer background'), + 'footertext' => t('Footer text'), + 'footerlink' => t('Footer links'), + + 'globalfooter' => t('Global Footer background'), + 'globalfooterlink' => t('Global Footer color'), + ], + // Pre-defined color schemes. + 'schemes' => [ + 'default' => [ + 'title' => t('Day (default)'), + 'colors' => [ + 'base' => '#000000', + 'link' => '#b1040e', + 'text' => '#2e2d29', + + 'button' => '#b1040d', + 'buttoncolor' => '#fffefe', + + 'branding' => '#b1040f', + 'brandingcolor' => '#fefefe', + + 'header' => '#fffffe', + 'headertext' => '#2e2d2a', + 'headerlink' => '#b1050e', + + 'main' => '#fffeff', + 'maintext' => '#2e2e29', + 'mainlink' => '#b2040e', + + 'footer' => '#feffff', + 'footertext' => '#2f2d29', + 'footerlink' => '#b0040e', + + 'globalfooter' => '#8c1515', + 'globalfooterlink' => '#fefeff', + ], + ], + 'night' => [ + 'title' => t('Night'), + 'colors' => [ + 'base' => '#000000', + 'link' => '#0db104', + 'text' => '#ffffff', + + 'button' => '#00ece9', + 'buttoncolor' => '#b1040e', + + 'branding' => '#ffffff', + 'brandingcolor' => '#b1040e', + + 'header' => '#000000', + 'headertext' => '#ffffff', + 'headerlink' => '#ffffff', + + 'main' => '#3b0536', + 'maintext' => '#ffffff', + 'mainlink' => '#00ece9', + + 'footer' => '#1e1e1e', + 'footertext' => '#ffffff', + 'footerlink' => '#00ece9', + + 'globalfooter' => '#8c1515', + 'globalfooterlink' => '#fefeff', + ], + ], + ], + // CSS files (excluding @import) to rewrite with new color scheme. + 'css' => [ + 'css/colors.css', + ], + // Files to copy. + 'copy' => [ + 'logo.svg', + ], + // Gradient definitions. + 'gradients' => [ + [ + // (x, y, width, height). + 'dimension' => [0, 0, 0, 0], + // Direction of gradient ('vertical' or 'horizontal'). + 'direction' => 'vertical', + // Keys of colors to use for the gradient. + 'colors' => ['branding', 'header'], + ], + ], + // Preview files. + 'preview_library' => 'su_humsci_theme/color.preview', + 'preview_html' => 'color/preview.html', + // Attachments. + '#attached' => [ + 'drupalSettings' => [ + 'color' => [ + // Put the logos path into JavaScript for the live preview. + 'logo' => theme_get_setting('logo.url', 'su_humsci_theme'), + 'globalFooterLogo' => '/' . drupal_get_path('theme', 'stanford_basic') . '/assets/svg/su_sig_stack_linked.svg', + 'userId' => \Drupal::currentUser()->id(), + ], + ], + ], +]; diff --git a/docroot/themes/humsci/su_humsci_theme/color/preview.css b/docroot/themes/humsci/su_humsci_theme/color/preview.css new file mode 100644 index 0000000000..49511bcd1f --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/color/preview.css @@ -0,0 +1 @@ +.color-placeholder{display:none}.color-palette{display:none}.color-preview{font-family:"Source Sans Pro", "Helvetica Neue", "Helvetica", "Arial", sans-serif}.color-preview h2{font-size:3.3rem;font-weight:600;font-size:1.3rem}.color-preview .color-preview-font-lead{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2.3rem;font-weight:200;line-height:1.5;max-width:85rem}.color-preview p,.color-preview a,.color-preview li,.color-preview span{font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif}.color-preview a{border-bottom:none;font-weight:600}.color-preview>*:after{content:'';display:table;clear:both}.color-preview a{color:#b1040e}.color-preview a:hover{text-decoration:none;color:#000}.color-preview .color-preview-brand-bar{background:#b1040e;color:#fff;height:40px;line-height:30px;max-height:30px}.color-preview .color-preview-brand-bar .color-preview-branding-logo{padding:0 20px}.color-preview .color-preview-header{box-shadow:0 2px 0 0 rgba(0,0,0,0.2);margin:5px 0 0}.color-preview .color-preview-header img{width:100px;padding:0 5px 0 0;margin:0 5px 0 0;border-right:1px solid #000}.color-preview .color-preview-header ul{list-style:none}.color-preview .color-preview-header li{display:inline-block;margin:0 5px 2px 0}.color-preview .color-preview-header li:hover{border-bottom:2px solid #000;margin-bottom:0}.color-preview .color-preview-header .color-preview-menu{float:right}.color-preview .color-preview-main{display:flex;flex-wrap:nowrap;width:100%}.color-preview .color-preview-sidebar{width:25%}.color-preview .color-preview-sidebar ul{list-style:none;margin:0;padding:0}.color-preview .color-preview-sidebar li{margin:0 0 5px 2px;padding-left:5px}.color-preview .color-preview-sidebar li:hover{border-left:2px solid #000;margin-left:0}.color-preview .color-preview-main-content{width:75%}.color-preview .color-preview-footer{display:flex;flex-wrap:nowrap}.color-preview .color-preview-footer .column{width:25%}.color-preview .color-preview-global-footer{background-color:#8c1515;color:#fff;width:100%;display:flex;flex-wrap:nowrap}.color-preview .color-preview-global-footer img{max-width:80px}.color-preview .color-preview-global-footer ul{list-style:none}.color-preview .color-preview-global-footer ul:last-child{font-size:8px}.color-preview .color-preview-global-footer li{display:inline-block;margin-right:10px}.color-preview .color-preview-global-footer a{color:#fff}.color-preview .color-preview-global-footer .color-preview-footer-logo{width:80px;margin:10px 0 0 10px}.color-preview .color-preview-decanter-button{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;margin-top:.5em;margin-right:.5em;margin-bottom:.5em;padding:1rem 2rem;appearance:none;background-color:#b1040e;border:0;color:#fff;cursor:pointer;display:inline-block;font-family:"Source Sans Pro","Helvetica Neue","Helvetica","Arial",sans-serif;font-size:2rem;font-weight:600;line-height:1;outline:none;text-align:center;text-decoration:none;width:100%;font-size:1rem}@media screen and (min-width: 481px){.color-preview .color-preview-decanter-button{width:auto}}.color-preview .color-preview-decanter-button:hover{background-color:#2e2d29;border-bottom:0;color:#fff;text-decoration:none}.color-preview .color-preview-decanter-button:focus{background-color:#2e2d29;box-shadow:0 0 3px #4d4f53,0 0 7px #4d4f53} diff --git a/docroot/themes/humsci/su_humsci_theme/color/preview.html b/docroot/themes/humsci/su_humsci_theme/color/preview.html new file mode 100644 index 0000000000..9e6322d4f6 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/color/preview.html @@ -0,0 +1,90 @@ +
+
+ +
+ +
+
+ Stanford LogoYour Site Name +
+
+ +
+
+ +
+
+ +
+
+

Page Title

+

+ Vivamus consectetuer hendrerit lacus. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Aenean + commodo ligula eget dolor. Donec mollis hendrerit risus. Nunc nonummy metus. +

+

+ Phasellus ullamcorper ipsum rutrum nunc. Proin sapien ipsum, porta a, auctor quis, euismod ut, mi. Cras + sagittis. Vestibulum facilisis, purus nec pulvinar iaculis, ligula mi congue nunc, vitae euismod ligula urna in + dolor. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. +

+ Read More +
+
+ +
+
+

About

+

Suspendisse non nisl

+
+
+

Contact Us

+ Suspendisse non nisl +
+
+

Help

+

Suspendisse non nisl

+
+
+

Visit

+

Suspendisse non nisl

+
+
+ +
+ + +
+
diff --git a/docroot/themes/humsci/su_humsci_theme/color/preview.js b/docroot/themes/humsci/su_humsci_theme/color/preview.js new file mode 100644 index 0000000000..daa6101490 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/color/preview.js @@ -0,0 +1,54 @@ + +(function ($, Drupal, drupalSettings) { + Drupal.color = { + logoChanged: false, + callback: function callback(context, settings, $form) { + // Show the individual color selectors if the user is User 1. + if (drupalSettings.color.userId == 1) { + $('.color-placeholder, .color-palette').show(); + } + + // Change the logo to be the real one. + if (!this.logoChanged) { + $('.color-preview .color-preview-header img').attr('src', drupalSettings.color.logo); + $('.color-preview .color-preview-global-footer img').attr('src', drupalSettings.color.globalFooterLogo); + this.logoChanged = true; + } + + // Remove the logo if the setting is toggled off. + if (drupalSettings.color.logo === null) { + $('div').remove('.color-preview-logo'); + } + + var $colorPreview = $form.find('.color-preview'); + var $colorPalette = $form.find('.js-color-palette'); + + // Top Branding bar. + $colorPreview.find('.color-preview-brand-bar').css('background-color', $colorPalette.find('input[name="palette[branding]"]').val()); + $colorPreview.find('.color-preview-brand-bar').css('color', $colorPalette.find('input[name="palette[brandingcolor]"]').val()); + + // Header colors. + $colorPreview.find('.color-preview-header').css('background-color', $colorPalette.find('input[name="palette[header]"]').val()); + $colorPreview.find('.color-preview-header').css('color', $colorPalette.find('input[name="palette[headertext]"]').val()); + $colorPreview.find('.color-preview-header a').css('color', $colorPalette.find('input[name="palette[headerlink]"]').val()); + + // Main content region. + $colorPreview.find('.color-preview-main').css('background-color', $colorPalette.find('input[name="palette[main]"]').val()); + $colorPreview.find('.color-preview-main').css('color', $colorPalette.find('input[name="palette[maintext]"]').val()); + $colorPreview.find('.color-preview-main a').css('color', $colorPalette.find('input[name="palette[mainlink]"]').val()); + + // Pre-footer region. + $colorPreview.find('.color-preview-footer').css('background-color', $colorPalette.find('input[name="palette[footer]"]').val()); + $colorPreview.find('.color-preview-footer').css('color', $colorPalette.find('input[name="palette[footertext]"]').val()); + $colorPreview.find('.color-preview-footer a').css('color', $colorPalette.find('input[name="palette[footerlink]"]').val()); + + // Stanford global footer bottom. + $colorPreview.find('.color-preview-global-footer').css('background-color', $colorPalette.find('input[name="palette[globalfooter]"]').val()); + $colorPreview.find('.color-preview-global-footer, .color-preview-global-footer a').css('color', $colorPalette.find('input[name="palette[globalfooterlink]"]').val()); + + // Decanter button links. + $colorPreview.find('.color-preview-decanter-button').css('background-color', $colorPalette.find('input[name="palette[button]"]').val()); + $colorPreview.find('.color-preview-decanter-button').css('color', $colorPalette.find('input[name="palette[buttoncolor]"]').val()); + } + }; +})(jQuery, Drupal, drupalSettings); diff --git a/docroot/themes/humsci/su_humsci_theme/color/preview.scss b/docroot/themes/humsci/su_humsci_theme/color/preview.scss new file mode 100644 index 0000000000..cad60ac1a6 --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/color/preview.scss @@ -0,0 +1,162 @@ +@charset "UTF-8"; + +@import 'decanter-no-markup'; + +.color-placeholder { + display: none; +} + +.color-palette { + display: none; +} + +.color-preview { + font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Arial", sans-serif; + + h2 { + @include h2; + + font-size: 1.3rem; + } + + .color-preview-font-lead { + @include font-lead; + } + + @include sans; + + > *:after { + content: ''; + display: table; + clear: both; + } + + a { + color: #b1040e; + + &:hover { + text-decoration: none; + color: #000; + } + } + + .color-preview-brand-bar { + background: #b1040e; + color: #fff; + height: 40px; + line-height: 30px; + max-height: 30px; + + .color-preview-branding-logo { + padding: 0 20px; + } + } + + .color-preview-header { + box-shadow: 0 2px 0 0 rgba(0, 0, 0, 0.2); + margin: 5px 0 0; + + img { + width: 100px; + padding: 0 5px 0 0; + margin: 0 5px 0 0; + border-right: 1px solid #000; + } + + ul { + list-style: none; + } + + li { + display: inline-block; + margin: 0 5px 2px 0; + + &:hover { + border-bottom: 2px solid #000; + margin-bottom: 0; + } + } + + .color-preview-menu { + float: right; + } + } + + .color-preview-main { + display: flex; + flex-wrap: nowrap; + width: 100%; + } + + .color-preview-sidebar { + width: 25%; + + ul { + list-style: none; + margin: 0; + padding: 0; + } + + li { + margin: 0 0 5px 2px; + padding-left: 5px; + + &:hover { + border-left: 2px solid #000; + margin-left: 0; + } + } + } + + .color-preview-main-content { + width: 75%; + } + + .color-preview-footer { + display: flex; + flex-wrap: nowrap; + + .column { + width: 25%; + } + } + + .color-preview-global-footer { + background-color: #8c1515; + color: #fff; + width: 100%; + display: flex; + flex-wrap: nowrap; + + img { + max-width: 80px; + } + + ul { + list-style: none; + + &:last-child { + font-size: 8px; + } + } + + li { + display: inline-block; + margin-right: 10px; + } + + a { + color: #fff; + } + + .color-preview-footer-logo { + width: 80px; + margin: 10px 0 0 10px; + } + } + + .color-preview-decanter-button { + @include button-primary; + font-size: 1rem; + } +} diff --git a/docroot/themes/humsci/su_humsci_theme/css/base/index.css b/docroot/themes/humsci/su_humsci_theme/css/base/index.css index 80b3c3627c..24b8d0aaec 100644 --- a/docroot/themes/humsci/su_humsci_theme/css/base/index.css +++ b/docroot/themes/humsci/su_humsci_theme/css/base/index.css @@ -1 +1 @@ -.node--unpublished{max-width:1170px;display:block;margin:0 auto;background-color:rgba(234,171,0,0.6);padding:20px}#footer{box-shadow:0 -2px 2px rgba(0,0,0,0.2);margin-top:3rem;padding-top:2em}@media screen and (min-width: 600px){#footer{margin-top:6rem}}@media screen and (min-width: 1201px){#footer{margin-top:10rem}}#footer h2{font-size:2.3rem}#footer a{text-decoration:none}.date-stacked{background:#2e2d29;bottom:-35px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);color:#fff;left:35px;position:absolute;text-align:center;margin-right:0;padding:20px 25px}.date-stacked .date-month{font-size:2.3rem;font-weight:100;line-height:1.2;text-transform:uppercase}.date-stacked .date-day{font-weight:400}#drupal-off-canvas li{border-bottom:1px solid #fff;padding:5px}#drupal-off-canvas a{font-size:14px}#drupal-off-canvas .view-form{color:#fff}.embedded-entity{margin:0 0 1em;width:fit-content;float:none}@media (min-width: 768px){.embedded-entity.align-left{margin-right:1em;margin-bottom:1em;width:auto;max-width:50%;float:left}}@media (min-width: 960px){.embedded-entity.align-left{max-width:75%}}@media (min-width: 768px){.embedded-entity.align-right{margin-bottom:1em;margin-left:1em;width:auto;max-width:50%;float:right}}@media (min-width: 960px){.embedded-entity.align-right{max-width:75%}}.views-exposed-form .form-item,.views-exposed-form .form-actions{margin-top:.5rem;margin-bottom:0}.views-exposed-form .form-item:first-child{margin-top:3rem}.views-exposed-form label{margin-top:1rem;margin-bottom:.5rem}.emphasized-text{font-weight:600;font-style:italic}.decanter-button a{color:#fff;text-decoration:none}.decanter-button a:hover{text-decoration:none}#footer__global-footer a span.ext{display:none}.label-inline{display:flex;flex-wrap:wrap;margin-bottom:.25em}.label-inline .field-label{padding-right:5px}.field-label{font-weight:600}span.media--type-image figure{position:relative;margin:0}span.media--type-image figure figcaption{position:absolute;background:rgba(255,255,255,0.75);padding:5px;opacity:0;bottom:0;width:100%;text-align:right;-webkit-transition:all 0.6s ease;-moz-transition:all 0.6s ease;-o-transition:all 0.6s ease}span.media--type-image figure:hover figcaption{opacity:1;left:0}span.media--type-image figure p{color:#4d4f53;font-size:1.7rem;margin-top:0;margin-bottom:0}figcaption{color:#4d4f53;font-size:1.7rem;margin-top:0}a[class*="heading-link-"]{text-decoration:none}a[data-extlink] h2,a[data-extlink] h3,a[data-extlink] h4,a[data-extlink] h5,a[data-extlink] h6{display:inline}a[data-extlink] .extlink{font-size:60%;padding:0 5px}a[data-extlink] .extlink .fa-arrow-right{transform:rotate(-45deg)}a[data-extlink] .extlink .visually-hidden{display:none}body *:focus{outline:#4d90fe auto 5px}.brand-bar *:focus,.decanter-button *:focus{outline:#ffffff auto 5px}#header{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);margin-bottom:2em;padding-top:1em;padding-bottom:1em}.paragraph-item{margin-bottom:2.5em}.paragraph--type--hs-row .paragraph-item{margin-bottom:0}.paragraph.hs-hero-image img{width:100%}.paragraph-item h1:first-child,.paragraph-item h2:first-child,.paragraph-item h3:first-child,.paragraph-item h4:first-child,.paragraph-item h5:first-child,.paragraph-item h6:first-child{margin-top:0}.paragraph:first-child.paragraph--type--hs-hero-image{margin-top:-2em}.role--authenticated .paragraph:first-child.paragraph--type--hs-hero-image{margin-top:0}#search-region .search-block-form label,#search-region .views-exposed-filter-block.hs-search-search-page label{border:0;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(100%);height:1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{float:right;position:relative;margin-bottom:-7rem}@media screen and (min-width: 600px){#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{margin-top:-7rem;margin-bottom:0}}#search-region .search-block-form form.expanded input.button,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.button{z-index:999}#search-region .search-block-form form.expanded input.form-search,#search-region .search-block-form form.expanded input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input[type=text]{background:#fff;width:145px}#search-region .search-block-form form .js-form-item-search,#search-region .views-exposed-filter-block.hs-search-search-page form .js-form-item-search{margin:0}#search-region .search-block-form input.button,#search-region .views-exposed-filter-block.hs-search-search-page input.button{display:block;position:absolute;background:url("../../img/search.svg") no-repeat;background-size:45px 45px;top:5px;right:0;border:0;font-size:0;width:45px;height:45px;z-index:-999}#search-region .search-block-form input.form-search,#search-region .search-block-form input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page input[type=text]{background:url("../../img/search.svg") no-repeat center right;background-color:#fff;background-size:45px 45px;-webkit-transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;width:0;height:auto;border-radius:25px;border:0;cursor:pointer;box-shadow:0 0 0 1.5px #dad7cb;padding-right:32px}.user-is-tabbing #search-region .search-block-form input.form-search:hover,.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:hover,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{box-shadow:0 0 0 2px #b1040e;border:0}.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{background-size:45px 45px;cursor:text;width:145px;padding-right:50px;padding-left:15px}.block--lockup .block--lockup__site-name-and-slogan a{color:#2e2d29;display:inherit;text-decoration:none}.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap} +.node--unpublished{max-width:1170px;display:block;margin:0 auto;background-color:rgba(234,171,0,0.6);padding:20px}#footer{box-shadow:0 -2px 2px rgba(0,0,0,0.2);padding-top:2em}#footer h2{font-size:2.3rem}#footer a{text-decoration:none}.date-stacked{background:#2e2d29;bottom:-35px;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);color:#fff;left:35px;position:absolute;text-align:center;margin-right:0;padding:20px 25px}.date-stacked .date-month{font-size:2.3rem;font-weight:100;line-height:1.2;text-transform:uppercase}.date-stacked .date-day{font-weight:400}#drupal-off-canvas li{border-bottom:1px solid #fff;padding:5px}#drupal-off-canvas a{font-size:14px}#drupal-off-canvas .view-form{color:#fff}.embedded-entity{margin:0 0 1em;width:fit-content;float:none}@media (min-width: 768px){.embedded-entity.align-left{margin-right:1em;margin-bottom:1em;width:auto;max-width:50%;float:left}}@media (min-width: 960px){.embedded-entity.align-left{max-width:75%}}@media (min-width: 768px){.embedded-entity.align-right{margin-bottom:1em;margin-left:1em;width:auto;max-width:50%;float:right}}@media (min-width: 960px){.embedded-entity.align-right{max-width:75%}}.views-exposed-form .form-item,.views-exposed-form .form-actions{margin-top:.5rem;margin-bottom:0}.views-exposed-form .form-item:first-child{margin-top:3rem}.views-exposed-form label{margin-top:1rem;margin-bottom:.5rem}.emphasized-text{font-weight:600;font-style:italic}.decanter-button a{color:#fff;text-decoration:none}.decanter-button a:hover{text-decoration:none}#footer__global-footer a span.ext{display:none}.label-inline{display:flex;flex-wrap:wrap;margin-bottom:.25em}.label-inline .field-label{padding-right:5px}.field-label{font-weight:600}span.media--type-image figure{position:relative;margin:0}span.media--type-image figure figcaption{position:absolute;background:rgba(255,255,255,0.75);padding:5px;opacity:0;bottom:0;width:100%;text-align:right;-webkit-transition:all 0.6s ease;-moz-transition:all 0.6s ease;-o-transition:all 0.6s ease}span.media--type-image figure:hover figcaption{opacity:1;left:0}span.media--type-image figure p{color:#4d4f53;font-size:1.7rem;margin-top:0;margin-bottom:0}figcaption{color:#4d4f53;font-size:1.7rem;margin-top:0}a[class*="heading-link-"]{text-decoration:none}a[data-extlink] h2,a[data-extlink] h3,a[data-extlink] h4,a[data-extlink] h5,a[data-extlink] h6{display:inline}a[data-extlink] .extlink{font-size:60%;padding:0 5px}a[data-extlink] .extlink .fa-arrow-right{transform:rotate(-45deg)}a[data-extlink] .extlink .visually-hidden{display:none}body *:focus{outline:#4d90fe auto 5px}.brand-bar *:focus,.decanter-button *:focus{outline:#ffffff auto 5px}#header{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding-top:1em;padding-bottom:1em}.paragraph--type--hs-row .paragraph-item{margin-bottom:0}.paragraph.hs-hero-image img{width:100%}.paragraph-item h1:first-child,.paragraph-item h2:first-child,.paragraph-item h3:first-child,.paragraph-item h4:first-child,.paragraph-item h5:first-child,.paragraph-item h6:first-child{margin-top:0}.role--authenticated .paragraph:first-child.paragraph--type--hs-hero-image{margin-top:0}#search-region .search-block-form label,#search-region .views-exposed-filter-block.hs-search-search-page label{border:0;clip:rect(1px, 1px, 1px, 1px);clip-path:inset(100%);height:1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{float:right;position:relative;margin-bottom:-7rem}@media screen and (min-width: 600px){#search-region .search-block-form form,#search-region .views-exposed-filter-block.hs-search-search-page form{margin-top:-7rem;margin-bottom:0}}#search-region .search-block-form form.expanded input.button,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.button{z-index:999}#search-region .search-block-form form.expanded input.form-search,#search-region .search-block-form form.expanded input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page form.expanded input[type=text]{background:#fff;width:145px}#search-region .search-block-form form .js-form-item-search,#search-region .views-exposed-filter-block.hs-search-search-page form .js-form-item-search{margin:0}#search-region .search-block-form input.button,#search-region .views-exposed-filter-block.hs-search-search-page input.button{display:block;position:absolute;background:url("../../img/search.svg") no-repeat;background-size:45px 45px;top:5px;right:0;border:0;font-size:0;width:45px;height:45px;z-index:-999}#search-region .search-block-form input.form-search,#search-region .search-block-form input[type=text],#search-region .views-exposed-filter-block.hs-search-search-page input.form-search,#search-region .views-exposed-filter-block.hs-search-search-page input[type=text]{background:url("../../img/search.svg") no-repeat center right;background-color:#fff;background-size:45px 45px;-webkit-transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;transition:width 0.6s, border-radius 0.6s, background 0s, box-shadow 0.6s;width:0;height:auto;border-radius:25px;border:0;cursor:pointer;box-shadow:0 0 0 1.5px #dad7cb;padding-right:32px}.user-is-tabbing #search-region .search-block-form input.form-search:hover,.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:hover,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:hover,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{box-shadow:0 0 0 2px #b1040e;border:0}.user-is-tabbing #search-region .search-block-form input.form-search:focus,.user-is-tabbing #search-region .search-block-form input[type=text]:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input.form-search:focus,.user-is-tabbing #search-region .views-exposed-filter-block.hs-search-search-page input[type=text]:focus{background-size:45px 45px;cursor:text;width:145px;padding-right:50px;padding-left:15px}.block--lockup .block--lockup__site-name-and-slogan a{color:#2e2d29;display:inherit;text-decoration:none}.decanter-button,.decanter-button--secondary{padding:1rem 2rem 1.5rem}.decanter-button a:hover,.decanter-button a:focus,.decanter-button a:active{color:#fff}.decanter-button--secondary{font-weight:400;margin-right:.2rem}.decanter-button--secondary a{text-decoration:none}.no-wrap{white-space:nowrap} diff --git a/docroot/themes/humsci/su_humsci_theme/css/colors.css b/docroot/themes/humsci/su_humsci_theme/css/colors.css new file mode 100644 index 0000000000..cc24c3857d --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/css/colors.css @@ -0,0 +1 @@ +a{color:#b1040e}body{color:#2e2d29}.brand-bar{background:#b1040f;color:#fefefe}#header{background:#fffffe;color:#2e2d2a}#header a{color:#b1050e}#main-content,#help-region{background:#fffeff;color:#2e2e29}#main-content a,#help-region a{color:#b2040e}#main-content .decanter-button,#main-content .decanter-button a,#help-region .decanter-button,#help-region .decanter-button a{background-color:#b1040d;color:#fffefe}#footer{background-color:#feffff;color:#2f2d29}#footer a{color:#b0040e}#footer__global-footer{background-color:#8c1515;color:#fefeff}#footer__global-footer a{color:#fefeff} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css index 253c2fc975..b38c9e00f1 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/date-stacked-vertical-card/css/date-stacked-vertical-card.css @@ -1 +1 @@ -.date-stacked-vertical-card .date-stacked-vertical-card__img{position:relative}.date-stacked-vertical-card .date-stacked-vertical-card__img img{width:100%}.date-stacked-vertical-card>*{word-break:break-word}.date-stacked-vertical-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;padding:2.75em 1.75em 1em}.view .date-stacked-vertical-card__content-container,.field-block .entity-reference .date-stacked-vertical-card__content-container{margin:0 0 1.5em}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__time{margin-bottom:5px}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__title h2{font-size:3rem;margin-top:20px}.date-stacked-vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0} +.date-stacked-vertical-card .date-stacked-vertical-card__img{position:relative}.date-stacked-vertical-card .date-stacked-vertical-card__img img{width:100%}.date-stacked-vertical-card>*{word-break:break-word}.date-stacked-vertical-card__content-container{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;padding:2.75em 1.75em 1em}.view .date-stacked-vertical-card__content-container,.field-block .entity-reference .date-stacked-vertical-card__content-container{margin:0 0 1.5em}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__time{margin-bottom:5px}.date-stacked-vertical-card__content-container .date-stacked-vertical-card__title h2{font-size:3rem;margin-top:20px}.date-stacked-vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css index 80fb19d03e..f8367fbd09 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/horizontal-card/css/horizontal-card.css @@ -1 +1 @@ -.horizontal-card{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;display:block}.view .horizontal-card,.field-block .entity-reference .horizontal-card{margin:0 0 1.5em}@media screen and (min-width: 600px){.horizontal-card{display:flex}}.horizontal-card .horizontal-card__img{margin:0;flex-shrink:0;width:100%}.horizontal-card .horizontal-card__img img{margin:0 0 .5em;display:block;padding:0;width:100%;height:auto}@media screen and (min-width: 600px){.horizontal-card .horizontal-card__img{margin:0 .75em 0 0;width:10em}.horizontal-card .horizontal-card__img img{margin:0}}.horizontal-card .horizontal-card__content .horizontal-card__category{margin:0 0 .75em;font-size:1.7rem;font-weight:100}.horizontal-card .horizontal-card__content .horizontal-card__date{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .horizontal-card__time{float:left}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .pipe{float:left;padding:0 3px}.horizontal-card .horizontal-card__content .horizontal-card__title{clear:both;font-weight:600;margin:0 0 .35em}.horizontal-card .horizontal-card__content .horizontal-card__speaker{font-weight:100;margin:.25em 0 0}.horizontal-card .horizontal-card__content .horizontal-card__speaker .views-label{display:block;float:left}.horizontal-card .horizontal-card__content .horizontal-card__description{clear:both;margin:0}.horizontal-card .horizontal-card__content .horizontal-card__description>div{margin:0 0 .25em}.horizontal-card .horizontal-card__content>*:last-child>*:last-child{margin-bottom:0}.horizontal-card>*{word-break:break-word} +.horizontal-card{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;display:block}.view .horizontal-card,.field-block .entity-reference .horizontal-card{margin:0 0 1.5em}@media screen and (min-width: 600px){.horizontal-card{display:flex}}.horizontal-card .horizontal-card__img{margin:0;flex-shrink:0;width:100%}.horizontal-card .horizontal-card__img img{margin:0 0 .5em;display:block;padding:0;width:100%;height:auto}@media screen and (min-width: 600px){.horizontal-card .horizontal-card__img{margin:0 .75em 0 0;width:10em}.horizontal-card .horizontal-card__img img{margin:0}}.horizontal-card .horizontal-card__content .horizontal-card__category{margin:0 0 .75em;font-size:1.7rem;font-weight:100}.horizontal-card .horizontal-card__content .horizontal-card__date{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent{margin:0 0 .25em}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .horizontal-card__time{float:left}.horizontal-card .horizontal-card__content .horizontal-card__subcontent .pipe{float:left;padding:0 3px}.horizontal-card .horizontal-card__content .horizontal-card__title{clear:both;font-weight:600;margin:0 0 .35em}.horizontal-card .horizontal-card__content .horizontal-card__speaker{font-weight:100;margin:.25em 0 0}.horizontal-card .horizontal-card__content .horizontal-card__speaker .views-label{display:block;float:left}.horizontal-card .horizontal-card__content .horizontal-card__description{clear:both;margin:0}.horizontal-card .horizontal-card__content .horizontal-card__description>div{margin:0 0 .25em}.horizontal-card .horizontal-card__content>*:last-child>*:last-child{margin-bottom:0}.horizontal-card>*{word-break:break-word} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css index 8d9e8fa53f..cd99590ef5 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/masonry-item/css/masonry-item.css @@ -1 +1 @@ -.masonry-item .masonry-item--image{width:100%;overflow:hidden}.masonry-item .masonry-item--image img{width:100%;height:auto;display:block}.masonry-item .masonry-item--inner .masonry-item--image img{display:block}.masonry-item .masonry-item--inner .masonry-item--body{overflow:hidden;background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .masonry-item .masonry-item--inner .masonry-item--body,.field-block .entity-reference .masonry-item .masonry-item--inner .masonry-item--body{margin:0 0 1.5em}.masonry-item .masonry-item--inner .masonry-item--body p{font-size:1.8rem;line-height:1.3;margin-top:0;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body a{font-size:1.8rem;line-height:1.3}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--type{font-size:1.7rem;font-weight:200;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body h3,.masonry-item .masonry-item--inner .masonry-item--body h3 a{font-size:2.1rem;margin:0 0 .5em}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year{font-weight:200}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year .author{font-weight:400} +.masonry-item .masonry-item--image{width:100%;overflow:hidden}.masonry-item .masonry-item--image img{width:100%;height:auto;display:block}.masonry-item .masonry-item--inner .masonry-item--image img{display:block}.masonry-item .masonry-item--inner .masonry-item--body{overflow:hidden;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .masonry-item .masonry-item--inner .masonry-item--body,.field-block .entity-reference .masonry-item .masonry-item--inner .masonry-item--body{margin:0 0 1.5em}.masonry-item .masonry-item--inner .masonry-item--body p{font-size:1.8rem;line-height:1.3;margin-top:0;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body a{font-size:1.8rem;line-height:1.3}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--type{font-size:1.7rem;font-weight:200;margin-bottom:.5em}.masonry-item .masonry-item--inner .masonry-item--body h3,.masonry-item .masonry-item--inner .masonry-item--body h3 a{font-size:2.1rem;margin:0 0 .5em}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year{font-weight:200}.masonry-item .masonry-item--inner .masonry-item--body .masonry-item--author-year .author{font-weight:400} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css index d13650bd8b..8e34064213 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-card/css/vertical-card.css @@ -1 +1 @@ -.vertical-card .vertical-card__img img{width:100%}.vertical-card .vertical-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .vertical-card .vertical-card__content-container,.field-block .entity-reference .vertical-card .vertical-card__content-container{margin:0 0 1.5em}.vertical-card .vertical-card__content-container .vertical-card__title{font-size:3rem;margin-top:0}.vertical-card .vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-card .vertical-card__author-year>div{display:inline-block}.vertical-card .vertical-card__author-year .vertical-card__author-year--author{font-weight:400}.vertical-card .vertical-card__author-year .vertical-card__author-year--year{font-weight:200}.vertical-card .vertical-card__author-year .comma{margin-left:-3px}.vertical-card>*{word-break:break-word} +.vertical-card .vertical-card__img img{width:100%}.vertical-card .vertical-card__content-container{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em}.view .vertical-card .vertical-card__content-container,.field-block .entity-reference .vertical-card .vertical-card__content-container{margin:0 0 1.5em}.vertical-card .vertical-card__content-container .vertical-card__title{font-size:3rem;margin-top:0}.vertical-card .vertical-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-card .vertical-card__author-year>div{display:inline-block}.vertical-card .vertical-card__author-year .vertical-card__author-year--author{font-weight:400}.vertical-card .vertical-card__author-year .vertical-card__author-year--year{font-weight:200}.vertical-card .vertical-card__author-year .comma{margin-left:-3px}.vertical-card>*{word-break:break-word} diff --git a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css index 38938e0c6f..c63de33daf 100644 --- a/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css +++ b/docroot/themes/humsci/su_humsci_theme/patterns/molecules/vertical-link-card/css/vertical-link-card.css @@ -1 +1 @@ -.vertical-link-card{height:100%}.vertical-link-card>a{display:table;height:100%;text-decoration:none;width:100%}.vertical-link-card>a:hover,.vertical-link-card>a:focus{color:#fff;text-decoration:underline}.vertical-link-card .vertical-link-card__img{display:table-row;height:1px}.vertical-link-card .vertical-link-card__img .field-hs-postcard-image{overflow:hidden}.vertical-link-card .vertical-link-card__img img{width:100%}.vertical-link-card .vertical-link-card__content-container{background:#fff;box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;background:#b1040e;color:#fff;display:table-row;padding:0}.view .vertical-link-card .vertical-link-card__content-container,.field-block .entity-reference .vertical-link-card .vertical-link-card__content-container{margin:0 0 1.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__title{margin-top:0;padding-top:.5em;padding-right:.5em;padding-left:.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__description{padding-right:.75em;padding-bottom:.75em;padding-left:.75em}.vertical-link-card .vertical-link-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-link-card>*{word-break:break-word} +.vertical-link-card{height:100%}.vertical-link-card>a{display:table;height:100%;text-decoration:none;width:100%}.vertical-link-card>a:hover,.vertical-link-card>a:focus{color:#fff;text-decoration:underline}.vertical-link-card .vertical-link-card__img{display:table-row;height:1px}.vertical-link-card .vertical-link-card__img .field-hs-postcard-image{overflow:hidden}.vertical-link-card .vertical-link-card__img img{width:100%}.vertical-link-card .vertical-link-card__content-container{box-shadow:0 2px 2px 0 rgba(0,0,0,0.2);padding:.75em;background:#b1040e;color:#fff;display:table-row;padding:0}.view .vertical-link-card .vertical-link-card__content-container,.field-block .entity-reference .vertical-link-card .vertical-link-card__content-container{margin:0 0 1.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__title{margin-top:0;padding-top:.5em;padding-right:.5em;padding-left:.5em}.vertical-link-card .vertical-link-card__content-container .vertical-link-card__description{padding-right:.75em;padding-bottom:.75em;padding-left:.75em}.vertical-link-card .vertical-link-card__content-container>*:last-child>*:last-child{margin-bottom:0}.vertical-link-card>*{word-break:break-word} diff --git a/docroot/themes/humsci/su_humsci_theme/scss/base/_footer.scss b/docroot/themes/humsci/su_humsci_theme/scss/base/_footer.scss index 2272c4e997..3127c9e7a5 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/base/_footer.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/base/_footer.scss @@ -10,15 +10,7 @@ #footer { box-shadow: 0 -2px 2px rgba(0, 0, 0, .2); - @include margin(3rem null null); @include padding(2em null null null); - @include media($medium-screen) { - @include margin(6rem null null); - } - - @include media($large-screen) { - @include margin(10rem null null); - } h2 { font-size: $h3-font-size; diff --git a/docroot/themes/humsci/su_humsci_theme/scss/base/_header.scss b/docroot/themes/humsci/su_humsci_theme/scss/base/_header.scss index fcfbef5421..e1e41f2352 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/base/_header.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/base/_header.scss @@ -11,6 +11,5 @@ #header { box-shadow: $box-shadow; - @include margin(null null 2em null); @include padding(1em null); } diff --git a/docroot/themes/humsci/su_humsci_theme/scss/base/_paragraphs.scss b/docroot/themes/humsci/su_humsci_theme/scss/base/_paragraphs.scss index 4609bf5792..9af3a5c93d 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/base/_paragraphs.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/base/_paragraphs.scss @@ -9,10 +9,6 @@ 'decanter-no-markup'; // Default spacing -.paragraph-item { - @include margin(null null 2.5em); -} - .paragraph--type--hs-row .paragraph-item { @include margin(null null 0); } @@ -37,7 +33,6 @@ // Offset the spacing between masthead/header and primary content when a hero // paragraph is used first .paragraph:first-child.paragraph--type--hs-hero-image { - @include margin(-2em null null); .role--authenticated & { @include margin(0 null null); diff --git a/docroot/themes/humsci/su_humsci_theme/scss/colors.scss b/docroot/themes/humsci/su_humsci_theme/scss/colors.scss new file mode 100644 index 0000000000..99882e698b --- /dev/null +++ b/docroot/themes/humsci/su_humsci_theme/scss/colors.scss @@ -0,0 +1,94 @@ +@charset "UTF-8"; + +$color-bright-red: rgb(177, 4, 14) !default; +$color-bright-red-1: rgb(177, 4, 15) !default; +$color-bright-red-2: rgb(177, 5, 14) !default; +$color-bright-red-3: rgb(178, 4, 14) !default; +$color-bright-red-4: rgb(176, 4, 14) !default; +$color-bright-red-5: rgb(177, 4, 13) !default; + +$color-black: rgb(46, 45, 41) !default; +$color-black-1: rgb(46, 45, 42) !default; +$color-black-2: rgb(46, 46, 41) !default; +$color-black-3: rgb(47, 45, 41) !default; + +$color-white: rgb(254, 254, 254) !default; +$color-white-1: rgb(255, 255, 254) !default; +$color-white-2: rgb(255, 254, 255) !default; +$color-white-3: rgb(254, 255, 255) !default; +$color-white-4: rgb(254, 254, 255) !default; +$color-white-5: rgb(255, 254, 254) !default; + +$color-cardinal-red: rgb(140, 21, 21) !default; + + + +// ---------- Color Module Styles ----------- + +// ------ Base colors ------ +a { + color: $color-bright-red; +} + +body { + color: $color-black; +} + +// ------ Branding colors ------ + +.brand-bar { + background: $color-bright-red-1; + color: $color-white; +} + +// ------ Header colors ------ +#header { + background: $color-white-1; + color: $color-black-1; + + a { + color: $color-bright-red-2; + } +} + +// ------ Main colors ------ + +#main-content, +#help-region { + background: $color-white-2; + color: $color-black-2; + + a { + color: $color-bright-red-3; + } + + .decanter-button, + .decanter-button a { + background-color: $color-bright-red-5; + color: $color-white-5; + } +} + +// ------ Footer colors ------ +#footer { + background-color: $color-white-3; + color: $color-black-3; + + a { + color: $color-bright-red-4; + } +} + +// ------ Global Footer colors ------ + +#footer__global-footer { + background-color: $color-cardinal-red; + color: $color-white-4; + + a { + color: $color-white-4; + } +} + +// ------ Color Module: Don't touch ------ +// Colors below won't be modified by the color module. diff --git a/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss b/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss index 3142e8548e..0861cd2ce6 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/utilities/mixins/_card.scss @@ -7,7 +7,6 @@ // Card @mixin card { - background: $color-white; box-shadow: $box-shadow; @include padding(0.75em); diff --git a/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.libraries.yml b/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.libraries.yml index 6271441a86..ee1e7a4554 100644 --- a/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.libraries.yml +++ b/docroot/themes/humsci/su_humsci_theme/su_humsci_theme.libraries.yml @@ -88,6 +88,16 @@ # CHANGE THE LIBRARY BELOW +color.preview: + version: VERSION + css: + theme: + color/preview.css: {} + js: + color/preview.js: {} + dependencies: + - color/drupal.color + base: version: VERSION css: @@ -95,6 +105,8 @@ base: css/base/index.css: {} css/components/atoms/index.css: {} css/components/molecules/index.css: {} + theme: + css/colors.css: {} js: js/hover_menu.js: {} js/su_humsci_theme.js: {} From adc443e976c066b954079434d53949bab1a517ce Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 13:55:11 -0800 Subject: [PATCH 14/25] HSD8-272 Increase image compression --- config/default/system.image.gd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/default/system.image.gd.yml b/config/default/system.image.gd.yml index b676907e4c..6257224756 100644 --- a/config/default/system.image.gd.yml +++ b/config/default/system.image.gd.yml @@ -1,3 +1,3 @@ -jpeg_quality: 75 +jpeg_quality: 85 _core: default_config_hash: eNXaHfkJJUThHeF0nvkoXyPLRrKYGxgHRjORvT4F5rQ From f6a23f4a3a4995082fd7a4db9ce3ca873034487f Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 14:33:45 -0800 Subject: [PATCH 15/25] HSD8-297 added ckeditor_fixed_toolbar module --- composer.json | 1 + composer.lock | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 79b1e2c3ba..e5f888fbd8 100644 --- a/composer.json +++ b/composer.json @@ -115,6 +115,7 @@ "drupal/bricks": "dev-1.x", "drupal/bugherdapi": "^1.1", "drupal/chosen": "~2.4", + "drupal/ckeditor_fixed_toolbar": "1.x-dev", "drupal/color_field": "~2.0-rc2", "drupal/components": "~1.0", "drupal/conditional_fields": "^1.0@alpha", diff --git a/composer.lock b/composer.lock index 65e3296a88..d515319293 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7b61f9579d8ec0be32460ca866050fe3", + "content-hash": "d3116966306a3687947a8f8ee04287e0", "packages": [ { "name": "acquia/blt", @@ -3160,6 +3160,55 @@ "source": "http://cgit.drupalcode.org/chosen" } }, + { + "name": "drupal/ckeditor_fixed_toolbar", + "version": "dev-1.x", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/ckeditor_fixed_toolbar", + "reference": "1e4a8191ab289b4c91d9a0f2ac6b40e82e294908" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.x-dev", + "datestamp": "1542756180", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Steffen Schlaer (IT-Cru)", + "homepage": "https://www.drupal.org/u/IT-Cru", + "role": "Maintainer" + }, + { + "name": "mgoedecke", + "homepage": "https://www.drupal.org/u/mgoedecke", + "role": "Maintainer" + } + ], + "description": "Provide a JS plugin to have a fixed CKEditor toolbar in textarea fields.", + "homepage": "https://drupal.org/project/ckeditor_fixed_toolbar", + "support": { + "source": "https://cgit.drupalcode.org/ckeditor_fixed_toolbar", + "issues": "https://drupal.org/project/issues/ckeditor_fixed_toolbar" + }, + "time": "2018-11-20T23:30:54+00:00" + }, { "name": "drupal/coder", "version": "8.2.12", @@ -17493,6 +17542,7 @@ "drupal/block_class": 20, "drupal/block_field": 15, "drupal/bricks": 20, + "drupal/ckeditor_fixed_toolbar": 20, "drupal/conditional_fields": 15, "drupal/config_ignore": 20, "drupal/config_import_de": 15, From 790ed22473482bb036a6ecbe2b7b762b9e27ae8b Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 14:38:09 -0800 Subject: [PATCH 16/25] enable ckeditor_fixed_toolbar module --- config/default/core.extension.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml index 1d29f65f9f..b0b5eba919 100644 --- a/config/default/core.extension.yml +++ b/config/default/core.extension.yml @@ -21,6 +21,7 @@ module: chosen: 0 chosen_lib: 0 ckeditor: 0 + ckeditor_fixed_toolbar: 0 color: 0 color_field: 0 components: 0 From 9bf183043e90e6f07b794e4526fcd15dcc77588f Mon Sep 17 00:00:00 2001 From: pookmish Date: Wed, 13 Feb 2019 14:59:08 -0800 Subject: [PATCH 17/25] HSD8-555 shortcut filter (#189) * HSD8-555 Filter shortcut links users dont have access to * HSD8-557 Hide manage button in toolbar with permission * Dont add library if user doesnt need it --- .../css/su_humsci_profile.hide_manage.css | 13 +++++ .../su_humsci_profile.install | 8 +++ .../su_humsci_profile.libraries.yml | 5 ++ .../su_humsci_profile.permissions.yml | 3 ++ .../su_humsci_profile.profile | 50 ++++++++++++++++++- 5 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 docroot/profiles/humsci/su_humsci_profile/css/su_humsci_profile.hide_manage.css create mode 100644 docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.libraries.yml diff --git a/docroot/profiles/humsci/su_humsci_profile/css/su_humsci_profile.hide_manage.css b/docroot/profiles/humsci/su_humsci_profile/css/su_humsci_profile.hide_manage.css new file mode 100644 index 0000000000..aa7db140bb --- /dev/null +++ b/docroot/profiles/humsci/su_humsci_profile/css/su_humsci_profile.hide_manage.css @@ -0,0 +1,13 @@ +#toolbar-item-shortcuts-tray { + display: block; +} + +#toolbar-item-administration-tray, +#toolbar-item-administration { + display: none; +} + +#toolbar-item-shortcuts { + pointer-events: none; + cursor: default; +} diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install index ba210019fa..c60c9c5a06 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install @@ -328,3 +328,11 @@ function su_humsci_profile_update_8012() { $block->setVisibilityConfig('request_path', $visibility); $block->save(); } + +/** + * Add permission to view manage toolbar button for site managers roles. + */ +function su_humsci_profile_update_8014() { + Role::load('site_manager')->grantPermission('view toolbar manage')->save(); + Role::load('contributor')->grantPermission('view toolbar manage')->save(); +} diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.libraries.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.libraries.yml new file mode 100644 index 0000000000..2ec7bca3cd --- /dev/null +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.libraries.yml @@ -0,0 +1,5 @@ +hide_manage: + version: VERSION + css: + theme: + css/su_humsci_profile.hide_manage.css: {} diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.permissions.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.permissions.yml index 3fb7daabfa..e445011c3f 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.permissions.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.permissions.yml @@ -4,3 +4,6 @@ add saml user: view user list: title: 'View User List' description: 'View list of all site users.' +view toolbar manage: + title: 'View Toolbar Manage Button' + description: 'Users without this permission will be able to see Shortcuts in the toolbar, but not the full toolbar' diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile index 1541823a84..13fdec08f2 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile @@ -174,7 +174,7 @@ function su_humsci_profile_simplify_condition_forms(array &$condition_elements, /** * Implements hook_ENTITY_TYPE_insert(). */ -function hs_field_helpers_eck_entity_type_insert(EntityInterface $entity) { +function su_humsci_profile_eck_entity_type_insert(EntityInterface $entity) { $eck_type = $entity->id(); // When a new ECK entity type is create, set initial permissions so that // site builders aren't required to search for the necessary permissions. @@ -192,3 +192,51 @@ function hs_field_helpers_eck_entity_type_insert(EntityInterface $entity) { "edit any $eck_type entities", ]); } + +/** + * Implements hook_preprocess_HOOK(). + */ +function su_humsci_profile_preprocess_menu(&$variables) { + if ($variables['menu_name'] != 'shortcut_menu') { + return; + } + + $current_user = \Drupal::currentUser(); + _su_humci_profile_clean_shortcut_links($variables['items'], $current_user); +} + +/** + * Recursively remove links the current user has no access to. + * + * @param array $links + * Menu links. + * @param \Drupal\Core\Session\AccountInterface $current_user + * Current user object. + */ +function _su_humci_profile_clean_shortcut_links(array &$links, AccountInterface $current_user) { + foreach ($links as $link_id => $link_item) { + + // This user doesn't have permission for this url. Remove the link. + if (!$link_item['url']->access($current_user)) { + unset($links[$link_id]); + continue; + } + + // User has access to the parent menu link, but check all the children. + if (!empty($links[$link_id]['below'])) { + _su_humci_profile_clean_shortcut_links($links[$link_id]['below'], $current_user); + } + } +} + +/** + * Implements hook_page_attachments(). + */ +function su_humsci_profile_page_attachments(array &$attachments){ + $current_user = \Drupal::currentUser(); + // Hide the manage button in the toolbar if the user doesnt have permission. + // Also don't add the library if + if ($current_user->hasPermission('access toolbar') && !$current_user->hasPermission('view toolbar manage')) { + $attachments['#attached']['library'][] = 'su_humsci_profile/hide_manage'; + } +} From 1c4604b18eee292ed3de7db9000cc75cdf611c8c Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 15:06:45 -0800 Subject: [PATCH 18/25] restored missing hooks --- .../hs_field_helpers/hs_field_helpers.module | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module index 8e3fb3d710..4b01406def 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.module @@ -26,6 +26,37 @@ use Drupal\Component\Utility\Html; use Drupal\field\FieldStorageConfigInterface; use Drupal\field_permissions\Plugin\FieldPermissionTypeInterface; +/** + * Implements hook_field_widget_info_alter(). + */ +function hs_field_helpers_field_widget_info_alter(array &$info) { + $info['options_select']['field_types'][] = 'display_mode_field'; + + if (isset($info['viewfield_select'])) { + $info['viewfield_select']['class'] = 'Drupal\hs_field_helpers\Plugin\Field\FieldWidget\HsViewfieldWidgetSelect'; + } +} + +/** + * Implements hook_field_formatter_info_alter(). + */ +function hs_field_helpers_field_formatter_info_alter(array &$info) { + $info['list_default']['field_types'][] = 'display_mode_field'; + + if (isset($info['viewfield_default'])) { + $info['viewfield_default']['class'] = 'Drupal\hs_field_helpers\Plugin\Field\FieldFormatter\HsViewfieldFormatterDefault'; + } +} + +/** + * Implements hook_field_info_alter(). + */ +function hs_field_helpers_field_info_alter(&$info) { + if (isset($info['viewfield'])) { + $info['viewfield']['class'] = 'Drupal\hs_field_helpers\Plugin\Field\FieldType\HsViewfieldItem'; + } +} + /** * Implements hook_form_FORM_ID_alter(). */ @@ -534,6 +565,7 @@ function hs_field_helpers_node_view(array &$build, EntityInterface $entity, Enti !$rabbit_hole->get('allow_override') || $entity->get('rh_action')->getString() == 'bundle_default' ) { + /** @var \Drupal\token\Token $token_service */ $token_service = \Drupal::service('token'); $target = $token_service->replace($rabbit_hole->get('redirect'), ['node' => $entity]); From bb0e59cb0c64b43541d4f8f22a8b5c9663b6e12c Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 16:30:00 -0800 Subject: [PATCH 19/25] enable honeypot onn webforms --- config/default/webform.settings.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/config/default/webform.settings.yml b/config/default/webform.settings.yml index 7a381c98a5..a60caf6564 100644 --- a/config/default/webform.settings.yml +++ b/config/default/webform.settings.yml @@ -137,23 +137,24 @@ mail: default_body_html: "

Submitted on [webform_submission:created]

\n

Submitted by: [webform_submission:user]

\n

Submitted values are:

\n[webform_submission:values]\n" roles: { } test: - types: "checkbox:\n - true\ncolor:\n - '#ffffcc'\n - '#ffffcc'\n - '#ccffff'\nemail:\n - 'example@example.com'\n - 'test@test.com'\n - 'random@random.com'\nlanguage_select:\n - en\nmachine_name:\n - 'loremipsum'\n - 'oratione'\n - 'dixisset'\ntel:\n - '123-456-7890'\n - '098-765-4321'\ntextarea:\n - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.'\n - 'Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;'\n - 'Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.'\ntext_format:\n - value: '

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.

'\n - value: '

Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;

'\n - value: '

Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.

'\nurl:\n - 'http://example.com'\n - 'http://test.com'\nwebform_email_confirm:\n - 'example@example.com'\n - 'test@test.com'\n - 'random@random.com'\nwebform_email_multiple:\n - 'example@example.com, test@test.com, random@random.com'\nwebform_location:\n - value: 'The White House, 1600 Pennsylvania Ave NW, Washington, DC 20500, USA'\n - value: 'London SW1A 1AA, United Kingdom'\n - value: 'Moscow, Russia, 10307'\nwebform_time:\n - '09:00'\n - '17:00'\n" - names: "first_name:\n - 'John'\n - 'Paul'\n - 'Ringo'\n - 'George'\nlast_name:\n - 'Lennon'\n - 'McCartney'\n - 'Starr'\n - 'Harrison'\naddress:\n - '10 Main Street'\n - '11 Brook Alley Road. APT 1'\nzip:\n - '11111'\n - '12345'\n - '12345-6789'\npostal_code:\n - '11111'\n - '12345'\n - '12345-6789'\nphone:\n - '123-456-7890'\n - '098-765-4321'\nfax:\n - '123-456-7890'\n - '098-765-4321'\ncity:\n - 'Springfield'\n - 'Pleasantville'\n - 'Hill Valley'\nurl:\n - 'http://example.com'\n - 'http://test.com'\ndefault:\n - 'Loremipsum'\n - 'Oratione'\n - 'Dixisset'\n" + types: "checkbox:\r\n - true\r\ncolor:\r\n - '#ffffcc'\r\n - '#ffffcc'\r\n - '#ccffff'\r\nemail:\r\n - 'example@example.com'\r\n - 'test@test.com'\r\n - 'random@random.com'\r\nlanguage_select:\r\n - en\r\nmachine_name:\r\n - 'loremipsum'\r\n - 'oratione'\r\n - 'dixisset'\r\ntel:\r\n - '123-456-7890'\r\n - '098-765-4321'\r\ntextarea:\r\n - 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.'\r\n - 'Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;'\r\n - 'Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.'\r\ntext_format:\r\n - value: '

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Negat esse eam, inquit, propter se expetendam. Primum Theophrasti, Strato, physicum se voluit; Id mihi magnum videtur. Itaque mihi non satis videmini considerare quod iter sit naturae quaeque progressio. Quare hoc videndum est, possitne nobis hoc ratio philosophorum dare. Est enim tanti philosophi tamque nobilis audacter sua decreta defendere.

'\r\n - value: '

Huius, Lyco, oratione locuples, rebus ipsis ielunior. Duo Reges: constructio interrete. Sed haec in pueris; Sed utrum hortandus es nobis, Luci, inquit, an etiam tua sponte propensus es? Sapiens autem semper beatus est et est aliquando in dolore; Immo videri fortasse. Paulum, cum regem Persem captum adduceret, eodem flumine invectio? Et ille ridens: Video, inquit, quid agas;

'\r\n - value: '

Quae cum dixisset, finem ille. Quamquam non negatis nos intellegere quid sit voluptas, sed quid ille dicat. Progredientibus autem aetatibus sensim tardeve potius quasi nosmet ipsos cognoscimus. Gloriosa ostentatio in constituendo summo bono. Qui-vere falsone, quaerere mittimus-dicitur oculis se privasse; Duarum enim vitarum nobis erunt instituta capienda. Comprehensum, quod cognitum non habet? Qui enim existimabit posse se miserum esse beatus non erit. Causa autem fuit huc veniendi ut quosdam hinc libros promerem. Nunc omni virtuti vitium contrario nomine opponitur.

'\r\nurl:\r\n - 'http://example.com'\r\n - 'http://test.com'\r\nwebform_email_confirm:\r\n - 'example@example.com'\r\n - 'test@test.com'\r\n - 'random@random.com'\r\nwebform_email_multiple:\r\n - 'example@example.com, test@test.com, random@random.com'\r\nwebform_location:\r\n - value: 'The White House, 1600 Pennsylvania Ave NW, Washington, DC 20500, USA'\r\n - value: 'London SW1A 1AA, United Kingdom'\r\n - value: 'Moscow, Russia, 10307'\r\nwebform_time:\r\n - '09:00'\r\n - '17:00'\r\n" + names: "first_name:\r\n - 'John'\r\n - 'Paul'\r\n - 'Ringo'\r\n - 'George'\r\nlast_name:\r\n - 'Lennon'\r\n - 'McCartney'\r\n - 'Starr'\r\n - 'Harrison'\r\naddress:\r\n - '10 Main Street'\r\n - '11 Brook Alley Road. APT 1'\r\nzip:\r\n - '11111'\r\n - '12345'\r\n - '12345-6789'\r\npostal_code:\r\n - '11111'\r\n - '12345'\r\n - '12345-6789'\r\nphone:\r\n - '123-456-7890'\r\n - '098-765-4321'\r\nfax:\r\n - '123-456-7890'\r\n - '098-765-4321'\r\ncity:\r\n - 'Springfield'\r\n - 'Pleasantville'\r\n - 'Hill Valley'\r\nurl:\r\n - 'http://example.com'\r\n - 'http://test.com'\r\ndefault:\r\n - 'Loremipsum'\r\n - 'Oratione'\r\n - 'Dixisset'\r\n" ui: video_display: dialog + description_help: true details_save: true + help_disabled: false dialog_disabled: false offcanvas_disabled: false - contribute_disabled: false promotions_disabled: false - description_help: true + contribute_disabled: false libraries: excluded_libraries: - jquery.chosen - jquery.icheck requirements: - cdn: true - bootstrap: true + cdn: false + bootstrap: false spam: true contribute: account_type: user From a17d2db0351be30620ced851b609c0c87097cb2c Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 13 Feb 2019 16:44:58 -0800 Subject: [PATCH 20/25] updated view field configs --- .../core.entity_view_display.paragraph.hs_view.default.yml | 6 +++++- .../default/field.field.paragraph.hs_view.field_hs_view.yml | 4 ++-- config/default/field.storage.paragraph.field_hs_view.yml | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/default/core.entity_view_display.paragraph.hs_view.default.yml b/config/default/core.entity_view_display.paragraph.hs_view.default.yml index 963251c8df..7ed1b047f0 100644 --- a/config/default/core.entity_view_display.paragraph.hs_view.default.yml +++ b/config/default/core.entity_view_display.paragraph.hs_view.default.yml @@ -6,7 +6,11 @@ dependencies: - field.field.paragraph.hs_view.field_hs_view - paragraphs.paragraphs_type.hs_view module: + - layout_builder - viewfield +third_party_settings: + layout_builder: + sections: { } _core: default_config_hash: ROagQRyXu7b9dF0QKGoP9iNlpe7tPEn9cpIOfzmVTcM id: paragraph.hs_view.default @@ -19,8 +23,8 @@ content: label: hidden settings: view_title: hidden - always_build_output: '1' empty_view_title: hidden + always_build_output: 1 third_party_settings: { } type: viewfield_default region: content diff --git a/config/default/field.field.paragraph.hs_view.field_hs_view.yml b/config/default/field.field.paragraph.hs_view.field_hs_view.yml index b7b2393757..1d7b3f5933 100644 --- a/config/default/field.field.paragraph.hs_view.field_hs_view.yml +++ b/config/default/field.field.paragraph.hs_view.field_hs_view.yml @@ -15,17 +15,17 @@ third_party_settings: - block_content - files - frontpage + - hs_manage_content - content_recent - redirect - redirect_404 + - hs_search - media_entity_browser - taxonomy_term - user_admin_people - watchdog - who_s_new - who_s_online -_core: - default_config_hash: 0G0S2rA3q0OVzu1ombu98CXug3I2_msAeYlDNUkC4f8 id: paragraph.hs_view.field_hs_view field_name: field_hs_view entity_type: paragraph diff --git a/config/default/field.storage.paragraph.field_hs_view.yml b/config/default/field.storage.paragraph.field_hs_view.yml index 5fd9d2b3bc..0b8005ebc5 100644 --- a/config/default/field.storage.paragraph.field_hs_view.yml +++ b/config/default/field.storage.paragraph.field_hs_view.yml @@ -6,8 +6,6 @@ dependencies: - paragraphs - viewfield - views -_core: - default_config_hash: nZVoryWQ8AHwC6a1jcM6Y5HLAIvMCY_52mGDv-yaQDU id: paragraph.field_hs_view field_name: field_hs_view entity_type: paragraph From 2fa0de933b022ff15b7c1f36c78230529ee56ca1 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Thu, 14 Feb 2019 09:07:17 -0800 Subject: [PATCH 21/25] CC fixes --- blt/src/Commands/HumsciServerCommand.php | 8 +++++--- docroot/modules/humsci/hs_bugherd/hs_bugherd.install | 4 ++-- docroot/modules/humsci/hs_capx/hs_capx.install | 4 ++-- .../EventSubscriber/ConfigReadOnlyEventSubscriber.php | 10 ++++++---- .../humsci/hs_field_helpers/hs_field_helpers.install | 1 - .../Field/FieldWidget/HsViewfieldWidgetSelect.php | 6 +++--- .../hs_paragraphs_between/hs_paragraphs_between.module | 2 +- .../humsci/su_humsci_profile/su_humsci_profile.profile | 5 +++-- .../humsci/su_humsci_theme/scss/base/_global.scss | 4 ++-- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/blt/src/Commands/HumsciServerCommand.php b/blt/src/Commands/HumsciServerCommand.php index a510b006dd..ad486e1d8b 100644 --- a/blt/src/Commands/HumsciServerCommand.php +++ b/blt/src/Commands/HumsciServerCommand.php @@ -166,7 +166,7 @@ public function humsciLetsEncryptAdd($environment = 'dev', $options = ['domains' $this->say('Existing domains on the cert:' . PHP_EOL . implode(PHP_EOL, $domains)); if (!empty($options['domains'])) { - $this->say('Adding domains: '. implode(', ', $options['domains'])); + $this->say('Adding domains: ' . implode(', ', $options['domains'])); $domains = array_merge($domains, $options['domains']); } @@ -284,10 +284,12 @@ public function humsciLetsEncryptGet($environment = 'dev') { /** * Changes necessary configuration and adds the domain to the LE Cert. * - * @command humsci:launch-site - * * @param string $site * The machine name of the site. + * + * @command humsci:launch-site + * + * @throws \Robo\Exception\TaskException */ public function launchSite($site) { $new_domain = preg_replace('/[^a-z]/', '-', $site); diff --git a/docroot/modules/humsci/hs_bugherd/hs_bugherd.install b/docroot/modules/humsci/hs_bugherd/hs_bugherd.install index e75d267211..c4f4f1458f 100644 --- a/docroot/modules/humsci/hs_bugherd/hs_bugherd.install +++ b/docroot/modules/humsci/hs_bugherd/hs_bugherd.install @@ -41,7 +41,7 @@ function hs_bugherd_update_8002() { */ function hs_bugherd_update_8003() { $entity_type_manager = \Drupal::entityTypeManager(); - $entity_update_manager = \Drupal::entityDefinitionUpdateManager(); + $entity_updater = \Drupal::entityDefinitionUpdateManager(); $entity_definition = $entity_type_manager->getDefinition('bugherd_connection'); - $entity_update_manager->installEntityType($entity_definition); + $entity_updater->installEntityType($entity_definition); } diff --git a/docroot/modules/humsci/hs_capx/hs_capx.install b/docroot/modules/humsci/hs_capx/hs_capx.install index c55a82027c..7432bc44f4 100644 --- a/docroot/modules/humsci/hs_capx/hs_capx.install +++ b/docroot/modules/humsci/hs_capx/hs_capx.install @@ -81,7 +81,7 @@ function hs_capx_update_8001() { $capx_settings->save(); $entity_type_manager = \Drupal::entityTypeManager(); - $entity_update_manager = \Drupal::entityDefinitionUpdateManager(); + $entity_updater = \Drupal::entityDefinitionUpdateManager(); $entity_definition = $entity_type_manager->getDefinition('capx_importer'); - $entity_update_manager->installEntityType($entity_definition); + $entity_updater->installEntityType($entity_definition); } diff --git a/docroot/modules/humsci/hs_config_readonly/src/EventSubscriber/ConfigReadOnlyEventSubscriber.php b/docroot/modules/humsci/hs_config_readonly/src/EventSubscriber/ConfigReadOnlyEventSubscriber.php index 65609b768f..07a3c86d7f 100644 --- a/docroot/modules/humsci/hs_config_readonly/src/EventSubscriber/ConfigReadOnlyEventSubscriber.php +++ b/docroot/modules/humsci/hs_config_readonly/src/EventSubscriber/ConfigReadOnlyEventSubscriber.php @@ -129,6 +129,8 @@ protected function lockEntityFormWizard(EntityFormWizardBase $form_object) { * * @return bool * if the form should be marked readonly. + * + * @throws \Drupal\Component\Plugin\Exception\PluginException */ protected function lockConfigFormBase(ConfigFormBase $form_object) { try { @@ -217,17 +219,17 @@ protected function getLockedConfigs() { * Find out if a provided config entity name should be ignored. * * @param string $config_name - * Config name to + * Config name to check if ignored. * * @return bool * If the given config should be ignored. */ protected function isIgnoredConfig($config_name) { - $ignored_config_settings = $this->configFactory->get('config_ignore.settings') + $ignored_configs = $this->configFactory->get('config_ignore.settings') ->get('ignored_config_entities'); - foreach ($ignored_config_settings as $config_ignore_setting) { + foreach ($ignored_configs as $ignored_config) { // Split the ignore settings so that we can ignore individual keys. - $ignore = explode(':', $config_ignore_setting); + $ignore = explode(':', $ignored_config); if (count($ignore) > 1 && fnmatch($ignore[0], $config_name)) { return FALSE; } diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install index bdc118bbb5..cc15b413cf 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.install @@ -50,7 +50,6 @@ function hs_field_helpers_update_8002() { \Drupal::service('module_installer')->install(['hs_views_helper']); } - /** * Add columns to view field tables for title customization. */ diff --git a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php index 2fef1060ff..deeac6242f 100644 --- a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php +++ b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php @@ -43,9 +43,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen $form_state_keys = array_merge($form['#parents'], $form_state_keys); } $primary_field_name = $form_state_keys[0] . '[' . implode('][', array_slice($form_state_keys, 1)) . '][show_title]'; - $secondary_field_name = $form_state_keys[0] . '[' . implode('][', array_slice($form_state_keys, 1)) . '][override_title]'; + $second_field_name = $form_state_keys[0] . '[' . implode('][', array_slice($form_state_keys, 1)) . '][override_title]'; $primary_visible_test = [':input[name="' . $primary_field_name . '"]' => ['checked' => TRUE]]; - $secondary_visible_test = [':input[name="' . $secondary_field_name . '"]' => ['checked' => TRUE]]; + $second_visible_test = [':input[name="' . $second_field_name . '"]' => ['checked' => TRUE]]; if ($items->getFieldDefinition()->getSetting('allow_title_customizing')) { $element['show_title'] = [ @@ -66,7 +66,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen '#title' => $this->t('Custom title'), '#weight' => -8, '#default_value' => $item_values['overridden_title'], - '#states' => ['visible' => $secondary_visible_test], + '#states' => ['visible' => $second_visible_test], ]; } return $element; diff --git a/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.module b/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.module index 24f7720a92..c521481748 100644 --- a/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.module +++ b/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.module @@ -101,7 +101,7 @@ function hs_paragraphs_between_add_below_submit(array $form, FormStateInterface $field_values = $form_state->getValue($field_path); unset($field_values['add_more']); uasort($field_values, function ($item_1, $item_2) { - return $item_1['_weight'] > $item_2['_weight']; + return (int) $item_1['_weight'] > $item_2['_weight']; }); $add_more_delta = array_search($submit['button']['#delta'], array_keys($field_values)) + 1; diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile index 13fdec08f2..21d65140ce 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile @@ -232,10 +232,11 @@ function _su_humci_profile_clean_shortcut_links(array &$links, AccountInterface /** * Implements hook_page_attachments(). */ -function su_humsci_profile_page_attachments(array &$attachments){ +function su_humsci_profile_page_attachments(array &$attachments) { $current_user = \Drupal::currentUser(); // Hide the manage button in the toolbar if the user doesnt have permission. - // Also don't add the library if + // Also don't add the library if user doesn't doesnt have access to the + // toolbar if ($current_user->hasPermission('access toolbar') && !$current_user->hasPermission('view toolbar manage')) { $attachments['#attached']['library'][] = 'su_humsci_profile/hide_manage'; } diff --git a/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss b/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss index 9c6b483e9b..4e2e8b8265 100644 --- a/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss +++ b/docroot/themes/humsci/su_humsci_theme/scss/base/_global.scss @@ -104,7 +104,7 @@ // External Link icons. a span.ext { #footer__global-footer & { - display:none; + display: none; } } @@ -196,5 +196,5 @@ body *:focus { .brand-bar *:focus, .decanter-button *:focus { - outline: #ffffff auto 5px; + outline: #fff auto 5px; } From b1e5cd3c602d5e7f0394c3e1ea2e948fcf81def7 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Thu, 14 Feb 2019 09:12:34 -0800 Subject: [PATCH 22/25] cc fix --- .../FieldWidget/HsViewfieldWidgetSelect.php | 32 +++++++++++++++---- .../su_humsci_profile.profile | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php index deeac6242f..a6a635cc9d 100644 --- a/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php +++ b/docroot/modules/humsci/hs_field_helpers/src/Plugin/Field/FieldWidget/HsViewfieldWidgetSelect.php @@ -21,13 +21,7 @@ class HsViewfieldWidgetSelect extends ViewfieldWidgetSelect { */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $element = parent::formElement($items, $delta, $element, $form, $form_state); - $item = $items->get($delta); - $item_values = $item->getValue(); - $item_values += [ - 'show_title' => 0, - 'override_title' => 0, - 'overridden_title' => '', - ]; + $item_values = $this->getItemValues($items, $delta); // Strip the view options as defined by the exclude views settings. // @see hs_field_helpers_form_field_config_edit_form_alter(). @@ -72,4 +66,28 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen return $element; } + /** + * Get the item array for the field values combined with default values. + * + * @param \Drupal\Core\Field\FieldItemListInterface $items + * Field item list. + * @param int $delta + * Delta of the list. + * + * @return array + * Delta's value. + * + * @throws \Drupal\Core\TypedData\Exception\MissingDataException + */ + protected function getItemValues(FieldItemListInterface $items, $delta) { + $item = $items->get($delta); + $item_values = $item->getValue(); + $item_values += [ + 'show_title' => 0, + 'override_title' => 0, + 'overridden_title' => '', + ]; + return $item_values; + } + } diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile index 21d65140ce..d6906c8f39 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.profile @@ -236,7 +236,7 @@ function su_humsci_profile_page_attachments(array &$attachments) { $current_user = \Drupal::currentUser(); // Hide the manage button in the toolbar if the user doesnt have permission. // Also don't add the library if user doesn't doesnt have access to the - // toolbar + // toolbar. if ($current_user->hasPermission('access toolbar') && !$current_user->hasPermission('view toolbar manage')) { $attachments['#attached']['library'][] = 'su_humsci_profile/hide_manage'; } From 6c49aa8024775bd8ad9dad8341deedabbc1686d0 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Thu, 14 Feb 2019 10:42:33 -0800 Subject: [PATCH 23/25] Open research nodes to menus --- config/default/node.type.hs_research.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/default/node.type.hs_research.yml b/config/default/node.type.hs_research.yml index c9a1245f4d..dadb315847 100644 --- a/config/default/node.type.hs_research.yml +++ b/config/default/node.type.hs_research.yml @@ -6,7 +6,8 @@ dependencies: - menu_ui third_party_settings: menu_ui: - available_menus: { } + available_menus: + - main parent: '' _core: default_config_hash: Lc4c6tqtNpLszqdPIsdfrZejBv-TcHpTzAeO0DMXHSc From 2b37753dc9a04fc406828422524b6ae1b2a01ada Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Tue, 19 Feb 2019 09:05:55 -0800 Subject: [PATCH 24/25] release notes --- .../humsci/hs_actions/hs_actions.info.yml | 2 +- .../hs_basic_page/hs_basic_page.info.yml | 2 +- .../hs_basic_page_display.info.yml | 2 +- .../humsci/hs_blocks/hs_blocks.info.yml | 2 +- .../humsci/hs_bugherd/hs_bugherd.info.yml | 2 +- .../modules/humsci/hs_capx/hs_capx.info.yml | 2 +- .../hs_config_prefix.info.yml | 2 +- .../hs_config_readonly.info.yml | 2 +- .../humsci/hs_courses/hs_courses.info.yml | 2 +- .../hs_event_series/hs_event_series.info.yml | 2 +- .../hs_event_series_display.info.yml | 2 +- .../humsci/hs_events/hs_events.info.yml | 2 +- .../hs_events_display.info.yml | 2 +- .../hs_events_importer.info.yml | 2 +- .../hs_field_helpers.info.yml | 2 +- .../humsci/hs_layouts/hs_layouts.info.yml | 2 +- .../hs_masquerade/hs_masquerade.info.yml | 2 +- .../modules/humsci/hs_news/hs_news.info.yml | 2 +- .../hs_news_display/hs_news_display.info.yml | 2 +- .../hs_paragraph_types.info.yml | 2 +- .../hs_hero_image/hs_hero_image.info.yml | 2 +- .../hs_hero_image_display.info.yml | 2 +- .../modules/hs_postcard/hs_postcard.info.yml | 2 +- .../hs_postcard_display.info.yml | 2 +- .../modules/hs_row/hs_row.info.yml | 2 +- .../hs_row_display/hs_row_display.info.yml | 2 +- .../modules/hs_slide/hs_slide.info.yml | 2 +- .../hs_slide_display.info.yml | 2 +- .../hs_slideshow/hs_slideshow.info.yml | 2 +- .../hs_slideshow_display.info.yml | 2 +- .../hs_text_area/hs_text_area.info.yml | 2 +- .../hs_text_area_display.info.yml | 2 +- .../modules/hs_view/hs_view.info.yml | 2 +- .../hs_view_display/hs_view_display.info.yml | 2 +- .../modules/hs_webform/hs_webform.info.yml | 2 +- .../hs_paragraphs_between.info.yml | 2 +- .../humsci/hs_person/hs_person.info.yml | 2 +- .../hs_person_display.info.yml | 2 +- .../hs_publications/hs_publications.info.yml | 2 +- .../hs_publications_display.info.yml | 2 +- .../humsci/hs_research/hs_research.info.yml | 2 +- .../hs_research_display.info.yml | 2 +- .../su_humsci_profile.info.yml | 2 +- docs/CHANGELOG.md | 19 +++++++++++++++++++ 44 files changed, 62 insertions(+), 43 deletions(-) diff --git a/docroot/modules/humsci/hs_actions/hs_actions.info.yml b/docroot/modules/humsci/hs_actions/hs_actions.info.yml index ffeb11154b..be12eb868c 100644 --- a/docroot/modules/humsci/hs_actions/hs_actions.info.yml +++ b/docroot/modules/humsci/hs_actions/hs_actions.info.yml @@ -2,7 +2,7 @@ name: 'H&S Actions' type: module description: 'Provides action plugins to work with VBO module.' core: 8.x -version: 8.x +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - drupal:views_bulk_operations diff --git a/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml b/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml index 4ba453c047..eef6671d3f 100755 --- a/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml +++ b/docroot/modules/humsci/hs_basic_page/hs_basic_page.info.yml @@ -2,7 +2,7 @@ name: 'H&S Basic Page' description: 'Basic Page content type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - entity_reference_revisions diff --git a/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml b/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml index 84b44ce6b7..19903d5e19 100755 --- a/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml +++ b/docroot/modules/humsci/hs_basic_page/modules/hs_basic_page_display/hs_basic_page_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Basic Page Display' description: 'Basic Page content type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml b/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml index ceac3387c8..a9396d3028 100644 --- a/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml +++ b/docroot/modules/humsci/hs_blocks/hs_blocks.info.yml @@ -2,7 +2,7 @@ name: 'H&S Blocks' type: module description: 'Custom blocks for Humsci' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - block diff --git a/docroot/modules/humsci/hs_bugherd/hs_bugherd.info.yml b/docroot/modules/humsci/hs_bugherd/hs_bugherd.info.yml index 7ddd56206b..5c4aaf9d4d 100644 --- a/docroot/modules/humsci/hs_bugherd/hs_bugherd.info.yml +++ b/docroot/modules/humsci/hs_bugherd/hs_bugherd.info.yml @@ -2,7 +2,7 @@ name: 'H&S Bugherd' description: 'Bugherd API connection with JIRA' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - encrypt diff --git a/docroot/modules/humsci/hs_capx/hs_capx.info.yml b/docroot/modules/humsci/hs_capx/hs_capx.info.yml index 34ecd210ea..0c64d3182d 100644 --- a/docroot/modules/humsci/hs_capx/hs_capx.info.yml +++ b/docroot/modules/humsci/hs_capx/hs_capx.info.yml @@ -2,7 +2,7 @@ name: 'H&S CAPx' description: 'Simple form to change the workgroup or organization for CAPx importer' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - migrate_plus diff --git a/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml b/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml index 24b1cb2d83..c608c64700 100644 --- a/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml +++ b/docroot/modules/humsci/hs_config_prefix/hs_config_prefix.info.yml @@ -2,5 +2,5 @@ name: 'H&S Config Prefix' type: module description: 'Prefix any configuration entities with a specified string' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' diff --git a/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml b/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml index 0fd73f7c39..b66a69d757 100644 --- a/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml +++ b/docroot/modules/humsci/hs_config_readonly/hs_config_readonly.info.yml @@ -2,7 +2,7 @@ name: 'H&S Config Read Only' description: 'Modify the Config Read Only to blacklist specific config' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - config_readonly diff --git a/docroot/modules/humsci/hs_courses/hs_courses.info.yml b/docroot/modules/humsci/hs_courses/hs_courses.info.yml index 1d03e142fd..4a27dbebd0 100644 --- a/docroot/modules/humsci/hs_courses/hs_courses.info.yml +++ b/docroot/modules/humsci/hs_courses/hs_courses.info.yml @@ -2,7 +2,7 @@ name: 'H&S Courses' type: module description: 'Courses content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - datetime diff --git a/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml b/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml index 6258600992..be7fc6f3db 100644 --- a/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml +++ b/docroot/modules/humsci/hs_event_series/hs_event_series.info.yml @@ -2,7 +2,7 @@ name: 'H&S Event Series' description: 'Event Series content type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - hs_events diff --git a/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml b/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml index f85168f2fb..db8791d26b 100644 --- a/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml +++ b/docroot/modules/humsci/hs_event_series/modules/hs_event_series_display/hs_event_series_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Event Series Display' description: 'Event Series content type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_events/hs_events.info.yml b/docroot/modules/humsci/hs_events/hs_events.info.yml index f1889e3a2f..6c3ff1255a 100755 --- a/docroot/modules/humsci/hs_events/hs_events.info.yml +++ b/docroot/modules/humsci/hs_events/hs_events.info.yml @@ -2,7 +2,7 @@ name: 'H&S Events' description: 'Events content type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - allowed_formats diff --git a/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml b/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml index b96079f13e..3f9cc920d0 100644 --- a/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml +++ b/docroot/modules/humsci/hs_events/modules/hs_events_display/hs_events_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Events Display' description: 'Events content type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml b/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml index 8148fe81a4..db30912320 100644 --- a/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml +++ b/docroot/modules/humsci/hs_events/modules/hs_events_importer/hs_events_importer.info.yml @@ -2,7 +2,7 @@ name: 'H&S Events Importer' description: 'Migrate importer for stanford events.' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - hs_events diff --git a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml index 3d91bbed36..a4f788df60 100644 --- a/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml +++ b/docroot/modules/humsci/hs_field_helpers/hs_field_helpers.info.yml @@ -2,7 +2,7 @@ name: 'H&S Field Helpers' type: module description: 'Additional field widgets and display formatters' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - ui_patterns_views diff --git a/docroot/modules/humsci/hs_layouts/hs_layouts.info.yml b/docroot/modules/humsci/hs_layouts/hs_layouts.info.yml index 12c92f78d7..d6f4260cc6 100644 --- a/docroot/modules/humsci/hs_layouts/hs_layouts.info.yml +++ b/docroot/modules/humsci/hs_layouts/hs_layouts.info.yml @@ -2,7 +2,7 @@ name: 'H&S Layouts' type: module description: 'Layout options for H&S' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - layout_discovery diff --git a/docroot/modules/humsci/hs_masquerade/hs_masquerade.info.yml b/docroot/modules/humsci/hs_masquerade/hs_masquerade.info.yml index 9d36fa974d..4122ce1c84 100644 --- a/docroot/modules/humsci/hs_masquerade/hs_masquerade.info.yml +++ b/docroot/modules/humsci/hs_masquerade/hs_masquerade.info.yml @@ -2,7 +2,7 @@ name: 'H&S Masquerade' type: module description: 'Provide a masquerade page and menu link' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - masquerade diff --git a/docroot/modules/humsci/hs_news/hs_news.info.yml b/docroot/modules/humsci/hs_news/hs_news.info.yml index e008088253..ef8cf40b91 100644 --- a/docroot/modules/humsci/hs_news/hs_news.info.yml +++ b/docroot/modules/humsci/hs_news/hs_news.info.yml @@ -2,7 +2,7 @@ name: 'H&S News' type: module description: 'News content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - file diff --git a/docroot/modules/humsci/hs_news/modules/hs_news_display/hs_news_display.info.yml b/docroot/modules/humsci/hs_news/modules/hs_news_display/hs_news_display.info.yml index bea640c027..318dbae117 100644 --- a/docroot/modules/humsci/hs_news/modules/hs_news_display/hs_news_display.info.yml +++ b/docroot/modules/humsci/hs_news/modules/hs_news_display/hs_news_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S News Display' type: module description: 'News content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.info.yml b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.info.yml index 7ec02aaaa0..9730557bd6 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.info.yml @@ -2,7 +2,7 @@ name: 'H&S Paragraph Types' description: 'Generic Helpers for paragraphs.' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - paragraphs diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/hs_hero_image.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/hs_hero_image.info.yml index d76f784f24..e65eb78837 100755 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/hs_hero_image.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/hs_hero_image.info.yml @@ -2,7 +2,7 @@ name: 'H&S Hero Image Paragraph' description: 'Hero Image Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - entity_browser diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/modules/hs_hero_image_display/hs_hero_image_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/modules/hs_hero_image_display/hs_hero_image_display.info.yml index a497606c9b..b92f245a06 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/modules/hs_hero_image_display/hs_hero_image_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_hero_image/modules/hs_hero_image_display/hs_hero_image_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Hero Image Paragraph Display' description: 'Hero Image Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 hidden: true package: 'Humanities & Sciences' dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/hs_postcard.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/hs_postcard.info.yml index fd5c154776..1569cf25d4 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/hs_postcard.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/hs_postcard.info.yml @@ -2,7 +2,7 @@ name: H&S Postcard Paragraph description: A paragraph type with a postcard display. core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - media diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/modules/hs_postcard_display/hs_postcard_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/modules/hs_postcard_display/hs_postcard_display.info.yml index 9107ba7b40..2cd206ec68 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/modules/hs_postcard_display/hs_postcard_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_postcard/modules/hs_postcard_display/hs_postcard_display.info.yml @@ -2,7 +2,7 @@ name: H&S Postcard Display description: A paragraph type with a postcard display. core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.info.yml index ec2ca167ca..bbd0969bf0 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/hs_row.info.yml @@ -2,7 +2,7 @@ name: H&S Row Paragraph description: A paragraph type with a simple image. core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - allowed_formats diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.info.yml index 40b6a4ebed..417f78fde1 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_row/modules/hs_row_display/hs_row_display.info.yml @@ -2,7 +2,7 @@ name: H&S Row Paragraph Display description: A paragraph type with a simple image. core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/hs_slide.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/hs_slide.info.yml index 9a68eb42d2..9608e11e51 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/hs_slide.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/hs_slide.info.yml @@ -2,7 +2,7 @@ name: H&S Slide Paragraph description: A paragraph type with a simple image. core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - allowed_formats diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/modules/hs_slide_display/hs_slide_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/modules/hs_slide_display/hs_slide_display.info.yml index 4e0224f4ba..6202e95f6a 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/modules/hs_slide_display/hs_slide_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slide/modules/hs_slide_display/hs_slide_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Slide Paragraph Display' description: 'A paragraph type with a simple image.' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/hs_slideshow.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/hs_slideshow.info.yml index b0414cdfea..08f31b4425 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/hs_slideshow.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/hs_slideshow.info.yml @@ -2,7 +2,7 @@ name: H&S Slideshow Paragraph description: A paragraph type with a slideshow. core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - entity_reference_revisions diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/modules/hs_slideshow_display/hs_slideshow_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/modules/hs_slideshow_display/hs_slideshow_display.info.yml index 1ba6e6a3b1..0ea12a00ca 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/modules/hs_slideshow_display/hs_slideshow_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_slideshow/modules/hs_slideshow_display/hs_slideshow_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Slideshow Paragraph Display' description: 'A paragraph type with a slideshow.' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/hs_text_area.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/hs_text_area.info.yml index 6b9bce5764..6f2c6b5502 100755 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/hs_text_area.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/hs_text_area.info.yml @@ -2,7 +2,7 @@ name: 'H&S Text Area Paragraph' description: 'Text Area Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - paragraphs diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/modules/hs_text_area_display/hs_text_area_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/modules/hs_text_area_display/hs_text_area_display.info.yml index 6a03fcf2dc..ffd8f0df5b 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/modules/hs_text_area_display/hs_text_area_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_text_area/modules/hs_text_area_display/hs_text_area_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Text Area Paragraph Display' description: 'Text Area Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/hs_view.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/hs_view.info.yml index b0b22b0d79..7b7afc646d 100755 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/hs_view.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/hs_view.info.yml @@ -2,7 +2,7 @@ name: 'H&S View Paragraph' description: 'View Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - paragraphs diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/modules/hs_view_display/hs_view_display.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/modules/hs_view_display/hs_view_display.info.yml index 5effa999c2..0f1bb9a6fa 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/modules/hs_view_display/hs_view_display.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_view/modules/hs_view_display/hs_view_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S View Paragraph Display' description: 'View Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_paragraph_types/modules/hs_webform/hs_webform.info.yml b/docroot/modules/humsci/hs_paragraph_types/modules/hs_webform/hs_webform.info.yml index 5a67fd23ad..dcda222c46 100644 --- a/docroot/modules/humsci/hs_paragraph_types/modules/hs_webform/hs_webform.info.yml +++ b/docroot/modules/humsci/hs_paragraph_types/modules/hs_webform/hs_webform.info.yml @@ -2,7 +2,7 @@ name: 'H&S Webform Paragraph' description: 'Webform Paragraph type' core: 8.x type: module -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - paragraphs diff --git a/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.info.yml b/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.info.yml index 0fa31f04f0..10b842a0d0 100644 --- a/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.info.yml +++ b/docroot/modules/humsci/hs_paragraphs_between/hs_paragraphs_between.info.yml @@ -3,6 +3,6 @@ description: Allows the addition of paragraphs between existing ones. core: 8.x package: 'Humanities & Sciences' type: module -version: 8.0.17 +version: 8.0.18 dependencies: - drupal:paragraphs diff --git a/docroot/modules/humsci/hs_person/hs_person.info.yml b/docroot/modules/humsci/hs_person/hs_person.info.yml index e437abebd2..cc2903b809 100644 --- a/docroot/modules/humsci/hs_person/hs_person.info.yml +++ b/docroot/modules/humsci/hs_person/hs_person.info.yml @@ -2,7 +2,7 @@ name: 'H&S Person' type: module description: 'Person content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - address diff --git a/docroot/modules/humsci/hs_person/modules/hs_person_display/hs_person_display.info.yml b/docroot/modules/humsci/hs_person/modules/hs_person_display/hs_person_display.info.yml index 89de8d3c5c..9d605ac78f 100644 --- a/docroot/modules/humsci/hs_person/modules/hs_person_display/hs_person_display.info.yml +++ b/docroot/modules/humsci/hs_person/modules/hs_person_display/hs_person_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Person Display' type: module description: 'Publications content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_publications/hs_publications.info.yml b/docroot/modules/humsci/hs_publications/hs_publications.info.yml index 6d068f5ff7..748495f558 100644 --- a/docroot/modules/humsci/hs_publications/hs_publications.info.yml +++ b/docroot/modules/humsci/hs_publications/hs_publications.info.yml @@ -2,7 +2,7 @@ name: 'H&S Publications' type: module description: 'Publications content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - datetime diff --git a/docroot/modules/humsci/hs_publications/modules/hs_publications_display/hs_publications_display.info.yml b/docroot/modules/humsci/hs_publications/modules/hs_publications_display/hs_publications_display.info.yml index a4bd1b4a26..cfc679ade7 100644 --- a/docroot/modules/humsci/hs_publications/modules/hs_publications_display/hs_publications_display.info.yml +++ b/docroot/modules/humsci/hs_publications/modules/hs_publications_display/hs_publications_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Publications Display' type: module description: 'Publications content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/modules/humsci/hs_research/hs_research.info.yml b/docroot/modules/humsci/hs_research/hs_research.info.yml index b91d793406..931fffa89f 100644 --- a/docroot/modules/humsci/hs_research/hs_research.info.yml +++ b/docroot/modules/humsci/hs_research/hs_research.info.yml @@ -2,7 +2,7 @@ name: 'H&S Reesarch' type: module description: 'Research content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' dependencies: - field diff --git a/docroot/modules/humsci/hs_research/modules/hs_research_display/hs_research_display.info.yml b/docroot/modules/humsci/hs_research/modules/hs_research_display/hs_research_display.info.yml index 2d7a1df04e..2e329c32ae 100644 --- a/docroot/modules/humsci/hs_research/modules/hs_research_display/hs_research_display.info.yml +++ b/docroot/modules/humsci/hs_research/modules/hs_research_display/hs_research_display.info.yml @@ -2,7 +2,7 @@ name: 'H&S Research Display' type: module description: 'Publications content type' core: 8.x -version: 8.0.17 +version: 8.0.18 package: 'Humanities & Sciences' hidden: true dependencies: diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index 00eaa41597..0f8e57da1c 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: Stanford HumSci type: profile description: 'Installation profile for HumSci' -version: 8.0.17 +version: 8.0.18 core: 8.x themes: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 1dcf7f6656..ca91fc3d81 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,24 @@ # HumSci +8.0.18 +-------------------------------------------------------------------------------- +_Release Date: 2019-02-20_ + +* HSD8-578 Added margin to horizontal cards used in ECK fields +* HSD8-536 Accordion Pattern & Paragraph +* HSD8-355 Changed config ignore to ignore only parts of google analytics +* HSD8-579 Use ultimate cron to compartmentalize each migration importer +* HSD8-572 Style the login portal page to be closer to material theme +* HSD8-312 HSD8-504 External LInk icon placement and styles +* HS-113 CAPx importer fixes +* HSD8-576 View Field title (with optional override) +* HSD8-515 Use color module to change colors on the site +* HSD8-297 Fixed WYSIWYG toolbar when the content is really long +* HSD8-555 Filter shortcuts the user doesn't have permission to access +* Enable honeypot on all webforms +* Research Areas can now be placed in a menu +* Updated dependencies + 8.0.17 -------------------------------------------------------------------------------- _Release Date: 2019-02-06_ From 2f45ac6a946e3c375f29537614c97ca7fa31f389 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Wed, 20 Feb 2019 12:19:11 -0800 Subject: [PATCH 25/25] Updated dependencies --- composer.lock | 124 +++++++++++++++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 48 deletions(-) diff --git a/composer.lock b/composer.lock index d515319293..2146594c31 100644 --- a/composer.lock +++ b/composer.lock @@ -718,16 +718,16 @@ }, { "name": "consolidation/config", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c" + "reference": "11ab7ecd19131ce084390171b9c070eedecf7dab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c", + "url": "https://api.github.com/repos/consolidation/config/zipball/11ab7ecd19131ce084390171b9c070eedecf7dab", + "reference": "11ab7ecd19131ce084390171b9c070eedecf7dab", "shasum": "" }, "require": { @@ -736,9 +736,9 @@ "php": ">=5.4.0" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5", - "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", "symfony/yaml": "^2.8.11|^3|^4" @@ -748,6 +748,33 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require-dev": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require-dev": { + "symfony/console": "^2.8", + "symfony/event-dispatcher": "^2.8", + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -768,7 +795,7 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2018-10-24T17:55:35+00:00" + "time": "2019-02-16T01:18:47+00:00" }, { "name": "consolidation/log", @@ -3354,17 +3381,17 @@ }, { "name": "drupal/conditional_fields", - "version": "1.0.0-alpha4", + "version": "1.0.0-alpha5", "source": { "type": "git", "url": "https://git.drupal.org/project/conditional_fields", - "reference": "8.x-1.0-alpha4" + "reference": "8.x-1.0-alpha5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/conditional_fields-8.x-1.0-alpha4.zip", - "reference": "8.x-1.0-alpha4", - "shasum": "5e13204d5296c63958eacc0028cdb6c7a4d2e3d3" + "url": "https://ftp.drupal.org/files/projects/conditional_fields-8.x-1.0-alpha5.zip", + "reference": "8.x-1.0-alpha5", + "shasum": "f4193c987d460ed44d44f2936e33d00a80f0f22b" }, "require": { "drupal/core": "*" @@ -3375,8 +3402,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-alpha4", - "datestamp": "1511555675", + "version": "8.x-1.0-alpha5", + "datestamp": "1550176380", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3820,16 +3847,16 @@ }, { "name": "drupal/core", - "version": "8.6.9", + "version": "8.6.10", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "cac12e0ec19d5c6fa53778522b3ff4c542f86c8d" + "reference": "59568ac02948cf075ee8543e6c6d4386ad8daec1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/cac12e0ec19d5c6fa53778522b3ff4c542f86c8d", - "reference": "cac12e0ec19d5c6fa53778522b3ff4c542f86c8d", + "url": "https://api.github.com/repos/drupal/core/zipball/59568ac02948cf075ee8543e6c6d4386ad8daec1", + "reference": "59568ac02948cf075ee8543e6c6d4386ad8daec1", "shasum": "" }, "require": { @@ -4059,7 +4086,7 @@ "GPL-2.0-or-later" ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", - "time": "2019-02-08T12:21:40+00:00" + "time": "2019-02-20T18:35:01+00:00" }, { "name": "drupal/crop", @@ -4776,7 +4803,7 @@ "source": { "type": "git", "url": "https://git.drupal.org/project/entity_browser", - "reference": "647ceaccb35c5dd5468b144c9c5e7ad49138607f" + "reference": "419c882d7f32e21f4a0925d2bf55c5e4db86a713" }, "require": { "drupal/core": "~8.0" @@ -4793,8 +4820,8 @@ "dev-8.x-1.x": "8.1.x-dev" }, "drupal": { - "version": "8.x-2.0+6-dev", - "datestamp": "1549981380", + "version": "8.x-2.1+3-dev", + "datestamp": "1550668984", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -4853,7 +4880,7 @@ "issues": "http://drupal.org/project/issues/entity_browser", "irc": "irc://irc.freenode.org/drupal-contribute" }, - "time": "2019-02-12T13:54:59+00:00" + "time": "2019-02-20T13:31:51+00:00" }, { "name": "drupal/entity_embed", @@ -5602,17 +5629,17 @@ }, { "name": "drupal/fontawesome", - "version": "2.11.0", + "version": "2.12.0", "source": { "type": "git", "url": "https://git.drupal.org/project/fontawesome", - "reference": "8.x-2.11" + "reference": "8.x-2.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/fontawesome-8.x-2.11.zip", - "reference": "8.x-2.11", - "shasum": "b09ffea10f7e2f9d15bc3326c5d05cbc76d57fba" + "url": "https://ftp.drupal.org/files/projects/fontawesome-8.x-2.12.zip", + "reference": "8.x-2.12", + "shasum": "ed8ea9c5354201db2f0eac2bf8f3a4c46403f307" }, "require": { "drupal/core": "~8.0" @@ -5623,8 +5650,8 @@ "dev-2.x": "2.x-dev" }, "drupal": { - "version": "8.x-2.11", - "datestamp": "1550073481", + "version": "8.x-2.12", + "datestamp": "1550692543", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6396,17 +6423,17 @@ }, { "name": "drupal/metatag", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://git.drupal.org/project/metatag", - "reference": "8.x-1.7" + "reference": "8.x-1.8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.7.zip", - "reference": "8.x-1.7", - "shasum": "93decaefd053c524918ceae5b5ef05dd77de0857" + "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.8.zip", + "reference": "8.x-1.8", + "shasum": "fb5d31aa08c8c2e175f096f9917e9741db152ea8" }, "require": { "drupal/core": "*", @@ -6428,8 +6455,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.7", - "datestamp": "1535726393", + "version": "8.x-1.8", + "datestamp": "1550692511", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6649,17 +6676,17 @@ }, { "name": "drupal/paragraphs", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupal.org/project/paragraphs", - "reference": "8.x-1.5" + "reference": "8.x-1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "85ba97dd1c602d33fc5904b6e1df5973312afa94" + "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "cd93e244f3a78dabdcf362adc31e59aad25b3fae" }, "require": { "drupal/core": "~8", @@ -6687,8 +6714,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.5", - "datestamp": "1541009695", + "version": "8.x-1.6", + "datestamp": "1550692525", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -8813,7 +8840,7 @@ "source": { "type": "git", "url": "https://git.drupal.org/project/xmlsitemap", - "reference": "3d3c2043adb48d1643077af5f80391f061f77517" + "reference": "6f19dd67fd5b25109fe739b91e79e382aa1b5eb6" }, "require": { "drupal/core": "~8.0", @@ -8831,8 +8858,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.0-alpha3+23-dev", - "datestamp": "1549402080", + "version": "8.x-1.0-alpha3+24-dev", + "datestamp": "1549522080", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -8892,7 +8919,7 @@ "source": "http://cgit.drupalcode.org/xmlsitemap", "issues": "http://drupal.org/project/issues/xmlsitemap" }, - "time": "2019-02-07T06:43:28+00:00" + "time": "2019-02-18T15:22:43+00:00" }, { "name": "drupal/yearonly", @@ -10962,6 +10989,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2018-08-09T05:50:03+00:00" }, {