From 48c64127b37be4a692a70cb7b38ed9744163582b Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Wed, 30 Oct 2013 16:13:42 -0400 Subject: 3.0.0 -> 3.0.1 --- .../bootstrap/examples/carousel/carousel.css | 30 ++++++++++-- .../bootstrap/examples/carousel/index.html | 48 +++++++++++--------- .../bootstrap/examples/grid/index.html | 53 +++++++++++++++++----- .../bootstrap/examples/jumbotron-narrow/index.html | 12 +++-- .../bootstrap/examples/jumbotron/index.html | 45 +++++++----------- .../bootstrap/examples/justified-nav/index.html | 18 +++++--- .../examples/justified-nav/justified-nav.css | 2 +- .../bootstrap/examples/navbar-fixed-top/index.html | 14 ++++-- .../examples/navbar-static-top/index.html | 14 ++++-- .../bootstrap/examples/navbar/index.html | 14 ++++-- .../bootstrap/examples/navbar/navbar.css | 7 +-- .../bootstrap/examples/non-responsive/index.html | 12 +++-- .../examples/non-responsive/non-responsive.css | 3 +- .../bootstrap/examples/offcanvas/index.html | 52 +++++++++++---------- .../bootstrap/examples/offcanvas/offcanvas.css | 12 +++-- .../bootstrap/examples/signin/index.html | 14 ++++-- .../bootstrap/examples/starter-template/index.html | 12 +++-- .../examples/sticky-footer-navbar/index.html | 12 +++-- .../sticky-footer-navbar/sticky-footer-navbar.css | 5 +- .../bootstrap/examples/sticky-footer/index.html | 10 ++-- .../examples/sticky-footer/sticky-footer.css | 5 +- .../bootstrap/examples/theme/index.html | 32 ++++++------- 22 files changed, 251 insertions(+), 175 deletions(-) (limited to 'bower_components/bootstrap/examples') diff --git a/bower_components/bootstrap/examples/carousel/carousel.css b/bower_components/bootstrap/examples/carousel/carousel.css index 164f306e..a728bd89 100755 --- a/bower_components/bootstrap/examples/carousel/carousel.css +++ b/bower_components/bootstrap/examples/carousel/carousel.css @@ -14,8 +14,21 @@ body { /* Special class on .container surrounding .navbar, used for positioning it into place. */ .navbar-wrapper { - position: relative; - z-index: 15; + position: absolute; + top: 0; + left: 0; + right: 0; + z-index: 20; +} + +/* Flip around the padding for proper display in narrow viewports */ +.navbar-wrapper .container { + padding-left: 0; + padding-right: 0; +} +.navbar-wrapper .navbar { + padding-left: 15px; + padding-right: 15px; } @@ -24,10 +37,8 @@ body { /* Carousel base class */ .carousel { + height: 500px; margin-bottom: 60px; - - /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */ - margin-top: -90px; } /* Since positioning the image, we need to help out the caption */ .carousel-caption { @@ -103,6 +114,15 @@ body { .navbar-wrapper { margin-top: 20px; } + .navbar-wrapper .container { + padding-left: 15px; + padding-right: 15px; + } + .navbar-wrapper .navbar { + padding-left: 0; + padding-right: 0; + } + /* The navbar becomes detached from the top, so we round the corners */ .navbar-wrapper .navbar { border-radius: 4px; diff --git a/bower_components/bootstrap/examples/carousel/index.html b/bower_components/bootstrap/examples/carousel/index.html index d962c1e6..14674eeb 100755 --- a/bower_components/bootstrap/examples/carousel/index.html +++ b/bower_components/bootstrap/examples/carousel/index.html @@ -2,20 +2,24 @@ + - + Carousel Template for Bootstrap + + + @@ -65,7 +69,7 @@ -
-
.col-xs-6 .col-md-6
-
.col-xs-6 .col-md-6
+
.col-xs-6
+
.col-xs-6
@@ -96,19 +100,44 @@

Mixed: mobile, tablet, and desktop

-
.col-xs-12 .col-lg-8
-
.col-xs-6 .col-lg-4
+
.col-xs-12 .col-sm-6 .col-lg-8
+
.col-xs-6 .col-lg-4
+
+
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+
.col-xs-6 .col-sm-4
+
+ +
+ +

Column clearing

+

Clear floats at specific breakpoints to prevent awkward wrapping with uneven content.

+
+
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+ + +
+ +
.col-xs-6 .col-sm-3
+
.col-xs-6 .col-sm-3
+ +
+ +

Offset, push, and pull resets

+

Reset offsets, pushes, and pulls at specific breakpoints.

-
.col-xs-6 .col-sm-4 .col-lg-4
-
.col-xs-6 .col-sm-4 .col-lg-4
-
.col-xs-6 .col-sm-4 .col-lg-4
+
.col-sm-5 .col-md-6
+
.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0
-
.col-xs-6 .col-sm-6 .col-lg-6
-
.col-xs-6 .col-sm-6 .col-lg-6
+
.col-sm-6 .col-md-5 .col-lg-6
+
.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0
+ diff --git a/bower_components/bootstrap/examples/jumbotron-narrow/index.html b/bower_components/bootstrap/examples/jumbotron-narrow/index.html index 2fb23138..3f6e6890 100755 --- a/bower_components/bootstrap/examples/jumbotron-narrow/index.html +++ b/bower_components/bootstrap/examples/jumbotron-narrow/index.html @@ -2,10 +2,11 @@ + - + Narrow Jumbotron Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -37,7 +41,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/bower_components/bootstrap/examples/jumbotron/index.html b/bower_components/bootstrap/examples/jumbotron/index.html index 86255fca..b4cd6ed5 100755 --- a/bower_components/bootstrap/examples/jumbotron/index.html +++ b/bower_components/bootstrap/examples/jumbotron/index.html @@ -2,10 +2,11 @@ + - + Jumbotron Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -35,23 +39,6 @@ Project name
-
@@ -69,28 +56,28 @@

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 »

+

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

+

Learn more »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

-
+

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

-
+

Heading

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

-

View details »

+

View details »

@@ -105,7 +92,7 @@ - + diff --git a/bower_components/bootstrap/examples/justified-nav/index.html b/bower_components/bootstrap/examples/justified-nav/index.html index 8ab83cc1..c2cf0ca1 100755 --- a/bower_components/bootstrap/examples/justified-nav/index.html +++ b/bower_components/bootstrap/examples/justified-nav/index.html @@ -2,10 +2,11 @@ + - + Justified Nav Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -42,7 +46,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

@@ -50,17 +54,17 @@

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa.

-

View details »

+

View details »

diff --git a/bower_components/bootstrap/examples/justified-nav/justified-nav.css b/bower_components/bootstrap/examples/justified-nav/justified-nav.css index 7837acf4..baf0e113 100755 --- a/bower_components/bootstrap/examples/justified-nav/justified-nav.css +++ b/bower_components/bootstrap/examples/justified-nav/justified-nav.css @@ -27,6 +27,7 @@ body { border: 1px solid #ccc; } .nav-justified > li > a { + margin-bottom: 0; padding-top: 15px; padding-bottom: 15px; color: #777; @@ -38,7 +39,6 @@ body { background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */ background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Chrome 10+,Safari 5.1+ */ - background-image: -ms-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* IE10+ */ background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */ background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */ diff --git a/bower_components/bootstrap/examples/navbar-fixed-top/index.html b/bower_components/bootstrap/examples/navbar-fixed-top/index.html index 90f984e9..e6b3a096 100755 --- a/bower_components/bootstrap/examples/navbar-fixed-top/index.html +++ b/bower_components/bootstrap/examples/navbar-fixed-top/index.html @@ -2,10 +2,11 @@ + - + Fixed Top Navbar Example for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -70,7 +74,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 »

@@ -80,7 +84,7 @@ - + diff --git a/bower_components/bootstrap/examples/navbar-static-top/index.html b/bower_components/bootstrap/examples/navbar-static-top/index.html index 98ec31d6..098cd4d9 100755 --- a/bower_components/bootstrap/examples/navbar-static-top/index.html +++ b/bower_components/bootstrap/examples/navbar-static-top/index.html @@ -2,10 +2,11 @@ + - + Static Top Navbar Example for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -71,7 +75,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 »

@@ -81,7 +85,7 @@ - + diff --git a/bower_components/bootstrap/examples/navbar/index.html b/bower_components/bootstrap/examples/navbar/index.html index 97e4c0c8..612f491e 100755 --- a/bower_components/bootstrap/examples/navbar/index.html +++ b/bower_components/bootstrap/examples/navbar/index.html @@ -2,10 +2,11 @@ + - + Navbar Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -67,7 +71,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 »

@@ -77,7 +81,7 @@ - + diff --git a/bower_components/bootstrap/examples/navbar/navbar.css b/bower_components/bootstrap/examples/navbar/navbar.css index f593a6bf..d2195240 100755 --- a/bower_components/bootstrap/examples/navbar/navbar.css +++ b/bower_components/bootstrap/examples/navbar/navbar.css @@ -1,7 +1,8 @@ body { -padding: 30px; + padding-top: 20px; + padding-bottom: 20px; } .navbar { -margin-bottom: 30px; -} \ No newline at end of file + margin-bottom: 20px; +} diff --git a/bower_components/bootstrap/examples/non-responsive/index.html b/bower_components/bootstrap/examples/non-responsive/index.html index a5fd883b..517d874b 100755 --- a/bower_components/bootstrap/examples/non-responsive/index.html +++ b/bower_components/bootstrap/examples/non-responsive/index.html @@ -2,12 +2,13 @@ + - + Non-responsive Template for Bootstrap @@ -17,10 +18,13 @@ + + + @@ -90,7 +94,7 @@ - + diff --git a/bower_components/bootstrap/examples/non-responsive/non-responsive.css b/bower_components/bootstrap/examples/non-responsive/non-responsive.css index 4928128e..526b0b8b 100755 --- a/bower_components/bootstrap/examples/non-responsive/non-responsive.css +++ b/bower_components/bootstrap/examples/non-responsive/non-responsive.css @@ -1,7 +1,6 @@ - /* Template-specific stuff * - * Customizations just for the template—these are not necessary for anything + * Customizations just for the template; these are not necessary for anything * with disabling the responsiveness. */ diff --git a/bower_components/bootstrap/examples/offcanvas/index.html b/bower_components/bootstrap/examples/offcanvas/index.html index a53741b9..1fc5c551 100755 --- a/bower_components/bootstrap/examples/offcanvas/index.html +++ b/bower_components/bootstrap/examples/offcanvas/index.html @@ -2,10 +2,11 @@ + - + Off Canvas Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -46,6 +50,7 @@
+

@@ -58,52 +63,49 @@

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

Heading

Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.

-

View details »

+

View details »

@@ -120,7 +122,7 @@ - + diff --git a/bower_components/bootstrap/examples/offcanvas/offcanvas.css b/bower_components/bootstrap/examples/offcanvas/offcanvas.css index df60d6af..71ad2ac2 100755 --- a/bower_components/bootstrap/examples/offcanvas/offcanvas.css +++ b/bower_components/bootstrap/examples/offcanvas/offcanvas.css @@ -1,20 +1,22 @@ /* - * Style twaks + * Style tweaks * -------------------------------------------------- */ +html { + overflow-x: hidden; /* Prevent scroll on narrow devices */ +} body { padding-top: 70px; } footer { - padding-left: 15px; - padding-right: 15px; + padding: 30px 0; } /* * Off Canvas * -------------------------------------------------- */ -@media screen and (max-width: 768px) { +@media screen and (max-width: 767px) { .row-offcanvas { position: relative; -webkit-transition: all 0.25s ease-out; @@ -45,4 +47,4 @@ footer { top: 0; width: 50%; /* 6 columns */ } -} \ No newline at end of file +} diff --git a/bower_components/bootstrap/examples/signin/index.html b/bower_components/bootstrap/examples/signin/index.html index 5c0a4543..72110751 100755 --- a/bower_components/bootstrap/examples/signin/index.html +++ b/bower_components/bootstrap/examples/signin/index.html @@ -2,10 +2,11 @@ + - + Signin Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -28,8 +32,8 @@ - - + + diff --git a/bower_components/bootstrap/examples/starter-template/index.html b/bower_components/bootstrap/examples/starter-template/index.html index fc22db66..a3d8b98d 100755 --- a/bower_components/bootstrap/examples/starter-template/index.html +++ b/bower_components/bootstrap/examples/starter-template/index.html @@ -2,10 +2,11 @@ + - + Starter Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -57,7 +61,7 @@ - + diff --git a/bower_components/bootstrap/examples/sticky-footer-navbar/index.html b/bower_components/bootstrap/examples/sticky-footer-navbar/index.html index 551212a8..52bc6050 100755 --- a/bower_components/bootstrap/examples/sticky-footer-navbar/index.html +++ b/bower_components/bootstrap/examples/sticky-footer-navbar/index.html @@ -2,10 +2,11 @@ + - + Sticky Footer Navbar Template for Bootstrap @@ -15,10 +16,13 @@ + + + @@ -80,7 +84,7 @@ - + diff --git a/bower_components/bootstrap/examples/sticky-footer-navbar/sticky-footer-navbar.css b/bower_components/bootstrap/examples/sticky-footer-navbar/sticky-footer-navbar.css index 6978a999..4869de0e 100755 --- a/bower_components/bootstrap/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/bower_components/bootstrap/examples/sticky-footer-navbar/sticky-footer-navbar.css @@ -10,8 +10,7 @@ body { /* Wrapper for page content to push down footer */ #wrap { min-height: 100%; - height: auto !important; - height: 100%; + height: auto; /* Negative indent footer by its height */ margin: 0 auto -60px; /* Pad bottom by footer height */ @@ -43,4 +42,4 @@ body { code { font-size: 80%; -} \ No newline at end of file +} diff --git a/bower_components/bootstrap/examples/sticky-footer/index.html b/bower_components/bootstrap/examples/sticky-footer/index.html index aaafbc20..b52754df 100755 --- a/bower_components/bootstrap/examples/sticky-footer/index.html +++ b/bower_components/bootstrap/examples/sticky-footer/index.html @@ -2,10 +2,11 @@ + - + Sticky Footer Template for Bootstrap @@ -15,10 +16,13 @@ + + + diff --git a/bower_components/bootstrap/examples/sticky-footer/sticky-footer.css b/bower_components/bootstrap/examples/sticky-footer/sticky-footer.css index 45be6ccb..db69addb 100755 --- a/bower_components/bootstrap/examples/sticky-footer/sticky-footer.css +++ b/bower_components/bootstrap/examples/sticky-footer/sticky-footer.css @@ -10,8 +10,7 @@ body { /* Wrapper for page content to push down footer */ #wrap { min-height: 100%; - height: auto !important; - height: 100%; + height: auto; /* Negative indent footer by its height */ margin: 0 auto -60px; /* Pad bottom by footer height */ @@ -36,4 +35,4 @@ body { } .container .credit { margin: 20px 0; -} \ No newline at end of file +} diff --git a/bower_components/bootstrap/examples/theme/index.html b/bower_components/bootstrap/examples/theme/index.html index 2f726d82..69388544 100755 --- a/bower_components/bootstrap/examples/theme/index.html +++ b/bower_components/bootstrap/examples/theme/index.html @@ -2,10 +2,11 @@ + - + Theme Template for Bootstrap @@ -17,10 +18,13 @@ + + + @@ -64,8 +68,8 @@

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 »

+

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

+

Learn more »

@@ -115,7 +119,7 @@

Thumbnails

- A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera + A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera @@ -125,7 +129,7 @@
Dropdown -
@@ -205,11 +204,6 @@ - @@ -380,8 +374,8 @@ - + - + -- cgit v1.2.3