Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-12-21 03:08:05 +0400
committerMark Otto <otto@github.com>2012-12-21 03:08:05 +0400
commita24e47b5b81a216bcb1bb786b359c7000759c5dc (patch)
tree1ed32ed7beb0f722599b224652dd10bb1af0d0fb
parent43d130762be1b3124baafc5953e552934cb1dfd7 (diff)
Update the examples index:
* Retina ready screenshots * Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
-rw-r--r--docs/assets/css/docs.css3
-rw-r--r--docs/assets/img/examples/bootstrap-example-carousel.pngbin53908 -> 339980 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-fluid.jpgbin23408 -> 0 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-fluid.pngbin0 -> 209039 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-hero.jpgbin19805 -> 0 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-justified-nav.pngbin0 -> 136021 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-marketing-narrow.pngbin21869 -> 117303 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-marketing.pngbin0 -> 134269 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-signin.pngbin4202 -> 22037 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-starter.jpgbin5584 -> 0 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-starter.pngbin0 -> 36099 bytes
-rw-r--r--docs/assets/img/examples/bootstrap-example-sticky-footer.pngbin9749 -> 30820 bytes
-rw-r--r--docs/getting-started.html15
-rw-r--r--docs/templates/pages/getting-started.mustache15
14 files changed, 27 insertions, 6 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index c7bddd45af..1142414040 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -552,6 +552,9 @@ h2 + .row {
/* Example page
------------------------- */
+.bootstrap-examples h4 {
+ margin: 10px 0 5px;
+}
.bootstrap-examples p {
font-size: 13px;
line-height: 18px;
diff --git a/docs/assets/img/examples/bootstrap-example-carousel.png b/docs/assets/img/examples/bootstrap-example-carousel.png
index a2f668abe1..725fe07b9e 100644
--- a/docs/assets/img/examples/bootstrap-example-carousel.png
+++ b/docs/assets/img/examples/bootstrap-example-carousel.png
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.jpg b/docs/assets/img/examples/bootstrap-example-fluid.jpg
deleted file mode 100644
index d616ba001b..0000000000
--- a/docs/assets/img/examples/bootstrap-example-fluid.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-fluid.png b/docs/assets/img/examples/bootstrap-example-fluid.png
new file mode 100644
index 0000000000..5f49a332f3
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-fluid.png
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-hero.jpg b/docs/assets/img/examples/bootstrap-example-hero.jpg
deleted file mode 100644
index a9662d2b4b..0000000000
--- a/docs/assets/img/examples/bootstrap-example-hero.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-justified-nav.png b/docs/assets/img/examples/bootstrap-example-justified-nav.png
new file mode 100644
index 0000000000..3d1e233891
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-justified-nav.png
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
index a7ac9ef98b..4bca8cdafd 100644
--- a/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
+++ b/docs/assets/img/examples/bootstrap-example-marketing-narrow.png
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-marketing.png b/docs/assets/img/examples/bootstrap-example-marketing.png
new file mode 100644
index 0000000000..206e26e342
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-marketing.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 39210096b4..b649a985dc 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/assets/img/examples/bootstrap-example-starter.jpg b/docs/assets/img/examples/bootstrap-example-starter.jpg
deleted file mode 100644
index 3b1cbf9e78..0000000000
--- a/docs/assets/img/examples/bootstrap-example-starter.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-starter.png b/docs/assets/img/examples/bootstrap-example-starter.png
new file mode 100644
index 0000000000..1bf4b85ece
--- /dev/null
+++ b/docs/assets/img/examples/bootstrap-example-starter.png
Binary files differ
diff --git a/docs/assets/img/examples/bootstrap-example-sticky-footer.png b/docs/assets/img/examples/bootstrap-example-sticky-footer.png
index c2255044df..fb80e7b92f 100644
--- a/docs/assets/img/examples/bootstrap-example-sticky-footer.png
+++ b/docs/assets/img/examples/bootstrap-example-sticky-footer.png
Binary files differ
diff --git a/docs/getting-started.html b/docs/getting-started.html
index cc6e0b71ce..116d020e5d 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -243,21 +243,21 @@
<ul class="thumbnails bootstrap-examples">
<li class="span3">
<a class="thumbnail" href="examples/starter-template.html">
- <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
+ <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>
</li>
<li class="span3">
<a class="thumbnail" href="examples/hero.html">
- <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
+ <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>
</li>
<li class="span3">
<a class="thumbnail" href="examples/fluid.html">
- <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
+ <img src="assets/img/examples/bootstrap-example-fluid.png" alt="">
</a>
<h4>Fluid layout</h4>
<p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
@@ -270,6 +270,15 @@
<h4>Narrow marketing</h4>
<p>Slim, lightweight marketing template for small projects or teams.</p>
</li>
+
+ <li class="span3">
+ <a class="thumbnail" href="examples/justified-nav.html">
+ <img src="assets/img/examples/bootstrap-example-justified-nav.png" alt="">
+ </a>
+ <h4>Justified nav</h4>
+ <p>Marketing page with equal-width navigation links in a modified navbar.</p>
+ </li>
+
<li class="span3">
<a class="thumbnail" href="examples/signin.html">
<img src="assets/img/examples/bootstrap-example-signin.png" alt="">
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 2eec7ff769..ae6f5e690d 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -172,21 +172,21 @@
<ul class="thumbnails bootstrap-examples">
<li class="span3">
<a class="thumbnail" href="examples/starter-template.html">
- <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
+ <img src="assets/img/examples/bootstrap-example-starter.png" alt="">
</a>
<h4>{{_i}}Starter template{{/i}}</h4>
<p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
</li>
<li class="span3">
<a class="thumbnail" href="examples/hero.html">
- <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
+ <img src="assets/img/examples/bootstrap-example-marketing.png" alt="">
</a>
<h4>{{_i}}Basic marketing site{{/i}}</h4>
<p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
</li>
<li class="span3">
<a class="thumbnail" href="examples/fluid.html">
- <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
+ <img src="assets/img/examples/bootstrap-example-fluid.png" alt="">
</a>
<h4>{{_i}}Fluid layout{{/i}}</h4>
<p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
@@ -199,6 +199,15 @@
<h4>{{_i}}Narrow marketing{{/i}}</h4>
<p>{{_i}}Slim, lightweight marketing template for small projects or teams.{{/i}}</p>
</li>
+
+ <li class="span3">
+ <a class="thumbnail" href="examples/justified-nav.html">
+ <img src="assets/img/examples/bootstrap-example-justified-nav.png" alt="">
+ </a>
+ <h4>{{_i}}Justified nav{{/i}}</h4>
+ <p>{{_i}}Marketing page with equal-width navigation links in a modified navbar.{{/i}}</p>
+ </li>
+
<li class="span3">
<a class="thumbnail" href="examples/signin.html">
<img src="assets/img/examples/bootstrap-example-signin.png" alt="">