Skip to content

Commit

Permalink
Update to version 6.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
deeshrestha committed Aug 11, 2017
1 parent a4c216e commit 63f3532
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Preset for Zurb Foundation 6 scaffolding on new Laravel 5.5.x project.

*Current version*: **Zurb Foundation for sites 6.4.1**
*Current version*: **Zurb Foundation for sites 6.4.2**

## Usage
1. Fresh install Laravel 5.5.x and `cd` to your app.
Expand Down
4 changes: 2 additions & 2 deletions src/ZurbFoundationPreset.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ public static function install($withAuth = false)
protected static function updatePackageArray(array $packages)
{
return [
'foundation-sites' => '^6.4.1',
'jquery' => '^2.2.4',
'foundation-sites' => '^6.4.2',
'jquery' => '^3.2.1',
] + Arr::except($packages, ['bootstrap-sass', 'bulma', 'uikit']);
}

Expand Down
12 changes: 9 additions & 3 deletions src/foundation-stubs/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,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 @@ -477,6 +478,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 @@ -491,8 +493,12 @@ $meter-fill-bad: $alert-color;
// 25. Off-canvas
// --------------

$offcanvas-size: 250px;
$offcanvas-vertical-size: 250px;
$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;
Expand Down Expand Up @@ -859,4 +865,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;
3 changes: 2 additions & 1 deletion src/foundation-stubs/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ window._ = require('lodash');
try {
window.$ = window.jQuery = require('jquery');

require('foundation-sites/dist/js/foundation.min');
require('foundation-sites/dist/js/foundation'); // 'foundation.min' can also be used if you like

} catch (e) {}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/foundation-stubs/foundation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
@include foundation-everything;

// if you won't be using old float grid, comment this out
// and desing your own auth pages
// and design your own auth pages
@include foundation-grid;
2 changes: 1 addition & 1 deletion src/foundation-stubs/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
</div>

<div class="foundation_button_test">
<p class="framwork_title">Zurb Foundation 6.4.1</p>
<p class="framwork_title">Zurb Foundation 6.4.2</p>
<a class="button primary" href="#">Primary</a>
<a class="button secondary" href="#">Secondary</a>
<a class="button success" href="#">Success</a>
Expand Down

0 comments on commit 63f3532

Please sign in to comment.