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 /default | |
| 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 'default')
| -rwxr-xr-x | default/index.html | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/default/index.html b/default/index.html index 746974fd..3d3cc7f0 100755 --- a/default/index.html +++ b/default/index.html @@ -56,21 +56,21 @@ <li class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown" href="#">Preview <b class="caret"></b></a> <ul class="dropdown-menu" id="swatch-menu"> - <li><a href="../default">Default</a></li> + <li><a href="../default/">Default</a></li> <li class="divider"></li> - <li><a href="../amelia">Amelia</a></li> - <li><a href="../cerulean">Cerulean</a></li> - <li><a href="../cosmo">Cosmo</a></li> - <li><a href="../cyborg">Cyborg</a></li> - <li><a href="../journal">Journal</a></li> - <li><a href="../readable">Readable</a></li> - <li><a href="../shamrock">Shamrock</a></li> - <li><a href="../simplex">Simplex</a></li> - <li><a href="../slate">Slate</a></li> - <li><a href="../spacelab">Spacelab</a></li> - <li><a href="../spruce">Spruce</a></li> - <li><a href="../superhero">Superhero</a></li> - <li><a href="../united">United</a></li> + <li><a href="../amelia/">Amelia</a></li> + <li><a href="../cerulean/">Cerulean</a></li> + <li><a href="../cosmo/">Cosmo</a></li> + <li><a href="../cyborg/">Cyborg</a></li> + <li><a href="../flatly/">Flatly</a></li> + <li><a href="../journal/">Journal</a></li> + <li><a href="../readable/">Readable</a></li> + <li><a href="../simplex/">Simplex</a></li> + <li><a href="../slate/">Slate</a></li> + <li><a href="../spacelab/">Spacelab</a></li> + <li><a href="../spruce/">Spruce</a></li> + <li><a href="../superhero/">Superhero</a></li> + <li><a href="../united/">United</a></li> </ul> </li> <li class="dropdown" id="preview-menu"> @@ -580,8 +580,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> @@ -712,7 +712,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="#" data-toggle="tab">Section 3</a></li> </ul> <div class="tabbable"> <div class="tab-content"> |