Skip to content

Commit 8746d01

Browse files
janpaepkejanpaepke
committed
fixed wrong URL for favicon in examples
1 parent d0ba8b0 commit 8746d01

31 files changed

+62
-56
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
CHANGELOG
22
=========
33

4+
## 2.0.6 (unreleased)
5+
6+
#### bugfixes:
7+
- errors occurred, when removing a triggerElement [see here](https://github.com/janpaepke/ScrollMagic/issues/307)
8+
9+
410
## 2.0.5 (2015-04-29)
511

612
#### bugfixes:

‎examples/advanced/advanced_tweening.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -198,4 +198,4 @@ <h2>ScrollMagic can handle everything TweenMax throws at it.</h2>
198198
</div>
199199
<script type="text/javascript" src="../../js/tracking.js"></script>
200200
</body>
201-
</html>
201+
</html>

‎examples/advanced/anchor_link_scrolling.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -100,4 +100,4 @@ <h2>Mastering in-page navigation.</h2>
100100
</div>
101101
<script type="text/javascript" src="../../js/tracking.js"></script>
102102
</body>
103-
</html>
103+
</html>

‎examples/advanced/animate_css.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -111,4 +111,4 @@ <h2>Look, Ma! No animation framework needed!</h2>
111111
</div>
112112
<script type="text/javascript" src="../../js/tracking.js"></script>
113113
</body>
114-
</html>
114+
</html>

‎examples/advanced/custom_containers.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -102,4 +102,4 @@ <h2>One page can have multiple scroll containers.</h2>
102102
</div>
103103
<script type="text/javascript" src="../../js/tracking.js"></script>
104104
</body>
105-
</html>
105+
</html>

‎examples/advanced/infinite_scrolling.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -89,4 +89,4 @@ <h2>Dynamic content pages become scroll magical.</h2>
8989
</div>
9090
<script type="text/javascript" src="../../js/tracking.js"></script>
9191
</body>
92-
</html>
92+
</html>

‎examples/advanced/mobile_basic.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -81,4 +81,4 @@ <h2>Try this page on your mobile device!</h2>
8181
</div>
8282
<script type="text/javascript" src="../../js/tracking.js"></script>
8383
</body>
84-
</html>
84+
</html>

‎examples/advanced/parallax_scrolling.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -109,4 +109,4 @@ <h1 class="layer3">
109109
</div>
110110
<script type="text/javascript" src="../../js/tracking.js"></script>
111111
</body>
112-
</html>
112+
</html>

‎examples/advanced/parallax_sections.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -107,4 +107,4 @@ <h2>The most common parallax application</h2>
107107
</div>
108108
<script type="text/javascript" src="../../js/tracking.js"></script>
109109
</body>
110-
</html>
110+
</html>

‎examples/advanced/section_slides_manual.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -112,4 +112,4 @@ <h2>Slide in your content with custom movements</h2>
112112
</div>
113113
<script type="text/javascript" src="../../js/tracking.js"></script>
114114
</body>
115-
</html>
115+
</html>

‎examples/advanced/section_wipes_manual.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -95,4 +95,4 @@ <h2>Wiping in content using custom movement</h2>
9595
</div>
9696
<script type="text/javascript" src="../../js/tracking.js"></script>
9797
</body>
98-
</html>
98+
</html>

‎examples/advanced/svg_drawing.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -97,4 +97,4 @@ <h2>Dynamic SVGs? No Problem!</h2>
9797
</div>
9898
<script type="text/javascript" src="../../js/tracking.js"></script>
9999
</body>
100-
</html>
100+
</html>

‎examples/basic/class_toggles.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616
<style type="text/css">
1717
form.move p {
1818
padding: 4px;
@@ -115,4 +115,4 @@ <h2>Easily add and remove CSS classes</h2>
115115
</div>
116116
<script type="text/javascript" src="../../js/tracking.js"></script>
117117
</body>
118-
</html>
118+
</html>

‎examples/basic/custom_actions.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -83,4 +83,4 @@ <h2>All the power to you.</h2>
8383
</div>
8484
<script type="text/javascript" src="../../js/tracking.js"></script>
8585
</body>
86-
</html>
86+
</html>

‎examples/basic/debugging.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -91,4 +91,4 @@ <h2>ScrollMagic makes debugging easy.</h2>
9191
</div>
9292
<script type="text/javascript" src="../../js/tracking.js"></script>
9393
</body>
94-
</html>
94+
</html>

‎examples/basic/going_horizontal.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -67,4 +67,4 @@ <h2>ScrollMagic can handle horizontal scrolls just as well.</h2>
6767
</div>
6868
<script type="text/javascript" src="../../js/tracking.js"></script>
6969
</body>
70-
</html>
70+
</html>

‎examples/basic/responsive_duration.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -68,4 +68,4 @@ <h2>Scene duration depending on viewport size.</h2>
6868
</div>
6969
<script type="text/javascript" src="../../js/tracking.js"></script>
7070
</body>
71-
</html>
71+
</html>

‎examples/basic/scene_manipulation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>

‎examples/basic/section_wipes_natural.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -87,4 +87,4 @@ <h2>Wiping in content with the natural scroll movement</h2>
8787
</div>
8888
<script type="text/javascript" src="../../js/tracking.js"></script>
8989
</body>
90-
</html>
90+
</html>

‎examples/basic/simple_pinning.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -91,4 +91,4 @@ <h2>Two examples of basic pinning.</h2>
9191
</div>
9292
<script type="text/javascript" src="../../js/tracking.js"></script>
9393
</body>
94-
</html>
94+
</html>

‎examples/basic/simple_tweening.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -90,4 +90,4 @@ <h2>Two examples of basic animation.</h2>
9090
</div>
9191
<script type="text/javascript" src="../../js/tracking.js"></script>
9292
</body>
93-
</html>
93+
</html>

‎examples/basic/simple_velocity.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -68,4 +68,4 @@ <h2>ScrollMagic can trigger Velocity animations.</h2>
6868
</div>
6969
<script type="text/javascript" src="../../js/tracking.js"></script>
7070
</body>
71-
</html>
71+
</html>

‎examples/expert/bezier_path_animation.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -109,4 +109,4 @@ <h2>Animate along a curve – plane and simple</h2>
109109
</div>
110110
<script type="text/javascript" src="../../js/tracking.js"></script>
111111
</body>
112-
</html>
112+
</html>

‎examples/expert/callback_duration.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -88,4 +88,4 @@ <h2>Use a function returning a scene's duration.</h2>
8888
</div>
8989
<script type="text/javascript" src="../../js/tracking.js"></script>
9090
</body>
91-
</html>
91+
</html>

‎examples/expert/cascading_pins.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="../../css/normalize.css" type="text/css">
1313
<link rel="stylesheet" href="../../css/style.css" type="text/css">
1414
<link rel="stylesheet" href="../../css/examples.css" type="text/css">
15-
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
15+
<link rel="shortcut icon" href="../../img/favicon.ico" type="image/x-icon">
1616

1717
<script type="text/javascript" src="../../js/lib/jquery.min.js"></script>
1818
<script type="text/javascript" src="../../js/lib/highlight.pack.js"></script>
@@ -94,4 +94,4 @@ <h2>On-Again, Off-Again.</h2>
9494
</div>
9595
<script type="text/javascript" src="../../js/tracking.js"></script>
9696
</body>
97-
</html>
97+
</html>

0 commit comments

Comments
 (0)