Skip to content

Commit 1e8ff7f

Browse files
authored
Merge pull request #4459 from alvarotrigo/dev
Merging Dev branch 4.0.11
2 parents 3ee71c0 + 7a0f623 commit 1e8ff7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+3070
-1352
lines changed

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/french#fullpagejs">Français</a> |
99
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/russian#fullpagejs">Pусский</a> |
1010
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/chinese#fullpagejs">中文</a> |
11-
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/korean#fullpagejs">한국어</a>
11+
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/korean#fullpagejs">한국어</a> |
12+
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/brazilian-portuguese#fullpagejs">Português Brasileiro</a>
1213
</p>
1314

1415
<p align="center">
@@ -17,7 +18,7 @@
1718

1819
---
1920

20-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.10-brightgreen.svg)
21+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v4.0.11-brightgreen.svg)
2122
[![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
2223
[![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
2324
[![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
@@ -28,7 +29,7 @@
2829
- [Wordpress theme](http://alvarotrigo.com/fullPage/utils/wordpress.html)
2930
- [fullpage.js Extensions](http://alvarotrigo.com/fullPage/extensions/)
3031
- [Frequently Answered Questions](https://github.com/alvarotrigo/fullPage.js/wiki/FAQ---Frequently-Answered-Questions)
31-
- [[Migration from fullPage v3 to fullpage v4]](https://github.com/alvarotrigo/fullPage.js/wiki/Migration-from-fullPage-v3-to-fullPage-v4)
32+
- [[Migration from fullPage v3 to fullpage v4]](https://alvarotrigo.com/fullPage/help/migration-from-fullpage-3/)
3233
---
3334

3435
A simple and easy to use library that creates fullscreen scrolling websites (also known as single page websites or onepage sites) and adds landscape sliders inside the sections of the site.
@@ -200,6 +201,7 @@ var myFullpage = new fullpage('#fullpage', {
200201
scrollingSpeed: 700,
201202
autoScrolling: true,
202203
fitToSection: true,
204+
fitToSectionDelay: 600,
203205
scrollBar: false,
204206
easing: 'easeInOutCubic',
205207
easingcss3: 'ease',
@@ -430,6 +432,8 @@ It requires the file `vendors/easings.min.js` or [jQuery UI](http://jqueryui.com
430432

431433
- `fitToSection`: (default `true`) Determines whether or not to fit sections to the viewport or not. When set to `true` the current active section will always fill the whole viewport. Otherwise the user will be free to stop in the middle of a section.
432434

435+
- `fitToSectionDelay`: (default 1000). If `fitToSection` is set to true, this delays the fitting by the configured milliseconds.
436+
433437
- `scrollBar`: (default `false`) Determines whether to use scroll bar for the **vertical sections** on site or not. In case of using scroll bar, the `autoScrolling` functionality will still work as expected. The user will also be free to scroll the site with the scroll bar and fullPage.js will fit the section in the screen when scrolling finishes.
434438

435439
- `paddingTop`: (default `0`) Defines the top padding for each section with a numerical value and its measure (paddingTop: '10px', paddingTop: '10em'...) Useful in case of using a fixed header.
@@ -528,13 +532,13 @@ new fullpage('#fullpage', {
528532

529533
- `parallaxOptions`: (default: `{ type: 'reveal', percentage: 62, property: 'translate'}`). Allows to configure the parameters for the parallax backgrounds effect when using the option `parallax:true`. [Read more about how to apply the parallax option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension---Parallax).
530534

531-
- `dropEffect` (default `false`) [Extension of fullpage.js](http://alvarotrigo.com/fullPage/extensions/). Defines whether or not to use the drop effect on sections / slides. [Read more about how to apply the the drop effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Drop-Effect).
535+
- `dropEffect` (default `false`) [Extension of fullpage.js](http://alvarotrigo.com/fullPage/extensions/). Defines whether or not to use the drop effect on sections / slides. [Read more about how to apply the drop effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Drop-Effect).
532536

533-
- `dropEffectOptions`: (default: `{ speed: 2300, color: '#F82F4D', zIndex: 9999}`). Allows to configure the parameters for the drop effect when using the option `dropEffect:true`.[Read more about how to apply the the drop effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Drop-Effect).
537+
- `dropEffectOptions`: (default: `{ speed: 2300, color: '#F82F4D', zIndex: 9999}`). Allows to configure the parameters for the drop effect when using the option `dropEffect:true`.[Read more about how to apply the drop effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Drop-Effect).
534538

535-
- `waterEffect` (default `false`) [Extension of fullpage.js](http://alvarotrigo.com/fullPage/extensions/). Defines whether or not to use the water effect on sections / slides. [Read more about how to apply the the water effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Water-Effect).
539+
- `waterEffect` (default `false`) [Extension of fullpage.js](http://alvarotrigo.com/fullPage/extensions/). Defines whether or not to use the water effect on sections / slides. [Read more about how to apply the water effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Water-Effect).
536540

537-
- `waterEffectOptions`: (default: `{ animateContent: true, animateOnMouseMove: true}`). Allows to configure the parameters for the water effect when using the option `waterEffect:true`.[Read more about how to apply the the water effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Water-Effect).
541+
- `waterEffectOptions`: (default: `{ animateContent: true, animateOnMouseMove: true}`). Allows to configure the parameters for the water effect when using the option `waterEffect:true`.[Read more about how to apply the water effect option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Water-Effect).
538542

539543
- `cards`: (default `false`) [Extension of fullpage.js](http://alvarotrigo.com/fullPage/extensions/). Defines whether or not to use the cards effect on sections/slides. [Read more about how to apply the cards option](https://github.com/alvarotrigo/fullPage.js/wiki/Extension-Cards).
540544

dist/fullpage.css

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 4.0.10
2+
* fullPage 4.0.11
33
* https://github.com/alvarotrigo/fullPage.js
44
*
55
* @license GPLv3 for open source use only
@@ -224,24 +224,33 @@ html.fp-enabled,
224224
height: auto !important;
225225
}
226226

227+
.fp-responsive .fp-is-overflow.fp-section{
228+
height: auto !important;
229+
}
230+
227231
/* Used with autoScrolling: false */
232+
.fp-scrollable.fp-responsive .fp-is-overflow.fp-section,
228233
.fp-scrollable .fp-section,
229234
.fp-scrollable .fp-slide{
230235
/* Fallback for browsers that do not support Custom Properties */
231236
height: 100vh;
237+
min-height: 100vh;
232238
height: calc(var(--vh, 1vh) * 100);
239+
min-height: calc(var(--vh, 1vh) * 100);
233240
}
234241

235242
/* Disabling vertical centering on scrollable elements */
236243
.fp-overflow{
237244
justify-content: flex-start;
245+
max-height: 100%;
238246
}
239247

240-
.fp-overflow.fp-auto-height-responsive,
241-
.fp-overflow.fp-auto-height,
248+
.fp-is-overflow .fp-overflow.fp-auto-height-responsive,
249+
.fp-is-overflow .fp-overflow.fp-auto-height,
250+
.fp-is-overflow > .fp-overflow{
251+
overflow-y: auto;
252+
}
242253
.fp-overflow{
243-
overflow-y: scroll;
244-
height: 100% !important;
245254
outline:none;
246255
}
247256

@@ -266,30 +275,6 @@ html.fp-enabled,
266275
border: 0;
267276
}
268277

269-
.fp-snaps{
270-
overflow-y: auto !important;
271-
height: 100% !important;
272-
}
273-
.fp-snaps body{
274-
height: 100% !important;
275-
-ms-scroll-snap-type: y mandatory;
276-
scroll-snap-type: y mandatory;
277-
overflow-y: scroll !important;
278-
scroll-behavior: smooth;
279-
}
280-
.fp-snaps .fp-section{
281-
scroll-snap-align: start;
282-
}
283-
.fp-snaps .fullpage-wrapper{
284-
height: auto !important;
285-
}
286-
287-
/* Used for DragAndMove*/
288-
.fp-disable-snap body{
289-
scroll-behavior: unset !important;
290-
scroll-snap-type: none !important;
291-
}
292-
293278
/* Customize website's scrollbar like Mac OS
294279
Not supports in Firefox and IE */
295280
.fp-scroll-mac .fp-overflow::-webkit-scrollbar {
@@ -323,7 +308,6 @@ Not supports in Firefox and IE */
323308
border-radius: 3px;
324309
margin: 12px;
325310
}
326-
.fp-noscroll {
327-
justify-content: flex-start;
311+
.fp-noscroll .fp-overflow{
328312
overflow: hidden;
329313
}

dist/fullpage.extensions.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)