diff options
| author | Jacob Thornton <[email protected]> | 2012-04-24 02:21:45 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-24 02:21:45 -0700 |
| commit | e659dc7e1be2e09cec34703dce8c737496e3504e (patch) | |
| tree | be3caed12a3de1218e1fd548f2564302e6c8193a /docs/examples | |
| parent | 6506ede6323ee60d4d7f8171937d92141a64e09e (diff) | |
| parent | 839ef3a030b355d0f0c35d6c9e42ecba8b072036 (diff) | |
| download | bootstrap-e659dc7e1be2e09cec34703dce8c737496e3504e.tar.xz bootstrap-e659dc7e1be2e09cec34703dce8c737496e3504e.zip | |
Merge branch '2.0.3-wip'
Conflicts:
Makefile
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/fluid.html | 13 | ||||
| -rw-r--r-- | docs/examples/hero.html | 1 | ||||
| -rw-r--r-- | docs/examples/starter-template.html | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index e3426c7a9..f235d7614 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -27,6 +27,7 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="../assets/ico/favicon.ico"> + <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png"> @@ -43,13 +44,23 @@ <span class="icon-bar"></span> </a> <a class="brand" href="#">Project name</a> + <div class="btn-group pull-right"> + <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> + <i class="icon-user"></i> Username + <span class="caret"></span> + </a> + <ul class="dropdown-menu"> + <li><a href="#">Profile</a></li> + <li class="divider"></li> + <li><a href="#">Sign Out</a></li> + </ul> + </div> <div class="nav-collapse"> <ul class="nav"> <li class="active"><a href="#">Home</a></li> <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> </ul> - <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p> </div><!--/.nav-collapse --> </div> </div> diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 2267a5f3c..7fb3f67b7 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -24,6 +24,7 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="../assets/ico/favicon.ico"> + <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png"> diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index af27165f9..538ff08be 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -23,6 +23,7 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="../assets/ico/favicon.ico"> + <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png"> |