From 6c765ac8211536e9701e996416b8a5296590d5fd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 15:02:38 -0700 Subject: add nonresponsive template to examples --- examples/non-responsive/index.html | 47 +++++++++++++++++++++++++++++ examples/non-responsive/non-responsive.css | 12 ++++++++ examples/screenshots/non-responsive.jpg | Bin 0 -> 77275 bytes 3 files changed, 59 insertions(+) create mode 100644 examples/non-responsive/index.html create mode 100644 examples/non-responsive/non-responsive.css create mode 100644 examples/screenshots/non-responsive.jpg (limited to 'examples') diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html new file mode 100644 index 000000000..7eb2138d1 --- /dev/null +++ b/examples/non-responsive/index.html @@ -0,0 +1,47 @@ + + + + + + + + + + + + Non-responsive Template for Bootstrap + + + + + + + + + +
+ +
+

Non-responsive Bootstrap

+

Disable the responsiveness of Bootstrap by fixing the width of the container and using the first grid system tier.

+
+ +

What changes

+

Note the lack of the <meta name="viewport" content="width=device-width, initial-scale=1.0">, which disables the zooming aspect of sites in mobile devices. In addition, we reset our container's width and are essentially good to go.

+ +

Non-responsive grid system

+
+
One third
+
One third
+
One third
+
+ +
+ + + + + + + diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css new file mode 100644 index 000000000..19901ca45 --- /dev/null +++ b/examples/non-responsive/non-responsive.css @@ -0,0 +1,12 @@ +.container { + max-width: 970px; +} + +.col-xs-4 { + padding-top: 15px; + padding-bottom: 15px; + background-color: #eee; + border: 1px solid #ddd; + background-color: rgba(86,61,124,.15); + border: 1px solid rgba(86,61,124,.2); +} diff --git a/examples/screenshots/non-responsive.jpg b/examples/screenshots/non-responsive.jpg new file mode 100644 index 000000000..87a679e54 Binary files /dev/null and b/examples/screenshots/non-responsive.jpg differ -- cgit v1.2.3 From 4f97df8aa42d2609efd52ea21f1e84124afbe39d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 15:07:53 -0700 Subject: update non-responsive docs and example to really disable it --- examples/non-responsive/index.html | 2 +- examples/non-responsive/non-responsive.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index 7eb2138d1..35f16cddf 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -27,7 +27,7 @@

What changes

-

Note the lack of the <meta name="viewport" content="width=device-width, initial-scale=1.0">, which disables the zooming aspect of sites in mobile devices. In addition, we reset our container's width and are essentially good to go.

+

Note the lack of the <meta name="viewport" content="width=device-width, initial-scale=1.0">, which disables the zooming aspect of sites in mobile devices. In addition, we reset our container's width and are basically good to go.

Non-responsive grid system

diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css index 19901ca45..2864ca1c5 100644 --- a/examples/non-responsive/non-responsive.css +++ b/examples/non-responsive/non-responsive.css @@ -1,5 +1,6 @@ .container { - max-width: 970px; + max-width: none !important; + width: 970px; } .col-xs-4 { -- cgit v1.2.3 From 665559a45051823479362ced72c99d2acc5a5590 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 15:35:15 -0700 Subject: smaller example screenshots, fixes #9748 --- examples/screenshots/carousel.jpg | Bin 142210 -> 82379 bytes examples/screenshots/grid.jpg | Bin 162322 -> 100105 bytes examples/screenshots/jumbotron-narrow.jpg | Bin 122875 -> 68675 bytes examples/screenshots/jumbotron.jpg | Bin 139193 -> 78565 bytes examples/screenshots/justified-nav.jpg | Bin 141141 -> 79170 bytes examples/screenshots/navbar-fixed.jpg | Bin 64181 -> 38093 bytes examples/screenshots/navbar-static.jpg | Bin 65464 -> 39712 bytes examples/screenshots/navbar.jpg | Bin 69340 -> 41029 bytes examples/screenshots/non-responsive.jpg | Bin 77275 -> 43926 bytes examples/screenshots/offcanvas.jpg | Bin 202908 -> 112583 bytes examples/screenshots/sign-in.jpg | Bin 24724 -> 13648 bytes examples/screenshots/starter-template.jpg | Bin 38764 -> 22620 bytes examples/screenshots/sticky-footer-navbar.jpg | Bin 71177 -> 39387 bytes examples/screenshots/sticky-footer.jpg | Bin 42344 -> 25056 bytes 14 files changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/screenshots/carousel.jpg b/examples/screenshots/carousel.jpg index 8c545c100..a63a1ba9d 100644 Binary files a/examples/screenshots/carousel.jpg and b/examples/screenshots/carousel.jpg differ diff --git a/examples/screenshots/grid.jpg b/examples/screenshots/grid.jpg index 5aafbf478..2407cf293 100644 Binary files a/examples/screenshots/grid.jpg and b/examples/screenshots/grid.jpg differ diff --git a/examples/screenshots/jumbotron-narrow.jpg b/examples/screenshots/jumbotron-narrow.jpg index e9338b777..915d10f4c 100644 Binary files a/examples/screenshots/jumbotron-narrow.jpg and b/examples/screenshots/jumbotron-narrow.jpg differ diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg index bb996135b..aacbf8d34 100644 Binary files a/examples/screenshots/jumbotron.jpg and b/examples/screenshots/jumbotron.jpg differ diff --git a/examples/screenshots/justified-nav.jpg b/examples/screenshots/justified-nav.jpg index 01689c3ca..5f57923e6 100644 Binary files a/examples/screenshots/justified-nav.jpg and b/examples/screenshots/justified-nav.jpg differ diff --git a/examples/screenshots/navbar-fixed.jpg b/examples/screenshots/navbar-fixed.jpg index cac325f41..16a03b0bc 100644 Binary files a/examples/screenshots/navbar-fixed.jpg and b/examples/screenshots/navbar-fixed.jpg differ diff --git a/examples/screenshots/navbar-static.jpg b/examples/screenshots/navbar-static.jpg index 460624b63..8fe3529fb 100644 Binary files a/examples/screenshots/navbar-static.jpg and b/examples/screenshots/navbar-static.jpg differ diff --git a/examples/screenshots/navbar.jpg b/examples/screenshots/navbar.jpg index 3bd2fe688..3120c507a 100644 Binary files a/examples/screenshots/navbar.jpg and b/examples/screenshots/navbar.jpg differ diff --git a/examples/screenshots/non-responsive.jpg b/examples/screenshots/non-responsive.jpg index 87a679e54..7642d8a34 100644 Binary files a/examples/screenshots/non-responsive.jpg and b/examples/screenshots/non-responsive.jpg differ diff --git a/examples/screenshots/offcanvas.jpg b/examples/screenshots/offcanvas.jpg index e19850740..76b7d6702 100644 Binary files a/examples/screenshots/offcanvas.jpg and b/examples/screenshots/offcanvas.jpg differ diff --git a/examples/screenshots/sign-in.jpg b/examples/screenshots/sign-in.jpg index 6d5504e68..4191c33b8 100644 Binary files a/examples/screenshots/sign-in.jpg and b/examples/screenshots/sign-in.jpg differ diff --git a/examples/screenshots/starter-template.jpg b/examples/screenshots/starter-template.jpg index 5285a655d..2545aa32f 100644 Binary files a/examples/screenshots/starter-template.jpg and b/examples/screenshots/starter-template.jpg differ diff --git a/examples/screenshots/sticky-footer-navbar.jpg b/examples/screenshots/sticky-footer-navbar.jpg index f9d88cdfe..6226bf4ac 100644 Binary files a/examples/screenshots/sticky-footer-navbar.jpg and b/examples/screenshots/sticky-footer-navbar.jpg differ diff --git a/examples/screenshots/sticky-footer.jpg b/examples/screenshots/sticky-footer.jpg index 6bab18d99..644f6dd26 100644 Binary files a/examples/screenshots/sticky-footer.jpg and b/examples/screenshots/sticky-footer.jpg differ -- cgit v1.2.3 From c56a749323836b7e0b7401d41de1d0c68a7cb7a8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 18:59:50 -0700 Subject: Finish first pass at and docment Bootstrap v2-ish theme * Adds new "theme" example * Adds new theme.less file to provide all the overrides and additional styles for the theme * theme.less compiles, via Grunt, to two new files to `dist/css`, bootstrap-theme.css and bootstrap-theme.min.css --- examples/screenshots/theme.jpg | Bin 0 -> 95407 bytes examples/theme/index.html | 382 +++++++++++++++++++++++++++++++++++++++++ examples/theme/theme.css | 14 ++ 3 files changed, 396 insertions(+) create mode 100644 examples/screenshots/theme.jpg create mode 100644 examples/theme/index.html create mode 100644 examples/theme/theme.css (limited to 'examples') diff --git a/examples/screenshots/theme.jpg b/examples/screenshots/theme.jpg new file mode 100644 index 000000000..ef47acb9c Binary files /dev/null and b/examples/screenshots/theme.jpg differ diff --git a/examples/theme/index.html b/examples/theme/index.html new file mode 100644 index 000000000..54b8d0c84 --- /dev/null +++ b/examples/theme/index.html @@ -0,0 +1,382 @@ + + + + + + + + + + Theme Template for Bootstrap + + + + + + + + + + + + + +
+
+
+ + Bootstrap theme +
+
+ +
+
+
+ +
+ + +
+

Hello, world!

+

This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.

+

Learn more »

+
+ + + +
+

Buttons

+
+

+ + + + + + + +

+

+ + + + + + + +

+

+ + + + + + + +

+

+ + + + + + + +

+ + + +
+

Thumbnails

+
+ A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera + + + +
+

Dropdown menus

+
+
+ Dropdown + +
+ + + + +
+

Navbars

+
+ +
+
+
+ + Project name +
+
+ + +
+
+
+ +
+
+
+ + Project name +
+
+ + +
+
+
+ + + +
+

Alerts

+
+
+ Warning! Best check yo self, you're not looking too good. +
+
+ Well done! You successfully read this important alert message. +
+
+ Heads up! This alert needs your attention, but it's not super important. +
+
+ Oh snap! Change a few things up and try submitting again. +
+ + + +
+

Progress bars

+
+
+
60% Complete
+
+
+
40% Complete (success)
+
+
+
20% Complete
+
+
+
60% Complete (warning)
+
+
+
80% Complete (danger)
+
+
+
35% Complete (success)
+
20% Complete (warning)
+
10% Complete (danger)
+
+ + + +
+

List groups

+
+
+
+
    +
  • Cras justo odio
    • +
  • Dapibus ac facilisis in
    • +
  • Morbi leo risus
    • +
  • Porta ac consectetur ac
    • +
  • Vestibulum at eros
    • +
+
+
+
+ + Cras justo odio + + Dapibus ac facilisis in + Morbi leo risus + Porta ac consectetur ac + Vestibulum at eros +
+
+
+
+ +

List group item heading

+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ + +

List group item heading

+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ + +

List group item heading

+

Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

+ +
+
+
+ + + +
+

Panels

+
+
+
+
+
+

Panel title

+
+
+ Panel content +
+
+
+
+

Panel title

+
+
+ Panel content +
+
+
+
+
+
+

Panel title

+
+
+ Panel content +
+
+
+
+

Panel title

+
+
+ Panel content +
+
+
+
+
+
+

Panel title

+
+
+ Panel content +
+
+
+
+

Panel title

+
+
+ Panel content +
+
+
+
+ + + +
+

Wells

+
+
+

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas sed diam eget risus varius blandit sit amet non magna. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Cras mattis consectetur purus sit amet fermentum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Aenean lacinia bibendum nulla sed consectetur.

+
+ + +
+ + + + + + + + + + diff --git a/examples/theme/theme.css b/examples/theme/theme.css new file mode 100644 index 000000000..e7559231e --- /dev/null +++ b/examples/theme/theme.css @@ -0,0 +1,14 @@ +body { + padding-top: 70px; + padding-bottom: 30px; +} + +.theme-dropdown .dropdown-menu { + display: block; + position: static; + margin-bottom: 20px; +} + +.theme-showcase > p > .btn { + margin: 5px 0; +} \ No newline at end of file -- cgit v1.2.3 From 3780edd956e0666361ef2a366945455d78ff9183 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 19:00:05 -0700 Subject: update examples to use new .btn-lg class --- examples/jumbotron-narrow/index.html | 2 +- examples/jumbotron/index.html | 2 +- examples/justified-nav/index.html | 2 +- examples/navbar-fixed-top/index.html | 2 +- examples/navbar-static-top/index.html | 2 +- examples/navbar/index.html | 2 +- examples/signin/index.html | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples') diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index c8b0fe920..2c70f9148 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -31,7 +31,7 @@

Jumbotron heading

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

-

Sign up today

+

Sign up today

diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index 1f8129128..23db4b6e6 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -65,7 +65,7 @@

Hello, world!

This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.

-

Learn more »

+

Learn more »

diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index 431b2780d..46ebb6d69 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -36,7 +36,7 @@

Marketing stuff!

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet.

-

Get started today

+

Get started today

diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index 2340bcfae..d1f1944e1 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -64,7 +64,7 @@

This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

To see the difference between static and fixed top navbars, just scroll.

- View navbar docs » + View navbar docs »

diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 7bf1deccb..753e916a4 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -65,7 +65,7 @@

This example is a quick exercise to illustrate how the default, static and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

To see the difference between static and fixed top navbars, just scroll.

- View navbar docs » + View navbar docs »

diff --git a/examples/navbar/index.html b/examples/navbar/index.html index ee2ba19b6..6f4cefe31 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -62,7 +62,7 @@

Navbar example

This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

- View navbar docs » + View navbar docs »

diff --git a/examples/signin/index.html b/examples/signin/index.html index fefb73386..7c491ae9c 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -27,7 +27,7 @@ - + -- cgit v1.2.3 From d713f8341c26b1705a94fd890a92695d271dfb5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 20:33:52 -0700 Subject: Update jumbotron * Defaults to no rounded corners and full width in the viewport * When in a container, the jumbotron has extra padding and will have rounded corners * Updates default jumbotron example to show the full width default display Fixes #9759. --- examples/jumbotron-narrow/index.html | 2 +- examples/jumbotron-narrow/jumbotron-narrow.css | 9 +++++---- examples/jumbotron/index.html | 9 +++++---- examples/jumbotron/jumbotron.css | 4 ---- examples/screenshots/jumbotron.jpg | Bin 78565 -> 77911 bytes 5 files changed, 11 insertions(+), 13 deletions(-) (limited to 'examples') diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index 2c70f9148..ffcb3986e 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -18,7 +18,7 @@ -
+
  • Home
    • diff --git a/examples/jumbotron-narrow/jumbotron-narrow.css b/examples/jumbotron-narrow/jumbotron-narrow.css index 36a1d7cae..ea8e393bd 100644 --- a/examples/jumbotron-narrow/jumbotron-narrow.css +++ b/examples/jumbotron-narrow/jumbotron-narrow.css @@ -31,10 +31,11 @@ body { border-top: 1px solid #e5e5e5; } -/* Custom container */ -.container-narrow { - margin: 0 auto; - max-width: 700px; +/* Customize container */ +@media (min-width: 768px) { + .container { + max-width: 730px; + } } .container-narrow > hr { margin: 30px 0; diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index 23db4b6e6..a309fd5ad 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -59,15 +59,16 @@
-
- - -
+ +
+

Hello, world!

This is a template for a simple marketing or informational website. It includes a large callout called the hero unit and three supporting pieces of content. Use it as a starting point to create something more unique.

Learn more »

+
+
diff --git a/examples/jumbotron/jumbotron.css b/examples/jumbotron/jumbotron.css index 594e2c794..f14b34c36 100644 --- a/examples/jumbotron/jumbotron.css +++ b/examples/jumbotron/jumbotron.css @@ -13,10 +13,6 @@ body { /* Responsive: Portrait tablets and up */ @media screen and (min-width: 768px) { - /* Let the jumbotron breathe */ - .jumbotron { - margin-top: 20px; - } /* Remove padding from wrapping element since we kick in the grid classes here */ .body-content { padding: 0; diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg index aacbf8d34..46bce0c53 100644 Binary files a/examples/screenshots/jumbotron.jpg and b/examples/screenshots/jumbotron.jpg differ -- cgit v1.2.3 From b413aff0458a9a2c1afdd6a66b1a58eef62c30b0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 20:35:31 -0700 Subject: Favicon in navbar example --- examples/navbar/index.html | 1 + 1 file changed, 1 insertion(+) (limited to 'examples') diff --git a/examples/navbar/index.html b/examples/navbar/index.html index 6f4cefe31..b1734da83 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -5,6 +5,7 @@ + Navbar Template for Bootstrap -- cgit v1.2.3 From 5539db523743c177a2ebb7d878343776abf6b7b4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 17 Aug 2013 21:00:13 -0700 Subject: Navbar update Addresses a few different cases where the navbar has and doesn't have a container, and accordingly adjusts the padding and margin of key elements. --- examples/navbar/index.html | 64 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) (limited to 'examples') diff --git a/examples/navbar/index.html b/examples/navbar/index.html index b1734da83..ac779e47a 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -22,40 +22,38 @@
-
-
- - Project name -
-
- - -
+
+ + Project name
+
+ + +
-- cgit v1.2.3