diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:18:34 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:18:34 -0800 |
| commit | 0bfbe5058d61ae93d82b09f1dff7eb30dc22426e (patch) | |
| tree | 6ccf3dd9c36ff4b1f6cde5edbce21cdf0de78497 /examples/container-app.html | |
| parent | 43cbc9440425b7c97c943690eefd14520de708e1 (diff) | |
| parent | 4bd1ba4e0dc44d1d16161306576548f378ab1f8a (diff) | |
| download | bootstrap-0bfbe5058d61ae93d82b09f1dff7eb30dc22426e.tar.xz bootstrap-0bfbe5058d61ae93d82b09f1dff7eb30dc22426e.zip | |
Merge branch '2.0-wip'
Conflicts:
.gitignore
LICENSE
Makefile
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/assets/js/google-code-prettify/prettify.css
docs/index.html
docs/javascript.html
examples/container-app.html
examples/fluid.html
examples/hero.html
js/bootstrap-alerts.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tabs.js
js/bootstrap-twipsy.js
js/tests/index.html
js/tests/unit/bootstrap-modal.js
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-tabs.js
lib/forms.less
lib/mixins.less
lib/patterns.less
lib/scaffolding.less
lib/tables.less
Diffstat (limited to 'examples/container-app.html')
| -rw-r--r-- | examples/container-app.html | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/examples/container-app.html b/examples/container-app.html index 318a0e7e1..b25ed55bf 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap.css" rel="stylesheet"> + <link href="../docs/assets/css/bootstrap.css" rel="stylesheet"> <style type="text/css"> /* Override some defaults */ html, body { @@ -25,14 +25,14 @@ text-align: center; /* center align it with the container */ } .container { - width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */ + width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 10 columns and not 12. */ } /* The white background content wrapper */ - .container > .content { + .body-content { background-color: #fff; padding: 20px; - margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */ + margin: 0 -20px 18px; /* negative indent the amount of the padding to maintain the grid system */ -webkit-border-radius: 0 0 6px 6px; -moz-border-radius: 0 0 6px 6px; border-radius: 0 0 6px 6px; @@ -49,21 +49,16 @@ } /* Styles you shouldn't keep as they are for displaying this base example only */ - .content .span10, - .content .span4 { + .body-content .span7, + .body-content .span3 { min-height: 500px; } /* Give a quick and non-cross-browser friendly divider */ - .content .span4 { + .body-content .span3 { margin-left: 0; padding-left: 19px; border-left: 1px solid #eee; } - - .topbar .btn { - border: 0; - } - </style> <!-- Le fav and touch icons --> @@ -75,8 +70,8 @@ <body> - <div class="topbar"> - <div class="fill"> + <div class="navbar navbar-fixed-top"> + <div class="navbar-inner"> <div class="container"> <a class="brand" href="#">Project name</a> <ul class="nav"> @@ -84,7 +79,7 @@ <li><a href="#about">About</a></li> <li><a href="#contact">Contact</a></li> </ul> - <form action="" class="pull-right"> + <form action="" class="form-search navbar-form pull-right"> <input class="input-small" type="text" placeholder="Username"> <input class="input-small" type="password" placeholder="Password"> <button class="btn" type="submit">Sign in</button> @@ -95,15 +90,15 @@ <div class="container"> - <div class="content"> + <div class="body-content"> <div class="page-header"> <h1>Page name <small>Supporting text or tagline</small></h1> </div> <div class="row"> - <div class="span10"> + <div class="span7"> <h2>Main content</h2> </div> - <div class="span4"> + <div class="span3"> <h3>Secondary content</h3> </div> </div> |