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/non-responsive/index.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'examples/non-responsive') 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 @@ - -- 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/non-responsive') 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/non-responsive') 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