Skip to content

Commit

Permalink
Merge branch 'release/6.7.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
joeworkman committed Sep 9, 2021
2 parents 9a73e9d + 4128a67 commit 9211c6b
Show file tree
Hide file tree
Showing 45 changed files with 356 additions and 547 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.7.1",
"version": "6.7.2",
"description": "The most advanced responsive front-end framework in the world.",
"homepage": "https://get.foundation/sites",
"license": "MIT",
Expand Down
6 changes: 1 addition & 5 deletions 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

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.

6 changes: 1 addition & 5 deletions 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

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.

6 changes: 1 addition & 5 deletions 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

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.

6 changes: 1 addition & 5 deletions 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

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
Expand Up @@ -2222,7 +2222,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi



var FOUNDATION_VERSION = '6.7.1'; // Global Foundation object
var FOUNDATION_VERSION = '6.7.2'; // 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.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions docs/pages/installation.md
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.1/dist/css/foundation.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/dist/css/foundation.min.css" crossorigin="anonymous">

<!-- Compressed JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.1/dist/js/foundation.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/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.1/dist/css/foundation-float.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/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.1/dist/css/foundation-prototype.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/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.1/dist/css/foundation-rtl.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/foundation-sites@6.7.2/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
@@ -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.1</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.2</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 gulp/tasks/deploy.js
Expand Up @@ -79,7 +79,7 @@ gulp.task('deploy:dist:files', function() {
.pipe(gulp.dest('./dist/css'))
.pipe(sourcemaps.init({ loadMaps: true }))
.pipe(rename({ suffix: '.min' }))
.pipe(cleancss({ compatibility: 'ie11' }))
.pipe(cleancss({ compatibility: "ie11" }))
.pipe(sourcemaps.write('.'))
.pipe(gulp.dest('./dist/css'))
.pipe(cssFilter.restore)
Expand Down
2 changes: 1 addition & 1 deletion js/foundation.core.js
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.1';
var FOUNDATION_VERSION = '6.7.2';

// 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
@@ -1,4 +1,4 @@
# [Foundation for Sites](https://get.foundation) (v6.7.1)
# [Foundation for Sites](https://get.foundation) (v6.7.2)

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
@@ -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.1',
version: '6.7.2',
git: 'https://github.com/foundation/foundation-sites.git',
documentation: 'meteor-README.md'
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "foundation-sites",
"version": "6.7.1",
"version": "6.7.2",
"main": "dist/js/foundation.js",
"module": "dist/js/foundation.esm.js",
"jsnext:main": "dist/js/foundation.esm.js",
Expand Down Expand Up @@ -54,7 +54,7 @@
"gulp-babel": "^8.0.0",
"gulp-cache-bust": "^1.3.0",
"gulp-check-deps": "^1.4.1",
"gulp-clean-css": "^4.0.0",
"gulp-clean-css": "^4.3.0",
"gulp-concat": "^2.4.3",
"gulp-eslint": "^5.0.0",
"gulp-filter": "^5.1.0",
Expand Down
2 changes: 1 addition & 1 deletion package.nuspec
Expand Up @@ -3,7 +3,7 @@

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

<title>Foundation for Sites</title>
<authors>Yetinauts</authors>
Expand Down
16 changes: 11 additions & 5 deletions scss/_global.scss
Expand Up @@ -64,6 +64,10 @@ $body-font-color: $black !default;
/// @type List
$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif !default;

/// Set to `true` to enable safe padding on the body for non-rectangular devices (i.e. phones with notches)
/// @type Boolean
$body-safe-padding: false !default;

/// Set to `true` to enable antialiased type, using the `-webkit-font-smoothing` and `-moz-osx-font-smoothing` CSS properties.
/// @type Boolean
$body-antialiased: true !default;
Expand Down Expand Up @@ -158,11 +162,13 @@ $global-color-pick-contrast-tolerance: 0 !default;
margin: 0;
padding: 0;

// using environment variables to account for non-rectangular displays e.g. phones with notches
padding-top: env(safe-area-inset-top);
padding-right: env(safe-area-inset-right);
padding-bottom: env(safe-area-inset-bottom);
padding-left: env(safe-area-inset-left);
@if ($body-safe-padding) {
// using environment variables to account for non-rectangular displays e.g. phones with notches
padding-top: env(safe-area-inset-top);
padding-right: env(safe-area-inset-right);
padding-bottom: env(safe-area-inset-bottom);
padding-left: env(safe-area-inset-left);
}

background: $body-background;

Expand Down
2 changes: 1 addition & 1 deletion scss/foundation.scss
@@ -1,6 +1,6 @@
/**
* Foundation for Sites
* Version 6.7.1
* Version 6.7.2
* https://get.foundation
* Licensed under MIT Open Source
*/
Expand Down
1 change: 1 addition & 0 deletions scss/settings/_settings.scss
Expand Up @@ -83,6 +83,7 @@ $white: #fefefe;
$body-background: $white;
$body-font-color: $black;
$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
$body-safe-padding: false;
$body-antialiased: true;
$global-margin: 1rem;
$global-padding: 1rem;
Expand Down

0 comments on commit 9211c6b

Please sign in to comment.