Skip to content

Commit

Permalink
feat(ion-content): iOS only scroll bounce
Browse files Browse the repository at this point in the history
  • Loading branch information
manucorporat authored and adamdbradley committed Jun 28, 2016
1 parent d458b1e commit 5c80445
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/components/button/test/basic/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</ion-header>


<ion-content padding style="text-align:center">
<ion-content padding style="text-align:center" no-bounce>

<p>
<button><span>Default</span></button>
Expand Down
24 changes: 24 additions & 0 deletions src/components/content/content.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,27 @@ ion-page.show-page ~ .nav-decor {
// --------------------------------------------------

@include content-margin($content-ios-margin);


// iOS Content Scroll
// --------------------------------------------------

ion-content:not([no-bounce]) > scroll-content {
&::before,
&::after {
position: absolute;

width: 1px;
height: 1px;

content: "";
}

&::before {
bottom: -1px;
}

&::after {
top: -1px;
}
}

0 comments on commit 5c80445

Please sign in to comment.