Skip to content

Commit

Permalink
Merge pull request #1 from GunioRobot/clean
Browse files Browse the repository at this point in the history
Remove unnecessary whitespace
  • Loading branch information
tschmidt committed Sep 5, 2014
2 parents 9d7a370 + 10e73d5 commit 78c6477
Show file tree
Hide file tree
Showing 9 changed files with 188 additions and 169 deletions.
20 changes: 20 additions & 0 deletions .gitignore
@@ -0,0 +1,20 @@
# Compiled source #
###################
*.com
*.class
*.dll
*.exe
*.o
*.so
*.pyc

# Logs and databases #
######################
*.log

# OS generated files #
######################
.DS_Store*
ehthumbs.db
Icon?
Thumbs.db
19 changes: 9 additions & 10 deletions html/index.html
Expand Up @@ -9,11 +9,11 @@

<link rel="stylesheet" href="stylesheets/application.css" type="text/css" media="screen" title="no title" charset="utf-8">
<script src="javascripts/jquery-1.3.2.js" type="text/javascript" charset="utf-8"></script>

<script src="javascripts/jquery.easing-1.3.js" type="text/javascript" charset="utf-8"></script>
<script src="javascripts/jquery.form-2.28.js" type="text/javascript" charset="utf-8"></script>
<script src="javascripts/jquery.ekko-0.1.js" type="text/javascript" charset="utf-8"></script>

<script src="../lib/jquery.timer360.js" type="text/javascript" charset="utf-8"></script>
</head>

Expand All @@ -29,7 +29,7 @@ <h2>Description</h2>
thought, what the hell...why not try and emulate that. Thus was
born the timer360.
</p>

<p>
This timer is as customizable as you can get. It allows you to
specify everything form the size of the timer to the increments
Expand Down Expand Up @@ -114,7 +114,7 @@ <h2>Options</h2>
</p>

<h2>Examples</h2>

<p>
This is what you get by simply calling #timer360 without any
additional options. Click on the "circle" to access the timer
Expand All @@ -127,7 +127,7 @@ <h2>Examples</h2>
<script type="text/javascript" charset="utf-8">
$("#timer1").timer360();
</script>

<p>
You can choose to have the timer start automatically as well by
specifying just a single interval
Expand All @@ -139,7 +139,7 @@ <h2>Examples</h2>
<script type="text/javascript" charset="utf-8">
$("#timer2").timer360({ interval : 10, intervals : [] });
</script>

<p>
What's that? You'd rather have that in seconds than in minutes?
No problem!
Expand All @@ -151,7 +151,7 @@ <h2>Examples</h2>
<script type="text/javascript" charset="utf-8">
$("#timer3").timer360({ seconds : true });
</script>

<p>
How about we change up the color.
</p>
Expand All @@ -170,7 +170,7 @@ <h2>Examples</h2>
seconds : true
});
</script>

<p>
Let's change the size of our little timer and while we're at it
set some different time intervals.
Expand All @@ -194,7 +194,7 @@ <h2>Examples</h2>
onComplete : function () { alert("Pomodoro Complete!!!") }
});
</script>

<p>
You may also choose to have the timer loop instead of finishing
at the selected interval.
Expand Down Expand Up @@ -224,4 +224,3 @@ <h2>Examples</h2>
</div>
</body>
</html>

0 comments on commit 78c6477

Please sign in to comment.