diff options
| author | Mark Otto <[email protected]> | 2013-08-18 15:30:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 15:30:02 -0700 |
| commit | 5746979aad4b86dae951ef2120aa4dd1314e7ade (patch) | |
| tree | f712efcadd1637968fdbacd8b33f92c6efed7b7e /components.html | |
| parent | 9b61b7a72219888ff662186dbe552150497715f9 (diff) | |
| parent | 43271f1ab60e3e2109c56a824ab1f88ff24b51b8 (diff) | |
| download | bootstrap-5746979aad4b86dae951ef2120aa4dd1314e7ade.tar.xz bootstrap-5746979aad4b86dae951ef2120aa4dd1314e7ade.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components.html b/components.html index 6b3ca7053..f8b12daf8 100644 --- a/components.html +++ b/components.html @@ -256,17 +256,17 @@ base_url: "../" <div class="bs-example"> <div class="btn-toolbar"> <div class="btn-group"> - <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></a> - <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></a> - <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></a> - <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></a> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-left"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-center"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-right"></span></button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-align-justify"></span></button> </div> </div> <div class="btn-toolbar"> - <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</a> - <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</a> - <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</a> - <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</a> + <button type="button" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-star"></span> Star</button> + <button type="button" class="btn btn-default"><span class="glyphicon glyphicon-star"></span> Star</button> + <button type="button" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-star"></span> Star</button> + <button type="button" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-star"></span> Star</button> </div> </div> {% highlight html %} |