aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-24 20:45:38 -0800
committerMark Otto <[email protected]>2012-01-24 20:45:38 -0800
commita5c1d1f1828c333e373cdc5da5da2f6d946ad45e (patch)
tree2a430d99d4f756339e470a781f01ce42720a8653 /docs
parentaa59f123c074c01f84e8e27c1ac5431f819d4816 (diff)
downloadbootstrap-a5c1d1f1828c333e373cdc5da5da2f6d946ad45e.tar.xz
bootstrap-a5c1d1f1828c333e373cdc5da5da2f6d946ad45e.zip
adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/img/bootstrap-mdo-sfmoma-01.jpgbin0 -> 59871 bytes
-rw-r--r--docs/assets/img/bootstrap-mdo-sfmoma-02.jpgbin0 -> 93456 bytes
-rw-r--r--docs/assets/img/bootstrap-mdo-sfmoma-03.jpgbin0 -> 125720 bytes
-rw-r--r--docs/base-css.html2
-rw-r--r--docs/javascript.html6
-rw-r--r--docs/templates/pages/javascript.mustache6
6 files changed, 7 insertions, 7 deletions
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
new file mode 100644
index 000000000..a5c7bb900
--- /dev/null
+++ b/docs/assets/img/bootstrap-mdo-sfmoma-01.jpg
Binary files differ
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
new file mode 100644
index 000000000..2f795e18f
--- /dev/null
+++ b/docs/assets/img/bootstrap-mdo-sfmoma-02.jpg
Binary files differ
diff --git a/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
new file mode 100644
index 000000000..911e64f89
--- /dev/null
+++ b/docs/assets/img/bootstrap-mdo-sfmoma-03.jpg
Binary files differ
diff --git a/docs/base-css.html b/docs/base-css.html
index 6847c0616..27251d824 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -368,7 +368,7 @@
<tr>
<td><code>&lt;pre class="prettyprint"&gt;</code></td>
<td>
- <p>Using the google-code-prettify library, your blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p>
+ <p>Using the google-code-prettify library, you're blocks of code get a slightly different visual style and automatic syntax highlighting. You can also add an additional class to add line numbers.</p>
<pre class="prettyprint">&lt;div&gt;
&lt;h1&gt;Heading&lt;/h1&gt;
&lt;p&gt;Something right here…&lt;/p&gt;
diff --git a/docs/javascript.html b/docs/javascript.html
index cc9c0d9eb..425d347cb 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1215,21 +1215,21 @@ $('#myCollapsible').on('hidden', function () {
<div id="myCarousel" class="carousel slide">
<div class="carousel-inner">
<div class="item active">
- <img src="http://placehold.it/1000x500" alt="">
+ <img src="assets/img/bootstrap-mdo-sfmoma-01.jpg" alt="">
<div class="carousel-caption">
<h4>First Thumbnail label</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
</div>
</div>
<div class="item">
- <img src="http://placehold.it/1000x500" alt="">
+ <img src="assets/img/bootstrap-mdo-sfmoma-02.jpg" alt="">
<div class="carousel-caption">
<h4>Second Thumbnail label</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
</div>
</div>
<div class="item">
- <img src="http://placehold.it/1000x500" alt="">
+ <img src="assets/img/bootstrap-mdo-sfmoma-03.jpg" alt="">
<div class="carousel-caption">
<h4>Third Thumbnail label</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 401e86cbe..2ac950251 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1155,21 +1155,21 @@ $('#myCollapsible').on('hidden', function () {
<div id="myCarousel" class="carousel slide">
<div class="carousel-inner">
<div class="item active">
- <img src="http://placehold.it/1000x500" alt="">
+ <img src="assets/img/bootstrap-mdo-sfmoma-01.jpg" alt="">
<div class="carousel-caption">
<h4>{{_i}}First Thumbnail label{{/i}}</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
</div>
</div>
<div class="item">
- <img src="http://placehold.it/1000x500" alt="">
+ <img src="assets/img/bootstrap-mdo-sfmoma-02.jpg" alt="">
<div class="carousel-caption">
<h4>{{_i}}Second Thumbnail label{{/i}}</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
</div>
</div>
<div class="item">
- <img src="http://placehold.it/1000x500" alt="">
+ <img src="assets/img/bootstrap-mdo-sfmoma-03.jpg" alt="">
<div class="carousel-caption">
<h4>{{_i}}Third Thumbnail label{{/i}}</h4>
<p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>