Skip to content
This repository has been archived by the owner on Sep 16, 2019. It is now read-only.

Commit

Permalink
Merge pull request #1154 from Aetles/update-foundationpress
Browse files Browse the repository at this point in the history
Update to Foundation for Sites 6.4.3
  • Loading branch information
olefredrik authored Nov 14, 2017
2 parents 04d0de1 + 5621ec3 commit b2d5473
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"responsive"
],
"dependencies": {
"foundation-sites": "6.4.1",
"foundation-sites": "6.4.3",
"jquery": "~3.0.0",
"what-input": "^4.1.3",
"motion-ui": "~1.2.2"
Expand Down
28 changes: 17 additions & 11 deletions src/assets/scss/_settings.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// FoundationPress settings.
// Based on Foundation v6.4.1
// Based on Foundation for Sites v6.4.3
// -----------------------------
//
// Table of Contents:
Expand Down Expand Up @@ -97,6 +97,7 @@ $global-menu-nested-margin: 1rem;
$global-text-direction: ltr;
$global-flexbox: true;
$global-prototype-breakpoints: false;
$global-button-cursor: auto;
$global-color-pick-contrast-tolerance: 0;
$print-transparent-backgrounds: true;

Expand Down Expand Up @@ -241,7 +242,7 @@ $accordionmenu-padding: $global-menu-padding;
$accordionmenu-nested-margin: $global-menu-nested-margin;
$accordionmenu-submenu-padding: $accordionmenu-padding;
$accordionmenu-arrows: true;
$accordionmenu-arrow-color: $white;
$accordionmenu-arrow-color: $primary-color;
$accordionmenu-item-background: null;
$accordionmenu-border: null;
$accordionmenu-submenu-toggle-background: null;
Expand Down Expand Up @@ -397,8 +398,8 @@ $dropdownmenu-padding: $global-menu-padding;
$dropdownmenu-nested-margin: 0;
$dropdownmenu-submenu-padding: $dropdownmenu-padding;
$dropdownmenu-border: 1px solid $medium-gray;
$dropdown-menu-item-color-active: $light-gray;
$dropdown-menu-item-background-active: lighten($dark-nav-color, 5%);
$dropdown-menu-item-color-active: get-color(primary);
$dropdown-menu-item-background-active: transparent;

// 19. Flexbox Utilities
// ---------------------
Expand Down Expand Up @@ -479,6 +480,7 @@ $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;

// 24. Meter
// ---------
Expand All @@ -493,9 +495,13 @@ $meter-fill-bad: $alert-color;
// 25. Off-canvas
// --------------

$offcanvas-size: 280px;
$offcanvas-vertical-size: 250px;
$offcanvas-background: $dark-nav-color;
$offcanvas-sizes: (
small: 250px,
);
$offcanvas-vertical-sizes: (
small: 250px,
);
$offcanvas-background: $light-gray;
$offcanvas-shadow: 0 0 10px rgba($black, 0.7);
$offcanvas-inner-shadow-size: 20px;
$offcanvas-inner-shadow-color: rgba($black, 0.25);
Expand Down Expand Up @@ -815,7 +821,7 @@ $thumbnail-radius: $global-radius;
// 53. Title Bar
// -------------

$titlebar-background: $dark-nav-color;
$titlebar-background: $black;
$titlebar-color: $white;
$titlebar-padding: 0.5rem;
$titlebar-text-font-weight: bold;
Expand All @@ -841,8 +847,8 @@ $tooltip-radius: $global-radius;
// 55. Top Bar
// -----------

$topbar-padding: 0rem;
$topbar-background: $dark-nav-color;
$topbar-padding: 0.5rem;
$topbar-background: $light-gray;
$topbar-submenu-background: $topbar-background;
$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
$topbar-input-width: 200px;
Expand All @@ -861,4 +867,4 @@ $grid-margin-gutters: (
$grid-padding-gutters: $grid-margin-gutters;
$grid-container-padding: $grid-padding-gutters;
$grid-container-max: $global-width;
$block-grid-max: 8;
$xy-block-grid-max: 8;

0 comments on commit b2d5473

Please sign in to comment.