From: Joe Workman <joe@workmanmail.com>
Date: Tue, 22 Oct 2019 18:20:56 +0000 (-0700)
Subject: Merge branch 'master' into develop-rebase
X-Git-Tag: v6.6.0~3^2~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18f6adf790657cfd2d7cbf10fe316937c70d74a1;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'master' into develop-rebase

# Conflicts:
#	.github/ISSUE_TEMPLATE.md
#	.github/ISSUE_TEMPLATE/1-bug-report.md
#	.github/ISSUE_TEMPLATE/2-feature-request.md
#	.github/ISSUE_TEMPLATE/3-documentation.md
#	.github/ISSUE_TEMPLATE/4-maintainance.md
#	.versions
#	CONTRIBUTING.md
#	LICENSE
#	README.md
#	bower.json
#	docs/pages/abide.md
#	docs/pages/installation.md
#	docs/pages/xy-grid.md
#	gulp/tasks/customizer.js
#	gulp/tasks/deploy.js
#	gulp/tasks/sass.js
#	gulp/utils.js
#	js/foundation.abide.js
#	js/foundation.accordion.js
#	js/foundation.core.utils.js
#	js/foundation.dropdown.js
#	js/foundation.dropdownMenu.js
#	js/foundation.magellan.js
#	js/foundation.offcanvas.js
#	js/foundation.reveal.js
#	js/foundation.sticky.js
#	js/foundation.tabs.js
#	js/foundation.toggler.js
#	js/foundation.tooltip.js
#	js/foundation.util.mediaQuery.js
#	js/foundation.util.touch.js
#	package-lock.json
#	package.json
#	script/husky-commit-lint.js
#	script/husky-commit-test.js
#	script/husky-push-test.js
#	scss/components/_button-group.scss
#	scss/components/_button.scss
#	scss/foundation.scss
#	scss/typography/_base.scss
#	scss/util/_breakpoint.scss
#	scss/util/_mixins.scss
#	scss/xy-grid/_cell.scss
#	scss/xy-grid/_classes.scss
#	scss/xy-grid/_layout.scss
#	scss/xy-grid/_position.scss
#	test/javascript/components/abide.js
#	test/javascript/components/drilldown.js
#	test/javascript/components/slider.js
#	test/javascript/components/toggler.js
#	yarn.lock
---

18f6adf790657cfd2d7cbf10fe316937c70d74a1
diff --cc package.json
index 78dda7f7b,7f63e3bac..007004254
--- a/package.json
+++ b/package.json
@@@ -94,8 -96,10 +95,10 @@@
      "sassy-lists": "^3.0.1",
      "sinon": "^7.2.2",
      "strip-indent": "^2.0.0",
 -    "supercollider": "^1.4.4",
 +    "supercollider": "^1.4.5",
+     "touch": "^3.1.0",
      "undertaker-forward-reference": "^1.0.2",
+     "util-deprecate": "^1.0.2",
      "vinyl": "^2.0.2",
      "vinyl-named": "^1.1.0",
      "webpack": "^4.28.4",
diff --cc scss/settings/_settings.scss
index f06c97dcc,4fd03e82a..25e1d69ed
--- a/scss/settings/_settings.scss
+++ b/scss/settings/_settings.scss
@@@ -473,10 -475,8 +475,9 @@@ $menu-nested-margin: $global-menu-neste
  $menu-items-padding: $global-menu-padding;
  $menu-simple-margin: 1rem;
  $menu-item-color-active: $white;
 +$menu-item-color-alt-active: $black;
  $menu-item-background-active: get-color(primary);
  $menu-icon-spacing: 0.25rem;
- $menu-item-background-hover: $light-gray;
  $menu-state-back-compat: true;
  $menu-centered-back-compat: true;
  $menu-icons-back-compat: true;