Skip to content

Johndev #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Johnrae wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Johndev #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0651c6b
Text updates.
Johnrae Aug 25, 2016
14c1a72
updating copy
Johnrae Aug 25, 2016
55357f5
Update colors.
Johnrae Aug 25, 2016
2f1c910
Delete comments.
Johnrae Aug 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions demo/css/main.css
View file
Open in desktop

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

40 changes: 6 additions & 34 deletions demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<meta property="og:title" content="Scrollmptious: " />
<meta property="og:type" content="website" />
<meta property="og:url" content="http://polarnotion.github.io/turntable/" />
<meta property="og:url" content="http://polarnotion.github.io/scrollmptious/" />
<meta property="og:image" content="" />

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
Expand All @@ -22,7 +22,7 @@
<body>


<nav class="navbar navbar-fixed-top">
<nav class="navbar navbar-fixed-top">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
Expand Down Expand Up @@ -54,14 +54,14 @@
<div class="container">
<div class="container-center text-center">
<h1 class="text-color">Scrollmptious.js<br>A Javascript Scroll Utility</h1>
<em class="text-color lead">"Its a mouthful!"</em>
<em class="text-color lead">"We keep scrolling tasteful"</em>
</div>
</div>
</header>

<div class="container">
<h2 id="examples">What is this?</h2>
<p class="lead">Scrollmptious is a jquery plugin that lets you determine scroll direction and run code accordingly. </p>
<p class="lead">Scrollmptious is a jquery plugin that lets you determine scroll direction and run code accordingly. Scroll up, run one function, Scroll down, run another.</p>

<h2 id="install">Installation</h2>
<p class="lead">
Expand Down Expand Up @@ -101,7 +101,7 @@ <h2 id="install">Installation</h2>
</div>
<div role="tabpanel" class="tab-pane" id="js">
<pre class="prettyprint pad language-java">
$('nav').scrollmptious(); // "awesome"
$('nav').scrollmptious();
</pre>
</div>
<div role="tabpanel" class="tab-pane" id="css">
Expand Down Expand Up @@ -133,35 +133,7 @@ <h2 id="settings">Settings</h2>

$('body').scrollmptious({ upFunction: scrollUp, downFunction: scrollDown });
</pre>
<p class="lead">Technically it doesnt matter which element you target with jquery if youre using your own code, but you should try to target a single element and not a collection if youre going that route. </p>
<br>


<br>

<ul class="list-inline">
<li>See what people are saying on:</li>
<li>
<a href="https://twitter.com/search?q=turntable.js" target="_blank">
<i class="fa fa-twitter"></i> Twitter
</a>
</li>
<li>
<a href="https://www.facebook.com/search/top/?q=turntable.js" target="_blank">
<i class="fa fa-facebook"></i> Facebook
</a>
</li>
<li>
<a href="https://www.reddit.com/r/web_design/comments/4fhx16/turntablejs_a_responsive_JQuery_slider_that_will/" target="_blank">
<i class="fa fa-reddit-alien"></i> Reddit
</a>
</li>
<li>
<a href="https://www.producthunt.com/tech/turntable-js" target="_blank">
<i class="fa fa-product-hunt"></i> Product Hunt
</a>
</li>
</ul>
<p class="lead">Technically it doesnt matter which element you target with jquery if youre using your own code, but you should try to target a single element and not a collection of elements if youre going that route. </p>
<br>
<p>v 1.0.0</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions demo/js/scrollmptious.min.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion src/scrollmptious.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
hasScrolled();
didScroll = false;
}
}, 200);
}, 100);

$(window).scroll(function() {
didScroll = true;
Expand Down