diff options
| author | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
| commit | 6df6723c156ab565c7b6341fc58582fceadd7649 (patch) | |
| tree | 4cc372a56ece6b8250b1bcadf433f6e5ea1853ca /components.html | |
| parent | b593df183087d88940d7af3e59b401685ada3dfe (diff) | |
| parent | 3887f540b978d593f433bfef15888bc2d103de72 (diff) | |
| download | bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.tar.xz bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.zip | |
Merge branch 'master' into docs_derp
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components.html b/components.html index 66f80e119..25ed9ea11 100644 --- a/components.html +++ b/components.html @@ -2247,12 +2247,12 @@ base_url: "../" <a class="navbar-brand" href="#">Brand</a> </div> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-5"> - <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> + <p class="navbar-text navbar-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> </div> </nav> </div> {% highlight html %} -<p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> +<p class="navbar-text navbar-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p> {% endhighlight %} |