From f7dbb9b48515d2982404b1178b8ee39130d4de0e Mon Sep 17 00:00:00 2001 From: DanielApt Date: Wed, 18 Feb 2015 15:31:54 +0000 Subject: [PATCH 1/5] Ignore .idea (jetbrains) files --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 99d84ed..e5ac756 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules bower_components /dist +.idea \ No newline at end of file From 6af7500d6bb48ef85f0b3c02bc1e12af5596c2f2 Mon Sep 17 00:00:00 2001 From: DanielApt Date: Wed, 18 Feb 2015 16:17:42 +0000 Subject: [PATCH 2/5] Hide overflow only on .ps-container --- src/css/main.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/css/main.scss b/src/css/main.scss index b19474f..16e1f7e 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -69,6 +69,8 @@ $ps-bar-hover: #999; } .ps-container { + overflow: hidden !important; + &.ps-active-x > .ps-scrollbar-x-rail, &.ps-active-y > .ps-scrollbar-y-rail { display: block; From 313f62d2f803499a748358b69da91b2413bdee7a Mon Sep 17 00:00:00 2001 From: DanielApt Date: Wed, 18 Feb 2015 16:36:10 +0000 Subject: [PATCH 3/5] Update examples to use no-js fallback of overflow: scroll --- examples/always-visible.html | 2 +- examples/jquery.html | 2 +- examples/options-default.html | 2 +- examples/options-minScrollbarLength.html | 2 +- examples/options-suppressScrollAxis.html | 2 +- examples/options-useBothWheelAxes.html | 2 +- examples/options-wheelPropagation.html | 2 +- examples/options-wheelSpeed.html | 2 +- examples/reach-the-end-callback.html | 2 +- examples/removable-list-element.html | 2 +- examples/rtl.html | 2 +- examples/scrollbars-on-the-opposite-side.html | 2 +- examples/scrollbars-with-margin.html | 2 +- examples/table-content.html | 3 ++- examples/text-content.html | 2 +- 15 files changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/always-visible.html b/examples/always-visible.html index 0142fca..5bd5ccd 100644 --- a/examples/always-visible.html +++ b/examples/always-visible.html @@ -7,7 +7,7 @@ diff --git a/examples/options-default.html b/examples/options-default.html index fb0e679..b1ce17d 100644 --- a/examples/options-default.html +++ b/examples/options-default.html @@ -6,7 +6,7 @@ diff --git a/examples/options-minScrollbarLength.html b/examples/options-minScrollbarLength.html index 6cf2861..f6649db 100644 --- a/examples/options-minScrollbarLength.html +++ b/examples/options-minScrollbarLength.html @@ -6,7 +6,7 @@ diff --git a/examples/options-suppressScrollAxis.html b/examples/options-suppressScrollAxis.html index 4d1378f..ef1656e 100644 --- a/examples/options-suppressScrollAxis.html +++ b/examples/options-suppressScrollAxis.html @@ -6,7 +6,7 @@ diff --git a/examples/options-wheelSpeed.html b/examples/options-wheelSpeed.html index 6e1230c..0b8bd67 100644 --- a/examples/options-wheelSpeed.html +++ b/examples/options-wheelSpeed.html @@ -6,7 +6,7 @@ diff --git a/examples/reach-the-end-callback.html b/examples/reach-the-end-callback.html index 124a1e0..9f8f812 100644 --- a/examples/reach-the-end-callback.html +++ b/examples/reach-the-end-callback.html @@ -10,7 +10,7 @@ border: 1px solid gray; height:150px; width: 400px; - overflow: hidden; + overflow: scroll; position: relative; } #status { color: red; } diff --git a/examples/removable-list-element.html b/examples/removable-list-element.html index d034757..2526c44 100644 --- a/examples/removable-list-element.html +++ b/examples/removable-list-element.html @@ -10,7 +10,7 @@ border: 1px solid gray; max-height: 300px; width: 400px; - overflow: hidden; + overflow: scroll; position: relative; } #test .element { diff --git a/examples/rtl.html b/examples/rtl.html index d774fce..d15d26a 100644 --- a/examples/rtl.html +++ b/examples/rtl.html @@ -6,7 +6,7 @@ From 9ca1539ab40c51a0394f8b1c92a3fc952250f7c7 Mon Sep 17 00:00:00 2001 From: DanielApt Date: Sat, 21 Feb 2015 12:53:42 +0000 Subject: [PATCH 4/5] Use overflow:auto instead of scroll --- examples/always-visible.html | 2 +- examples/iframe-content.html | 2 +- examples/jquery.html | 2 +- examples/options-default.html | 2 +- examples/options-minScrollbarLength.html | 2 +- examples/options-suppressScrollAxis.html | 2 +- examples/options-useBothWheelAxes.html | 2 +- examples/options-wheelPropagation.html | 2 +- examples/options-wheelSpeed.html | 2 +- examples/reach-the-end-callback.html | 2 +- examples/removable-list-element.html | 2 +- examples/rtl.html | 2 +- examples/scrollbars-on-the-opposite-side.html | 2 +- examples/scrollbars-with-margin.html | 2 +- examples/table-content.html | 2 +- examples/text-content.html | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/always-visible.html b/examples/always-visible.html index 5bd5ccd..4c4b757 100644 --- a/examples/always-visible.html +++ b/examples/always-visible.html @@ -7,7 +7,7 @@ diff --git a/examples/jquery.html b/examples/jquery.html index 67bda00..afdfae5 100644 --- a/examples/jquery.html +++ b/examples/jquery.html @@ -7,7 +7,7 @@ diff --git a/examples/options-default.html b/examples/options-default.html index b1ce17d..3cf6bf2 100644 --- a/examples/options-default.html +++ b/examples/options-default.html @@ -6,7 +6,7 @@ diff --git a/examples/options-minScrollbarLength.html b/examples/options-minScrollbarLength.html index f6649db..88e782e 100644 --- a/examples/options-minScrollbarLength.html +++ b/examples/options-minScrollbarLength.html @@ -6,7 +6,7 @@ diff --git a/examples/options-suppressScrollAxis.html b/examples/options-suppressScrollAxis.html index ef1656e..0bc1a02 100644 --- a/examples/options-suppressScrollAxis.html +++ b/examples/options-suppressScrollAxis.html @@ -6,7 +6,7 @@ diff --git a/examples/options-wheelSpeed.html b/examples/options-wheelSpeed.html index 0b8bd67..b1f9b1d 100644 --- a/examples/options-wheelSpeed.html +++ b/examples/options-wheelSpeed.html @@ -6,7 +6,7 @@ diff --git a/examples/reach-the-end-callback.html b/examples/reach-the-end-callback.html index 9f8f812..1dcc702 100644 --- a/examples/reach-the-end-callback.html +++ b/examples/reach-the-end-callback.html @@ -10,7 +10,7 @@ border: 1px solid gray; height:150px; width: 400px; - overflow: scroll; + overflow: auto; position: relative; } #status { color: red; } diff --git a/examples/removable-list-element.html b/examples/removable-list-element.html index 2526c44..4db76f0 100644 --- a/examples/removable-list-element.html +++ b/examples/removable-list-element.html @@ -10,7 +10,7 @@ border: 1px solid gray; max-height: 300px; width: 400px; - overflow: scroll; + overflow: auto; position: relative; } #test .element { diff --git a/examples/rtl.html b/examples/rtl.html index d15d26a..b236166 100644 --- a/examples/rtl.html +++ b/examples/rtl.html @@ -6,7 +6,7 @@ From 73ff93984bc2aa14019b3998259b57b0c3ec9319 Mon Sep 17 00:00:00 2001 From: DanielApt Date: Sat, 21 Feb 2015 20:37:42 +0000 Subject: [PATCH 5/5] overflow:hidden no longer required - Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c979960..403d319 100644 --- a/README.md +++ b/README.md @@ -97,11 +97,11 @@ But, they're all very trivial and there is nothing to worry about. The following requirements should meet. * the container must have a 'position' css style. -* the container must have an 'overflow:hidden' css style. The following requirements are included in the basic CSS, but please keep in mind when you'd like to change the CSS files. +* the container must have an 'overflow:hidden' css style. * the scrollbar's position must be 'absolute'. * the scrollbar-x must have a 'bottom' css style, and the scrollbar-y must have a 'right' css style. @@ -117,7 +117,6 @@ requirements. #container { position: relative; height: 100%; /* Or whatever you want (eg. 400px) */ - overflow: hidden; } ```