From 0c094efe28b34d9eba5a5690ec83c49de423ae1e Mon Sep 17 00:00:00 2001 From: saiwang Date: Sun, 18 Aug 2013 14:28:52 +0800 Subject: add IE's Conditional comments for respondjs and html5shiv --- examples/carousel/index.html | 7 ++++++- examples/grid/index.html | 7 ++++++- examples/jumbotron-narrow/index.html | 7 ++++++- examples/jumbotron/index.html | 7 ++++++- examples/justified-nav/index.html | 7 ++++++- examples/navbar-fixed-top/index.html | 7 ++++++- examples/navbar-static-top/index.html | 7 ++++++- examples/navbar/index.html | 7 ++++++- examples/non-responsive/index.html | 7 ++++++- examples/offcanvas/index.html | 7 ++++++- examples/signin/index.html | 7 ++++++- examples/starter-template/index.html | 7 ++++++- examples/sticky-footer-navbar/index.html | 7 ++++++- examples/sticky-footer/index.html | 7 ++++++- examples/theme/index.html | 7 ++++++- 15 files changed, 90 insertions(+), 15 deletions(-) (limited to 'examples') diff --git a/examples/carousel/index.html b/examples/carousel/index.html index da7cf41a5..aa58c14fc 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -13,6 +13,12 @@ + + + @@ -190,7 +196,6 @@ ================================================== --> - diff --git a/examples/grid/index.html b/examples/grid/index.html index 3cef51e8d..239b0d16a 100644 --- a/examples/grid/index.html +++ b/examples/grid/index.html @@ -14,6 +14,12 @@ + + + @@ -109,6 +115,5 @@ - diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index ffcb3986e..2fb23138b 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -14,6 +14,12 @@ + + + @@ -68,6 +74,5 @@ - diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index a309fd5ad..af2096a62 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -14,6 +14,12 @@ + + + @@ -104,7 +110,6 @@ ================================================== --> - diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index 46ebb6d69..3733b8243 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -14,6 +14,12 @@ + + + @@ -74,6 +80,5 @@ - diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index d1f1944e1..3ed3cf0f5 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -14,6 +14,12 @@ + + + @@ -75,7 +81,6 @@ ================================================== --> - diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 753e916a4..a366a895a 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -14,6 +14,12 @@ + + + @@ -76,7 +82,6 @@ ================================================== --> - diff --git a/examples/navbar/index.html b/examples/navbar/index.html index ac779e47a..75a996c15 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -14,6 +14,12 @@ + + + @@ -72,7 +78,6 @@ ================================================== --> - diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index 35f16cddf..c674a1cfc 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -16,6 +16,12 @@ + + + @@ -42,6 +48,5 @@ - diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index e9c905bd2..a53741b99 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -14,6 +14,12 @@ + + + @@ -115,7 +121,6 @@ ================================================== --> - diff --git a/examples/signin/index.html b/examples/signin/index.html index 7c491ae9c..5c0a4543a 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -14,6 +14,12 @@ + + + @@ -36,6 +42,5 @@ - diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html index 65693edff..fc22db662 100644 --- a/examples/starter-template/index.html +++ b/examples/starter-template/index.html @@ -14,6 +14,12 @@ + + + @@ -52,7 +58,6 @@ ================================================== --> - diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index 0be6de516..92f166d04 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -14,6 +14,12 @@ + + + @@ -75,7 +81,6 @@ ================================================== --> - diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html index 20e902ddd..aaafbc20d 100644 --- a/examples/sticky-footer/index.html +++ b/examples/sticky-footer/index.html @@ -14,6 +14,12 @@ + + + @@ -41,6 +47,5 @@ - diff --git a/examples/theme/index.html b/examples/theme/index.html index 54b8d0c84..9569d9e82 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -16,6 +16,12 @@ + + + @@ -375,7 +381,6 @@ ================================================== --> - -- cgit v1.2.3 From 72a3819f6c1a34f4754ef48ccdb4c00f9d9d77e1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 01:55:47 -0700 Subject: remove carousel icons include --- examples/carousel/index.html | 1 - 1 file changed, 1 deletion(-) (limited to 'examples') diff --git a/examples/carousel/index.html b/examples/carousel/index.html index aa58c14fc..d962c1e6f 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -11,7 +11,6 @@ - -
-
-

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 »

-
-
-

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 »

-
-
-

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 »

-
+ +
+
+

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 »

+
+
+

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 »

+
+
+

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 »

- -
- -
-

© Company 2013

-
+
+ +
+

© Company 2013

+
diff --git a/examples/jumbotron/jumbotron.css b/examples/jumbotron/jumbotron.css index f14b34c36..179d40879 100644 --- a/examples/jumbotron/jumbotron.css +++ b/examples/jumbotron/jumbotron.css @@ -3,18 +3,3 @@ body { padding-top: 50px; padding-bottom: 20px; } - -/* Wrapping element */ -/* Set some basic padding to keep content from hitting the edges */ -.body-content { - padding-left: 15px; - padding-right: 15px; -} - -/* Responsive: Portrait tablets and up */ -@media screen and (min-width: 768px) { - /* Remove padding from wrapping element since we kick in the grid classes here */ - .body-content { - padding: 0; - } -} \ No newline at end of file diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index 3733b8243..8ab83cc1f 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -45,29 +45,24 @@

Get started today

- -
- - -
-
-

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 »

-
-
-

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 »

-
-
-

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 »

-
+ +
+
+

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 »

- -
+
+

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 »

+
+
+

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 »

+
+
-- cgit v1.2.3 From 0c9bf6bcce0e30688b78805fd539861cb081414f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 10:02:32 -0700 Subject: remove padding from justified nav masthead and footer --- examples/justified-nav/justified-nav.css | 7 ------- 1 file changed, 7 deletions(-) (limited to 'examples') diff --git a/examples/justified-nav/justified-nav.css b/examples/justified-nav/justified-nav.css index be983ba6b..20134203c 100644 --- a/examples/justified-nav/justified-nav.css +++ b/examples/justified-nav/justified-nav.css @@ -2,13 +2,6 @@ body { padding-top: 20px; } -/* Everything but the jumbotron gets side spacing for mobile-first views */ -.masthead, -.footer { - padding-left: 15px; - padding-right: 15px; -} - .footer { border-top: 1px solid #eee; margin-top: 40px; -- cgit v1.2.3 From ef68cf8ebdabccfa4bb9126acdc79f0510b04537 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 19 Aug 2013 00:35:40 +0200 Subject: Add new navbar-default class to examples --- examples/navbar-fixed-top/index.html | 2 +- examples/navbar-static-top/index.html | 2 +- examples/navbar/index.html | 2 +- examples/sticky-footer-navbar/index.html | 2 +- examples/theme/index.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index 3ed3cf0f5..90f984e96 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -25,7 +25,7 @@ -
+
-
+
+
-- cgit v1.2.3 From 35ad599df68f64c043e92b80842fd5a59ceb0418 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 18:16:01 -0700 Subject: prevent navbar from collapsing in non responsive example (fixes #9812) --- examples/non-responsive/index.html | 44 ++++++++++++ examples/non-responsive/non-responsive.css | 104 +++++++++++++++++++++++++++++ 2 files changed, 148 insertions(+) (limited to 'examples') diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index c674a1cfc..d56e3aef1 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -25,6 +25,45 @@ + + +
+
+
+ + Project name +
+
+ + +
+
+
+
@@ -35,6 +74,9 @@

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 basically good to go.

+

Regarding navbars

+

As a heads up, the navbar component is rather tricky here in that the styles for displaying it are rather specific and detailed. Overrides to ensure desktop styles display are not as performant or sleek as one would like. Just be aware there may be potential gotchas as you build on top of this example when using the navbar.

+

Non-responsive grid system

One third
@@ -48,5 +90,7 @@ + + diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css index 2864ca1c5..4928128e6 100644 --- a/examples/non-responsive/non-responsive.css +++ b/examples/non-responsive/non-responsive.css @@ -1,8 +1,38 @@ + +/* Template-specific stuff + * + * Customizations just for the template—these are not necessary for anything + * with disabling the responsiveness. + */ + +/* Account for fixed navbar */ +body { + padding-top: 70px; + padding-bottom: 30px; +} + +/* Finesse the page header spacing */ +.page-header { + margin-bottom: 30px; +} +.page-header .lead { + margin-bottom: 10px; +} + + +/* Non-responsive overrides + * + * Utilitze the following CSS to disable the responsive-ness of the container, + * grid system, and navbar. + */ + +/* Reset the container */ .container { max-width: none !important; width: 970px; } +/* Demonstrate the grids */ .col-xs-4 { padding-top: 15px; padding-bottom: 15px; @@ -11,3 +41,77 @@ background-color: rgba(86,61,124,.15); border: 1px solid rgba(86,61,124,.2); } + +.container .navbar-header, +.container .navbar-collapse { + margin-right: 0; + margin-left: 0; +} + +/* Always float the navbar header */ +.navbar-header { + float: left; +} + +/* Undo the collapsing navbar */ +.navbar-collapse { + display: block !important; + height: auto !important; + padding-bottom: 0; + overflow: visible !important; +} + +.navbar-toggle { + display: none; +} + +.navbar-brand { + margin-left: -15px; +} + +/* Always apply the floated nav */ +.navbar-nav { + float: left; + margin: 0; +} +.navbar-nav > li { + float: left; +} +.navbar-nav > li > a { + padding: 15px; +} + +/* Redeclare since we override the float above */ +.navbar-nav.navbar-right { + float: right; +} + +/* Undo custom dropdowns */ +.navbar .open .dropdown-menu { + position: absolute; + float: left; + background-color: #fff; + border: 1px solid #cccccc; + border: 1px solid rgba(0, 0, 0, 0.15); + border-width: 0 1px 1px; + border-radius: 0 0 4px 4px; + -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); + box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); +} +.navbar .open .dropdown-menu > li > a { + color: #333; +} +.navbar .open .dropdown-menu > li > a:hover, +.navbar .open .dropdown-menu > li > a:focus, +.navbar .open .dropdown-menu > .active > a, +.navbar .open .dropdown-menu > .active > a:hover, +.navbar .open .dropdown-menu > .active > a:focus { + color: #fff !important; + background-color: #428bca !important; +} +.navbar .open .dropdown-menu > .disabled > a, +.navbar .open .dropdown-menu > .disabled > a:hover, +.navbar .open .dropdown-menu > .disabled > a:focus { + color: #999 !important; + background-color: transparent !important; +} -- cgit v1.2.3 From 1bc13c659f1cadd66f1081c1a4f14a11c3b7cbf4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 18:44:40 -0700 Subject: don't include other navbar links in non responsive docs; use generic links --- examples/non-responsive/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index d56e3aef1..a5fd883bd 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -56,9 +56,9 @@
-- cgit v1.2.3 From 87a1d7e5a0bf0cbad69b39e8bca62b6e31d38dd8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 18 Aug 2013 18:47:05 -0700 Subject: update non responsive example --- examples/screenshots/non-responsive.jpg | Bin 43926 -> 61233 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/screenshots/non-responsive.jpg b/examples/screenshots/non-responsive.jpg index 7642d8a34..0b8953ce1 100644 Binary files a/examples/screenshots/non-responsive.jpg and b/examples/screenshots/non-responsive.jpg differ -- cgit v1.2.3