Skip to content

Commit

Permalink
Merge branch 'release/v6.7.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
joeworkman committed Sep 27, 2021
2 parents 5f4afb9 + a46c999 commit b841c5d
Show file tree
Hide file tree
Showing 35 changed files with 45 additions and 41 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.7.2",
"version": "6.7.3",
"description": "The most advanced responsive front-end framework in the world.",
"homepage": "https://get.foundation/sites",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion dist/css/foundation-float.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-float.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-prototype.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-prototype.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-prototype.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-rtl.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation-rtl.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation-rtl.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/foundation.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/foundation.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/foundation.cjs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/foundation.cjs.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/foundation.es6.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/foundation.es6.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/foundation.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/foundation.esm.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/foundation.js
Original file line number Diff line number Diff line change
Expand Up @@ -2222,7 +2222,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi



var FOUNDATION_VERSION = '6.7.2'; // Global Foundation object
var FOUNDATION_VERSION = '6.7.3'; // Global Foundation object
// This is attached to the window, or used as a module for AMD/Browserify

var Foundation = {
Expand Down
2 changes: 1 addition & 1 deletion dist/js/foundation.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/foundation.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/foundation.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/plugins/foundation.core.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/plugins/foundation.core.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/plugins/foundation.core.min.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions docs/pages/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,23 +239,23 @@ The folks at [jsDelivr](https://www.jsdelivr.com) host the compressed Foundation

```html
<!-- Compressed CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/dist/css/foundation.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.3/dist/css/foundation.min.css" crossorigin="anonymous">

<!-- Compressed JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/dist/js/foundation.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.3/dist/js/foundation.min.js" crossorigin="anonymous"></script>
```

From Foundation 6.4, flex is enabled by default and **only the new XY Grid is available**. However, others CSS versions are available for backward compatibility and the most common usage cases. For others uses and advanced customization, we recommand to build Foundation with custom settings (see others installation methods).

```html
<!-- foundation-float.min.css: Compressed CSS with legacy Float Grid -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/dist/css/foundation-float.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.3/dist/css/foundation-float.min.css" crossorigin="anonymous">

<!-- foundation-prototype.min.css: Compressed CSS with prototyping classes -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/dist/css/foundation-prototype.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.3/dist/css/foundation-prototype.min.css" crossorigin="anonymous">

<!-- foundation-rtl.min.css: Compressed CSS with right-to-left reading direction -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/dist/css/foundation-rtl.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.3/dist/css/foundation-rtl.min.css" crossorigin="anonymous">
```

<div class="text-center">
Expand Down
2 changes: 1 addition & 1 deletion docs/partials/search-bar.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="collapse expanded row secondary-bar">
<div class="small-5 medium-3 large-2 columns">
<a target="_blank" href="https://github.com/foundation/foundation-sites/releases/" class="version-dropdown-label"><span class="foundation-version-label">Foundation for Sites</span><span class="foundation-version-number">6.7.2</span> <span class="changelog-link">changelog</span></a>
<a target="_blank" href="https://github.com/foundation/foundation-sites/releases/" class="version-dropdown-label"><span class="foundation-version-label">Foundation for Sites</span><span class="foundation-version-number">6.7.3</span> <span class="changelog-link">changelog</span></a>
</div>

<div class="small-7 columns show-for-small-only">
Expand Down
2 changes: 1 addition & 1 deletion js/foundation.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import $ from 'jquery';
import { GetYoDigits } from './foundation.core.utils';
import { MediaQuery } from './foundation.util.mediaQuery';

var FOUNDATION_VERSION = '6.7.2';
var FOUNDATION_VERSION = '6.7.3';

// Global Foundation object
// This is attached to the window, or used as a module for AMD/Browserify
Expand Down
2 changes: 1 addition & 1 deletion meteor-README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [Foundation for Sites](https://get.foundation) (v6.7.2)
# [Foundation for Sites](https://get.foundation) (v6.7.3)

Foundation is the most advanced responsive front-end framework in the world. Quickly go from prototype to production, building sites or apps that work on any kind of device with Foundation. Includes layout constructs, like a fully customizable, responsive grid, commonly used JavaScript plugins, and full A11Y support.

Expand Down
2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package.describe({
name: 'foundation:foundation-sites',
summary: 'Foundation 6 - The most advanced responsive front-end framework in the world.',
version: '6.7.2',
version: '6.7.3',
git: 'https://github.com/foundation/foundation-sites.git',
documentation: 'meteor-README.md'
});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.7.2",
"version": "6.7.3",
"main": "dist/js/foundation.js",
"module": "dist/js/foundation.esm.js",
"jsnext:main": "dist/js/foundation.esm.js",
Expand Down
6 changes: 3 additions & 3 deletions package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<metadata>
<id>foundation-sites</id>
<version>6.7.2</version>
<version>6.7.3</version>

<title>Foundation for Sites</title>
<authors>Yetinauts</authors>
Expand All @@ -12,9 +12,9 @@

<projectUrl>https://get.foundation/sites</projectUrl>
<iconUrl>https://get.foundation/assets/img/icons/foundation-favicon.ico</iconUrl>
<releaseNotes>https://github.com/foundation/foundation-sites/releases/tag/v6.6.2</releaseNotes>
<releaseNotes>https://github.com/foundation/foundation-sites/releases/tag/v6.7.3</releaseNotes>
<licenseUrl>https://github.com/foundation/foundation-sites/blob/develop/LICENSE</licenseUrl>
<copyright>Copyright 2017-2018</copyright>
<copyright>Copyright 2017-2021</copyright>
<repository type="git" url="https://github.com/foundation/foundation-sites"/>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion scss/foundation.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* Foundation for Sites
* Version 6.7.2
* Version 6.7.3
* https://get.foundation
* Licensed under MIT Open Source
*/
Expand Down
6 changes: 5 additions & 1 deletion scss/util/_unit.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

@import 'math';

$unit-warnings: true !default;

////
/// @group functions
////
Expand Down Expand Up @@ -77,7 +79,9 @@ $global-font-size: 100% !default;
@function -zf-to-rem($value, $base: null) {
// Check if the value is a number
@if type-of($value) != 'number' {
@warn inspect($value) + ' was passed to rem-calc(), which is not a number.';
@if $unit-warnings {
@warn inspect($value) + ' was passed to rem-calc(), which is not a number.';
}
@return $value;
}

Expand Down

0 comments on commit b841c5d

Please sign in to comment.