diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-05-16 09:59:08 +0200 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-05-16 09:59:08 +0200 |
| commit | 2ec92281b988c129d4eb2ef5efffef57c011f9cc (patch) | |
| tree | 91dfccb9c590480b37f254c99c5cdea366fea283 /swatchmaker/test/test.html | |
| parent | 266c8ea28da92dc14fe6cb4207c149f3153141a5 (diff) | |
| parent | 5a8fb4bf1b64d06e5ca148eb4619a1c692d2dded (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
amelia/index.html
cerulean/index.html
cosmo/index.html
cyborg/index.html
default/index.html
index.html
journal/index.html
readable/index.html
simplex/index.html
slate/index.html
spacelab/index.html
spruce/index.html
superhero/index.html
united/index.html
Diffstat (limited to 'swatchmaker/test/test.html')
| -rwxr-xr-x | swatchmaker/test/test.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/swatchmaker/test/test.html b/swatchmaker/test/test.html index 25a3f05d..eaeee29e 100755 --- a/swatchmaker/test/test.html +++ b/swatchmaker/test/test.html @@ -564,8 +564,8 @@ <span class="help-inline">Woohoo!</span> </div> </div> - <div class="control-group success"> - <label class="control-label" for="selectError">Select with success</label> + <div class="control-group info"> + <label class="control-label" for="selectError">Select with info</label> <div class="controls"> <select id="selectError"> <option>1</option> @@ -696,7 +696,7 @@ <ul class="nav nav-tabs"> <li class="active"><a href="#A" data-toggle="tab">Section 1</a></li> <li><a href="#B" data-toggle="tab">Section 2</a></li> - <li><a href="#C" data-toggle="tab">Section 3</a></li> + <li class="disabled"><a href="#C" data-toggle="tab">Section 3</a></li> </ul> <div class="tabbable"> <div class="tab-content"> @@ -873,6 +873,7 @@ <script src="../bootstrap/docs/assets/js/bootstrap-carousel.js"></script> <script src="../bootstrap/docs/assets/js/bootstrap-typeahead.js"></script> <script src="../bootstrap/docs/assets/js/bootstrap-affix.js"></script> + <script src="jquery.smooth-scroll.min.js"></script> <script src="bootswatch.js"></script> |