Skip to content

Commit 8a337a3

Browse files
janpaepkejanpaepke
committed
Fixed a bug concerning the box-sizing model
1 parent 02f40f6 commit 8a337a3

10 files changed

+38
-32
lines changed

‎ScrollMagic.jquery.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ScrollMagic",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"title": "ScrollMagic",
55
"author": {
66
"name": "Jan Paepke",

‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "ScrollMagic",
33
"description": "The jQuery plugin for magical scroll interactions.",
4-
"version": "1.0.0",
4+
"version": "1.0.1",
55
"homepage": "http://janpaepke.github.io/ScrollMagic/",
66
"author": {
77
"name": "Jan Paepke",

‎docs/ScrollScene.html

+14-14
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ <h5>Parameters:</h5>
11201120

11211121
<dt class="tag-source">Source:</dt>
11221122
<dd class="tag-source"><ul class="dummy"><li>
1123-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1418">line 1418</a>
1123+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1421">line 1421</a>
11241124
</li></ul></dd>
11251125

11261126

@@ -1279,7 +1279,7 @@ <h5>Parameters:</h5>
12791279

12801280
<dt class="tag-source">Source:</dt>
12811281
<dd class="tag-source"><ul class="dummy"><li>
1282-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1472">line 1472</a>
1282+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1475">line 1475</a>
12831283
</li></ul></dd>
12841284

12851285

@@ -1799,7 +1799,7 @@ <h5>Parameters:</h5>
17991799

18001800
<dt class="tag-source">Source:</dt>
18011801
<dd class="tag-source"><ul class="dummy"><li>
1802-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1662">line 1662</a>
1802+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1665">line 1665</a>
18031803
</li></ul></dd>
18041804

18051805

@@ -2131,7 +2131,7 @@ <h5>Parameters:</h5>
21312131

21322132
<dt class="tag-source">Source:</dt>
21332133
<dd class="tag-source"><ul class="dummy"><li>
2134-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1633">line 1633</a>
2134+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1636">line 1636</a>
21352135
</li></ul></dd>
21362136

21372137

@@ -2492,7 +2492,7 @@ <h4 class="name" id="remove"><span class="type-signature"></span>remove<span cla
24922492

24932493
<dt class="tag-source">Source:</dt>
24942494
<dd class="tag-source"><ul class="dummy"><li>
2495-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1448">line 1448</a>
2495+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1451">line 1451</a>
24962496
</li></ul></dd>
24972497

24982498

@@ -2651,7 +2651,7 @@ <h5>Parameters:</h5>
26512651

26522652
<dt class="tag-source">Source:</dt>
26532653
<dd class="tag-source"><ul class="dummy"><li>
2654-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1386">line 1386</a>
2654+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1389">line 1389</a>
26552655
</li></ul></dd>
26562656

26572657

@@ -3722,7 +3722,7 @@ <h5>Parameters:</h5>
37223722

37233723
<dt class="tag-source">Source:</dt>
37243724
<dd class="tag-source"><ul class="dummy"><li>
3725-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1681">line 1681</a>
3725+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1684">line 1684</a>
37263726
</li></ul></dd>
37273727

37283728

@@ -4670,7 +4670,7 @@ <h6>Properties</h6>
46704670

46714671
<dt class="tag-source">Source:</dt>
46724672
<dd class="tag-source"><ul class="dummy"><li>
4673-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1599">line 1599</a>
4673+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1602">line 1602</a>
46744674
</li></ul></dd>
46754675

46764676

@@ -4939,7 +4939,7 @@ <h6>Properties</h6>
49394939

49404940
<dt class="tag-source">Source:</dt>
49414941
<dd class="tag-source"><ul class="dummy"><li>
4942-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1506">line 1506</a>
4942+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1509">line 1509</a>
49434943
</li></ul></dd>
49444944

49454945

@@ -5208,7 +5208,7 @@ <h6>Properties</h6>
52085208

52095209
<dt class="tag-source">Source:</dt>
52105210
<dd class="tag-source"><ul class="dummy"><li>
5211-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1525">line 1525</a>
5211+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1528">line 1528</a>
52125212
</li></ul></dd>
52135213

52145214

@@ -5477,7 +5477,7 @@ <h6>Properties</h6>
54775477

54785478
<dt class="tag-source">Source:</dt>
54795479
<dd class="tag-source"><ul class="dummy"><li>
5480-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1544">line 1544</a>
5480+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1547">line 1547</a>
54815481
</li></ul></dd>
54825482

54835483

@@ -5745,7 +5745,7 @@ <h6>Properties</h6>
57455745

57465746
<dt class="tag-source">Source:</dt>
57475747
<dd class="tag-source"><ul class="dummy"><li>
5748-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1581">line 1581</a>
5748+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1584">line 1584</a>
57495749
</li></ul></dd>
57505750

57515751

@@ -6014,7 +6014,7 @@ <h6>Properties</h6>
60146014

60156015
<dt class="tag-source">Source:</dt>
60166016
<dd class="tag-source"><ul class="dummy"><li>
6017-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1487">line 1487</a>
6017+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1490">line 1490</a>
60186018
</li></ul></dd>
60196019

60206020

@@ -6282,7 +6282,7 @@ <h6>Properties</h6>
62826282

62836283
<dt class="tag-source">Source:</dt>
62846284
<dd class="tag-source"><ul class="dummy"><li>
6285-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1563">line 1563</a>
6285+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1566">line 1566</a>
62866286
</li></ul></dd>
62876287

62886288

‎docs/classes.list.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ <h6>Properties</h6>
385385

386386
<dt class="tag-source">Source:</dt>
387387
<dd class="tag-source"><ul class="dummy"><li>
388-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1599">line 1599</a>
388+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1602">line 1602</a>
389389
</li></ul></dd>
390390

391391

@@ -654,7 +654,7 @@ <h6>Properties</h6>
654654

655655
<dt class="tag-source">Source:</dt>
656656
<dd class="tag-source"><ul class="dummy"><li>
657-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1506">line 1506</a>
657+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1509">line 1509</a>
658658
</li></ul></dd>
659659

660660

@@ -923,7 +923,7 @@ <h6>Properties</h6>
923923

924924
<dt class="tag-source">Source:</dt>
925925
<dd class="tag-source"><ul class="dummy"><li>
926-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1525">line 1525</a>
926+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1528">line 1528</a>
927927
</li></ul></dd>
928928

929929

@@ -1192,7 +1192,7 @@ <h6>Properties</h6>
11921192

11931193
<dt class="tag-source">Source:</dt>
11941194
<dd class="tag-source"><ul class="dummy"><li>
1195-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1544">line 1544</a>
1195+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1547">line 1547</a>
11961196
</li></ul></dd>
11971197

11981198

@@ -1460,7 +1460,7 @@ <h6>Properties</h6>
14601460

14611461
<dt class="tag-source">Source:</dt>
14621462
<dd class="tag-source"><ul class="dummy"><li>
1463-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1581">line 1581</a>
1463+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1584">line 1584</a>
14641464
</li></ul></dd>
14651465

14661466

@@ -1729,7 +1729,7 @@ <h6>Properties</h6>
17291729

17301730
<dt class="tag-source">Source:</dt>
17311731
<dd class="tag-source"><ul class="dummy"><li>
1732-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1487">line 1487</a>
1732+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1490">line 1490</a>
17331733
</li></ul></dd>
17341734

17351735

@@ -1997,7 +1997,7 @@ <h6>Properties</h6>
19971997

19981998
<dt class="tag-source">Source:</dt>
19991999
<dd class="tag-source"><ul class="dummy"><li>
2000-
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1563">line 1563</a>
2000+
<a href="jquery.scrollmagic.js.html">jquery.scrollmagic.js</a>, <a href="jquery.scrollmagic.js.html#sunlight-1-line-1566">line 1566</a>
20012001
</li></ul></dd>
20022002

20032003

‎docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ <h2>
214214

215215

216216
<dt class="tag-version">Version:</dt>
217-
<dd class="tag-version"><ul class="dummy"><li>1.0.0</li></ul></dd>
217+
<dd class="tag-version"><ul class="dummy"><li>1.0.1</li></ul></dd>
218218

219219

220220

‎docs/jquery.scrollmagic.debug.js.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h1 class="page-title">Source: jquery.scrollmagic.debug.js</h1>
101101
by Jan Paepke 2014 (@janpaepke)
102102
http://janpaepke.github.io/ScrollMagic
103103

104-
@version 1.0.0
104+
@version 1.0.1
105105
@license Dual licensed under MIT license and GPL.
106106
@author Jan Paepke - [email protected]
107107
*/

‎docs/jquery.scrollmagic.js.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ <h1 class="page-title">Source: jquery.scrollmagic.js</h1>
109109
*/
110110
/**
111111
@overview ##Info
112-
@version 1.0.0
112+
@version 1.0.1
113113
@license Dual licensed under MIT license and GPL.
114114
@author Jan Paepke - [email protected]
115115

@@ -1417,7 +1417,10 @@ <h1 class="page-title">Source: jquery.scrollmagic.js</h1>
14171417
.css({
14181418
position: pinCSS.position == "absolute" ? "absolute" : "relative",
14191419
"margin-left": "auto",
1420-
"margin-right": "auto"
1420+
"margin-right": "auto",
1421+
"box-sizing": "content-box",
1422+
"-moz-box-sizing": "content-box",
1423+
"-webkit-box-sizing": "content-box"
14211424
});
14221425

14231426
if (pinCSS.position == "absolute" &amp;&amp; settings.pushFollowers) {

‎js/jquery.scrollmagic.debug.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
by Jan Paepke 2014 (@janpaepke)
55
http://janpaepke.github.io/ScrollMagic
66
7-
@version 1.0.0
7+
@version 1.0.1
88
@license Dual licensed under MIT license and GPL.
99
@author Jan Paepke - [email protected]
1010
*/

‎js/jquery.scrollmagic.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Greensock License info at http://www.greensock.com/licensing/
1212
*/
1313
/**
1414
@overview ##Info
15-
@version 1.0.0
15+
@version 1.0.1
1616
@license Dual licensed under MIT license and GPL.
1717
@author Jan Paepke - [email protected]
1818
@@ -1320,7 +1320,10 @@ Greensock License info at http://www.greensock.com/licensing/
13201320
.css({
13211321
position: pinCSS.position == "absolute" ? "absolute" : "relative",
13221322
"margin-left": "auto",
1323-
"margin-right": "auto"
1323+
"margin-right": "auto",
1324+
"box-sizing": "content-box",
1325+
"-moz-box-sizing": "content-box",
1326+
"-webkit-box-sizing": "content-box"
13241327
});
13251328

13261329
if (pinCSS.position == "absolute" && settings.pushFollowers) {

0 commit comments

Comments
 (0)