Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@JimBobSquarePants
JimBobSquarePants committed Jun 28, 2015
2 parents 9736bbb + 78b1be0 commit 45d8114
Show file tree
Hide file tree
Showing 87 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion build/responsive.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@
!$this.is("button") ? $this.attr({ "role": "button" }) : $this.attr({ "type": "button" });
if (!$this.find(".visuallyhidden").length) {
$("<span/>").addClass("visuallyhidden")
.html(this === self.$nextTrigger ? self.options.nextHint : self.options.previousHint)
.html(this === self.$nextTrigger.get(0) ? self.options.nextHint : self.options.previousHint)
.appendTo($this);
}
});
Expand Down
2 changes: 1 addition & 1 deletion build/responsive.min.js
View file

Large diffs are not rendered by default.

Binary file modified dist/responsive.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/js/responsive.carousel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
!$this.is("button") ? $this.attr({ "role": "button" }) : $this.attr({ "type": "button" });
if (!$this.find(".visuallyhidden").length) {
$("<span/>").addClass("visuallyhidden")
.html(this === self.$nextTrigger ? self.options.nextHint : self.options.previousHint)
.html(this === self.$nextTrigger.get(0) ? self.options.nextHint : self.options.previousHint)
.appendTo($this);
}
});
Expand Down
2 changes: 1 addition & 1 deletion tests/css/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ <h4>Plugins</h4>
</div>
</article>

<script src="../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/alerts/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h4>Alert block</h4>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/autosize/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h2>Standard Example</h2>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/base/helpers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ <h3>Typography Helpers</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/base/typography.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ <h3>Inline Typographical Elements</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/buttons/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ <h3>Input : Reset</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/carousel/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h4>Third Thumbnail label</h4>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/carousel/lazy-load.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ <h4>Third Thumbnail label</h4>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/code/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ <h2>Fixed Height</h2>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/conditional/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h3>Using existing content as a fallback.</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/dismiss/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1>Dismiss</h1>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/dropdown/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ <h3>Basic Horizontal</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/forms/standard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ <h2>Input groups</h2>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/block.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ <h3>No Gutter - XXS</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/equal-height.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ <h2>No Gutter Push</h2>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/fixed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h3>Fixed Container</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/nested-columns.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h3>No Gutter</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/no-gutter-l.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>No Gutter - L</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/no-gutter-m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>No Gutter - M</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/no-gutter-s.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>No Gutter - S</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/no-gutter-xs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>No Gutter - XS</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/no-gutter-xxs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>No Gutter - XXS</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/offset-columns.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ <h3>Offset Columns</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/resize.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ <h3>Resized Columns</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/spaced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ <h2>No Gutter</h2>
<div class="col-s-3 push-s-3"><span>3</span></div>
</div>
</article>
<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/standard-l.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>Standard - L</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/standard-m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>Standard - M</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/standard-s.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>Standard - S</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/standard-xs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ <h3>Standard - XS</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/standard-xxs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ <h3>Resetting</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/grid/swapped.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ <h2>No Gutter</h2>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/lists/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ <h3>Horizontal Layout</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/media/iframe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ <h3>Getty</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/media/image.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h3>Constrained Images</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/media/video.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h3>Video</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/misc/swipe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h3>Extra copy to test native scroll</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>

<script>
Expand Down
2 changes: 1 addition & 1 deletion tests/css/ltr/modal/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ <h3>Grouped</h3>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
<script>
var $target = $(":attrStart(data-modal)"),
Expand Down
2 changes: 1 addition & 1 deletion tests/css/ltr/navigation/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ <h1>Navigation Tests</h1>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/tables/basic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ <h3>Table with overflow wrapper</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/tables/tablelist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ <h3>TableList Striped Bordered</h3>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/ltr/tabs/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ <h1>Tabs</h1>
</section>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion tests/css/rtl/alerts/all.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h4>Alert block</h4>
</div>
</article>

<script src="../../../../build/vendor/jquery-2.1.3.min.js"></script>
<script src="../../../../build/vendor/jquery-2.1.4.min.js"></script>
<script src="../../../../build/responsive.js"></script>
</body>
</html>
Loading

0 comments on commit 45d8114

Please sign in to comment.