Skip to content

Commit

Permalink
Fixed a bug concerning the box-sizing model
Browse files Browse the repository at this point in the history
  • Loading branch information
janpaepke committed Mar 2, 2014
1 parent 02f40f6 commit 8a337a3
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 32 deletions.
2 changes: 1 addition & 1 deletion ScrollMagic.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ScrollMagic",
"version": "1.0.0",
"version": "1.0.1",
"title": "ScrollMagic",
"author": {
"name": "Jan Paepke",
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ScrollMagic",
"description": "The jQuery plugin for magical scroll interactions.",
"version": "1.0.0",
"version": "1.0.1",
"homepage": "http://janpaepke.github.io/ScrollMagic/",
"author": {
"name": "Jan Paepke",
Expand Down
28 changes: 14 additions & 14 deletions docs/ScrollScene.html
Original file line number Diff line number Diff line change
Expand Up @@ -1120,7 +1120,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1279,7 +1279,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -1799,7 +1799,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -2131,7 +2131,7 @@ <h5>Parameters:</h5>

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


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

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


Expand Down Expand Up @@ -2651,7 +2651,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -3722,7 +3722,7 @@ <h5>Parameters:</h5>

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


Expand Down Expand Up @@ -4670,7 +4670,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -4939,7 +4939,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -5208,7 +5208,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -5477,7 +5477,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -5745,7 +5745,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -6014,7 +6014,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -6282,7 +6282,7 @@ <h6>Properties</h6>

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


Expand Down
14 changes: 7 additions & 7 deletions docs/classes.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -654,7 +654,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -923,7 +923,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -1192,7 +1192,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -1460,7 +1460,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -1729,7 +1729,7 @@ <h6>Properties</h6>

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


Expand Down Expand Up @@ -1997,7 +1997,7 @@ <h6>Properties</h6>

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


Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ <h2>


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



Expand Down
2 changes: 1 addition & 1 deletion docs/jquery.scrollmagic.debug.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ <h1 class="page-title">Source: jquery.scrollmagic.debug.js</h1>
by Jan Paepke 2014 (@janpaepke)
http://janpaepke.github.io/ScrollMagic

@version 1.0.0
@version 1.0.1
@license Dual licensed under MIT license and GPL.
@author Jan Paepke - e-mail@janpaepke.de
*/
Expand Down
7 changes: 5 additions & 2 deletions docs/jquery.scrollmagic.js.html
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ <h1 class="page-title">Source: jquery.scrollmagic.js</h1>
*/
/**
@overview ##Info
@version 1.0.0
@version 1.0.1
@license Dual licensed under MIT license and GPL.
@author Jan Paepke - e-mail@janpaepke.de

Expand Down Expand Up @@ -1417,7 +1417,10 @@ <h1 class="page-title">Source: jquery.scrollmagic.js</h1>
.css({
position: pinCSS.position == "absolute" ? "absolute" : "relative",
"margin-left": "auto",
"margin-right": "auto"
"margin-right": "auto",
"box-sizing": "content-box",
"-moz-box-sizing": "content-box",
"-webkit-box-sizing": "content-box"
});

if (pinCSS.position == "absolute" &amp;&amp; settings.pushFollowers) {
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.scrollmagic.debug.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
by Jan Paepke 2014 (@janpaepke)
http://janpaepke.github.io/ScrollMagic
@version 1.0.0
@version 1.0.1
@license Dual licensed under MIT license and GPL.
@author Jan Paepke - e-mail@janpaepke.de
*/
Expand Down
7 changes: 5 additions & 2 deletions js/jquery.scrollmagic.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Greensock License info at http://www.greensock.com/licensing/
*/
/**
@overview ##Info
@version 1.0.0
@version 1.0.1
@license Dual licensed under MIT license and GPL.
@author Jan Paepke - e-mail@janpaepke.de
Expand Down Expand Up @@ -1320,7 +1320,10 @@ Greensock License info at http://www.greensock.com/licensing/
.css({
position: pinCSS.position == "absolute" ? "absolute" : "relative",
"margin-left": "auto",
"margin-right": "auto"
"margin-right": "auto",
"box-sizing": "content-box",
"-moz-box-sizing": "content-box",
"-webkit-box-sizing": "content-box"
});

if (pinCSS.position == "absolute" && settings.pushFollowers) {
Expand Down
Loading

0 comments on commit 8a337a3

Please sign in to comment.