aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-04-01 13:14:39 -0700
committerMark Otto <[email protected]>2013-04-01 13:14:39 -0700
commit292734d7f34b59152c66ade7490d18036dee7bb7 (patch)
treeaaaa1894fcccc356a7f9dc2588e801939458dfa4 /docs
parenteac987c0d2bdb93ea4c916d52f38655bcc5e1255 (diff)
downloadbootstrap-292734d7f34b59152c66ade7490d18036dee7bb7.tar.xz
bootstrap-292734d7f34b59152c66ade7490d18036dee7bb7.zip
Docs examples update
* Remove unused fluid image * Add image, link, and description for new grid example * Update sign in example image
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/docs.css10
-rw-r--r--docs/assets/img/examples/bootstrap-example-fluid.pngbin209039 -> 0 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-grid.pngbin0 -> 44966 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-signin.pngbin22037 -> 16397 bytes
-rw-r--r--docs/docs.html12
5 files changed, 16 insertions, 6 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index fc653277e..fb4ed9ea3 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -21,6 +21,10 @@ body {
.bs-docs-container {
max-width: 860px;
}
+.bs-docs-container .row {
+ margin-left: -15px;
+ margin-right: -15px;
+}
/* */
.bs-docs-footer {
@@ -215,15 +219,15 @@ section > ul li {
left: 0;
bottom: 0;
width: 240px;
- background-color: #f5f5f5;
overflow-y: scroll;
text-shadow: 0 1px 0 #fff;
- box-shadow: inset -1px 0 0 #e5e5e5;
+ background-color: #f5f5f5;
+ border-right: 1px solid #e5e5e5;
}
/* Nav: first level */
.bs-docs-sidebar > .nav {
- margin: 0 0 25px;
+ margin: 0 -1px 25px 0;
}
.bs-docs-sidebar .nav > li > a {
display: block;
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.png b/docs/assets/img/examples/bootstrap-example-fluid.png
deleted file mode 100644
index 5f49a332f..000000000
--- a/docs/assets/img/examples/bootstrap-example-fluid.png
+++ /dev/null
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-grid.png b/docs/assets/img/examples/bootstrap-example-grid.png
new file mode 100644
index 000000000..cdc1c0726
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-grid.png
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-signin.png b/docs/assets/img/examples/bootstrap-example-signin.png
index b649a985d..c55bbd59d 100644
--- a/docs/assets/img/examples/bootstrap-example-signin.png
+++ b/docs/assets/img/examples/bootstrap-example-signin.png
Binary files differ
diff --git a/docs/docs.html b/docs/docs.html
index 30ca03415..73d045104 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -112,14 +112,21 @@ title: Bootstrap Documentation
<img src="/assets/img/examples/bootstrap-example-starter.png" alt="">
</a>
<h4>Starter template</h4>
- <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
+ <p>A barebones HTML page with Bootstrap's CSS and JavaScript included.</p>
+ </div>
+ <div class="col-span-4">
+ <a class="thumbnail" href="/examples/grid/" target="_blank">
+ <img src="/assets/img/examples/bootstrap-example-grid.png" alt="">
+ </a>
+ <h4>Basic grid layouts</h4>
+ <p>Simple grid layouts to familiarize you with using the Bootstrap grid system.</p>
</div>
<div class="col-span-4">
<a class="thumbnail" href="/examples/jumbotron/" target="_blank">
<img src="/assets/img/examples/bootstrap-example-marketing.png" alt="">
</a>
<h4>Basic marketing site</h4>
- <p>Featuring a hero unit for a primary message and three supporting elements.</p>
+ <p>Features a jumbotron for primary message and three supporting elements.</p>
</div>
<div class="col-span-4">
<a class="thumbnail" href="/examples/jumbotron-narrow/" target="_blank">
@@ -259,7 +266,6 @@ title: Bootstrap Documentation
<h3>Removing potential bloat</h3>
<p>Not all sites and applications need to make use of everything Bootstrap has to offer, especially in production environments where bandwidth literally becomes a financial issue. We encourage folks to remove whatever is unused with our <a href="./customizer/">Customizer</a>.</p>
- <p>**img**</p>
<p>Using the Customizer, simply uncheck any component, feature, or asset you don't need. Hit download and swap out the default Bootstrap files with these newly customized ones. You'll get vanilla Bootstrap, but without the features *you* deem unnecessary. All custom builds include compiled and minified versions, so use whichever works for you.</p>
</div>