Merge remote-tracking branch 'origin/master'

This commit is contained in:
FezVrasta 2014-10-03 09:47:01 +02:00
commit 99face76a0

View File

@ -2063,7 +2063,7 @@
<div class="bs-component">
<button type="button" class="btn btn-default" data-content="This is a snackbar! Lorem lipsum dolor sit amet..." data-toggle="snackbar" data-timeout="0">Show snackbar</button>
<button type="button" class="btn btn-default" data-style="toast" data-content="This is a toast! Lorem lipsum dolor sit amet..." data-toggle="snackbar" data-timeout="0">Show snackbar</button>
<button type="button" class="btn btn-default" data-style="toast" data-content="This is a toast! Lorem lipsum dolor sit amet..." data-toggle="snackbar" data-timeout="0">Show toast</button>
</div>
</div>
</div>