From 56aa2af6e1eb10d1e7873393e46537e20ff4f43b Mon Sep 17 00:00:00 2001 From: maxwellium Date: Fri, 1 Nov 2013 22:51:11 +0100 Subject: otherwise content scrolls on chrome without change, body scrolls on chrome Version 30.0.1599.101 (OSX 10.9) --- examples/offcanvas/offcanvas.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/offcanvas/offcanvas.css b/examples/offcanvas/offcanvas.css index 71ad2ac2c..ef632dc00 100644 --- a/examples/offcanvas/offcanvas.css +++ b/examples/offcanvas/offcanvas.css @@ -2,7 +2,8 @@ * Style tweaks * -------------------------------------------------- */ -html { +html, +body { overflow-x: hidden; /* Prevent scroll on narrow devices */ } body { -- cgit v1.2.3 From c6244a94d0af91faefa337b1f83965241f3694e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Nov 2013 22:41:43 -0800 Subject: Shorten sticky footer examples footer content to prevent wrapping --- examples/sticky-footer-navbar/index.html | 2 +- examples/sticky-footer-navbar/sticky-footer-navbar.css | 2 +- examples/sticky-footer/index.html | 2 +- examples/sticky-footer/sticky-footer.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'examples') diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index fb8607440..35641e35a 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -77,7 +77,7 @@ diff --git a/examples/sticky-footer-navbar/sticky-footer-navbar.css b/examples/sticky-footer-navbar/sticky-footer-navbar.css index 4869de0e6..7ca093add 100644 --- a/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/examples/sticky-footer-navbar/sticky-footer-navbar.css @@ -31,7 +31,7 @@ body { #wrap > .container { padding: 60px 15px 0; } -.container .credit { +.container .text-muted { margin: 20px 0; } diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html index b52754df9..e5807130e 100644 --- a/examples/sticky-footer/index.html +++ b/examples/sticky-footer/index.html @@ -43,7 +43,7 @@ diff --git a/examples/sticky-footer/sticky-footer.css b/examples/sticky-footer/sticky-footer.css index db69addbb..54ed9e876 100644 --- a/examples/sticky-footer/sticky-footer.css +++ b/examples/sticky-footer/sticky-footer.css @@ -33,6 +33,6 @@ body { max-width: 680px; padding: 0 15px; } -.container .credit { +.container .text-muted { margin: 20px 0; } -- cgit v1.2.3 From 33160d50437e1f26e1ddc7d126e528f41a8bc6a0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Dec 2013 18:06:57 -0800 Subject: Fixes #9927: Update non-responsive example to prevent .navbar-collapse border from increasing height and increase specificity of nav selectors to keep dropdowns looking the same --- examples/non-responsive/non-responsive.css | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/non-responsive/non-responsive.css b/examples/non-responsive/non-responsive.css index 526b0b8be..9813bb9fe 100644 --- a/examples/non-responsive/non-responsive.css +++ b/examples/non-responsive/non-responsive.css @@ -8,6 +8,7 @@ body { padding-top: 70px; padding-bottom: 30px; + min-width: 970px; } /* Finesse the page header spacing */ @@ -63,6 +64,9 @@ body { .navbar-toggle { display: none; } +.navbar-collapse { + border-top: 0; +} .navbar-brand { margin-left: -15px; @@ -86,7 +90,7 @@ body { } /* Undo custom dropdowns */ -.navbar .open .dropdown-menu { +.navbar .navbar-nav .open .dropdown-menu { position: absolute; float: left; background-color: #fff; @@ -97,20 +101,20 @@ body { -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 { +.navbar-default .navbar-nav .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 { +.navbar .navbar-nav .open .dropdown-menu > li > a:hover, +.navbar .navbar-nav .open .dropdown-menu > li > a:focus, +.navbar .navbar-nav .open .dropdown-menu > .active > a, +.navbar .navbar-nav .open .dropdown-menu > .active > a:hover, +.navbar .navbar-nav .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 { +.navbar .navbar-nav .open .dropdown-menu > .disabled > a, +.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover, +.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus { color: #999 !important; background-color: transparent !important; } -- cgit v1.2.3 From 89061b0517f716b9fbb7a1d7ec75afe37e051370 Mon Sep 17 00:00:00 2001 From: Joah Gerstenberg Date: Wed, 4 Dec 2013 06:26:12 -0600 Subject: Updates Bootstrap thumbnail --- examples/screenshots/jumbotron.jpg | Bin 77911 -> 122180 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg index 46bce0c53..60c0b79c2 100644 Binary files a/examples/screenshots/jumbotron.jpg and b/examples/screenshots/jumbotron.jpg differ -- cgit v1.2.3 From 73bc7d9f12b24ac71eed830ac1c345e890bc27c3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 20:51:25 -0800 Subject: Add new template, Dashboard --- examples/dashboard/dashboard.css | 93 ++++++++++++++ examples/dashboard/index.html | 243 +++++++++++++++++++++++++++++++++++++ examples/screenshots/dashboard.jpg | Bin 0 -> 104850 bytes 3 files changed, 336 insertions(+) create mode 100644 examples/dashboard/dashboard.css create mode 100644 examples/dashboard/index.html create mode 100644 examples/screenshots/dashboard.jpg (limited to 'examples') diff --git a/examples/dashboard/dashboard.css b/examples/dashboard/dashboard.css new file mode 100644 index 000000000..750124bf8 --- /dev/null +++ b/examples/dashboard/dashboard.css @@ -0,0 +1,93 @@ +/* + * Base structure + */ + +/* Move down content because we have a fixed navbar that is 50px tall */ +body { + padding-top: 50px; +} + + +/* + * Global add-ons + */ + +.sub-header { + padding-bottom: 10px; + border-bottom: 1px solid #eee; +} + + +/* + * Sidebar + */ + +/* Hide for mobile, show later */ +.sidebar { + display: none; +} +@media (min-width: 768px) { + .sidebar { + position: fixed; + top: 0; + left: 0; + bottom: 0; + z-index: 1000; + display: block; + padding: 70px 20px 20px; + background-color: #f5f5f5; + border-right: 1px solid #eee; + } +} + +/* Sidebar navigation */ +.nav-sidebar { + margin-left: -20px; + margin-right: -21px; /* 20px padding + 1px border */ + margin-bottom: 20px; +} +.nav-sidebar > li > a { + padding-left: 20px; + padding-right: 20px; +} +.nav-sidebar > .active > a { + color: #fff; + background-color: #428bca; +} + + +/* + * Main content + */ + +.main { + padding: 20px; +} +@media (min-width: 768px) { + .main { + padding-left: 40px; + pading-right: 40px; + } +} +.main .page-header { + margin-top: 0; +} + + +/* + * Placeholder dashboard ideas + */ + +.placeholders { + margin-bottom: 30px; + text-align: center; +} +.placeholders h4 { + margin-bottom: 0; +} +.placeholder { + margin-bottom: 20px; +} +.placeholder img { + border-radius: 50%; +} diff --git a/examples/dashboard/index.html b/examples/dashboard/index.html new file mode 100644 index 000000000..47ca987de --- /dev/null +++ b/examples/dashboard/index.html @@ -0,0 +1,243 @@ + + + + + + + + + + + Dashboard Template for Bootstrap + + + + + + + + + + + + + + + + + + +
+
+ +
+

Dashboard

+ +
+
+ Generic placeholder thumbnail +

Label

+ Something else +
+
+ Generic placeholder thumbnail +

Label

+ Something else +
+
+ Generic placeholder thumbnail +

Label

+ Something else +
+
+ Generic placeholder thumbnail +

Label

+ Something else +
+
+ +

Section title

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#HeaderHeaderHeaderHeader
1,001Loremipsumdolorsit
1,002ametconsecteturadipiscingelit
1,003IntegernecodioPraesent
1,003liberoSedcursusante
1,004dapibusdiamSednisi
1,005Nullaquissemat
1,006nibhelementumimperdietDuis
1,007sagittisipsumPraesentmauris
1,008Fuscenectellussed
1,009auguesemperportaMauris
1,010massaVestibulumlaciniaarcu
1,011egetnullaClassaptent
1,012tacitisociosquadlitora
1,013torquentperconubianostra
1,014perinceptoshimenaeosCurabitur
1,015sodalesligulainlibero
+
+
+
+
+ + + + + + + + diff --git a/examples/screenshots/dashboard.jpg b/examples/screenshots/dashboard.jpg new file mode 100644 index 000000000..3da6d11b3 Binary files /dev/null and b/examples/screenshots/dashboard.jpg differ -- cgit v1.2.3 From 90cbfc76e48659ac657ab272df9d37f99ca57cd4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 23:23:41 -0800 Subject: Add new template, Cover --- examples/cover/cover.css | 160 +++++++++++++++++++++++++++++++++++++++++ examples/cover/index.html | 75 +++++++++++++++++++ examples/screenshots/cover.jpg | Bin 0 -> 42977 bytes 3 files changed, 235 insertions(+) create mode 100644 examples/cover/cover.css create mode 100644 examples/cover/index.html create mode 100644 examples/screenshots/cover.jpg (limited to 'examples') diff --git a/examples/cover/cover.css b/examples/cover/cover.css new file mode 100644 index 000000000..177ce03bf --- /dev/null +++ b/examples/cover/cover.css @@ -0,0 +1,160 @@ +/* + * Globals + */ + +/* Links */ +a, +a:focus, +a:hover { + color: #fff; +} + +/* Custom default button */ +.btn-default, +.btn-default:hover, +.btn-default:focus { + color: #333; + text-shadow: none; /* Prevent inheritence from `body` */ + background-color: #fff; + border: 1px solid #fff; +} + + +/* + * Base structure + */ + +html, +body { + height: 100%; + background-color: #333; +} +body { + color: #fff; + text-align: center; + text-shadow: 0 1px 3px rgba(0,0,0,.5); + box-shadow: inset 0 0 100px rgba(0,0,0,.5); +} + +/* Extra markup and styles for table-esque vertical and horizontal centering */ +.site-wrapper { + display: table; + width: 100%; + min-height: 100%; +} +.site-wrapper-inner { + display: table-cell; + vertical-align: top; +} +.cover-container { + margin-left: auto; + margin-right: auto; +} + +/* Padding for spacing */ +.inner { + padding: 30px; +} + + +/* + * Header + */ +.masthead-brand { + margin-top: 10px; + margin-bottom: 10px; +} + +.masthead-nav > li { + display: inline-block; +} +.masthead-nav > li + li { + margin-left: 20px; +} +.masthead-nav > li > a { + padding-left: 0; + padding-right: 0; + font-size: 16px; + font-weight: bold; + color: #fff; /* IE8 proofing */ + color: rgba(255,255,255,.75); + border-bottom: 2px solid transparent; +} +.masthead-nav > li > a:hover, +.masthead-nav > li > a:focus { + background-color: transparent; + border-bottom-color: rgba(255,255,255,.25); +} +.masthead-nav > .active > a, +.masthead-nav > .active > a:hover, +.masthead-nav > .active > a:focus { + color: #fff; + border-bottom-color: #fff; +} + +@media (min-width: 768px) { + .masthead-brand { + float: left; + } + .masthead-nav { + float: right; + } +} + + +/* + * Cover + */ + +.cover { + padding: 0 20px; +} +.cover .btn-lg { + padding: 10px 20px; + font-weight: bold; +} + + +/* + * Footer + */ + +.mastfoot { + color: #999; /* IE8 proofing */ + color: rgba(255,255,255,.5); +} + + +/* + * Affix and center + */ + +@media (min-width: 768px) { + /* Pull out the header and footer */ + .masthead { + position: fixed; + top: 0; + } + .mastfoot { + position: fixed; + bottom: 0; + } + /* Start the vertical centering */ + .site-wrapper-inner { + vertical-align: middle; + } + /* Handle the widths */ + .masthead, + .mastfoot, + .cover-container { + width: 100%; /* Must be percentage or pixels for horizontal alignment */ + } +} + +@media (min-width: 992px) { + .masthead, + .mastfoot, + .cover-container { + width: 700px; + } +} diff --git a/examples/cover/index.html b/examples/cover/index.html new file mode 100644 index 000000000..ae9ca1829 --- /dev/null +++ b/examples/cover/index.html @@ -0,0 +1,75 @@ + + + + + + + + + + + Cover Template for Bootstrap + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+
+

Cover

+ +
+
+ +
+

Cover your page.

+

Cover is a one-page template for building simple and beautiful home pages. Download, edit the text, and add your own fullscreen background photo to make it your own.

+

+ Learn more +

+
+ +
+
+

Cover template for Bootstrap, by @mdo.

+
+
+ +
+ +
+ +
+ + + + + + + + diff --git a/examples/screenshots/cover.jpg b/examples/screenshots/cover.jpg new file mode 100644 index 000000000..d627519b6 Binary files /dev/null and b/examples/screenshots/cover.jpg differ -- cgit v1.2.3 From d70f4e895cfbe8915920d149bdcde8a14c9dab88 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Dec 2013 23:49:03 -0800 Subject: image compression --- examples/screenshots/cover.jpg | Bin 42977 -> 36631 bytes examples/screenshots/dashboard.jpg | Bin 104850 -> 105375 bytes examples/screenshots/jumbotron.jpg | Bin 122180 -> 101215 bytes examples/screenshots/theme.jpg | Bin 95407 -> 85467 bytes 4 files changed, 0 insertions(+), 0 deletions(-) (limited to 'examples') diff --git a/examples/screenshots/cover.jpg b/examples/screenshots/cover.jpg index d627519b6..2a81259de 100644 Binary files a/examples/screenshots/cover.jpg and b/examples/screenshots/cover.jpg differ diff --git a/examples/screenshots/dashboard.jpg b/examples/screenshots/dashboard.jpg index 3da6d11b3..fb7b0526d 100644 Binary files a/examples/screenshots/dashboard.jpg and b/examples/screenshots/dashboard.jpg differ diff --git a/examples/screenshots/jumbotron.jpg b/examples/screenshots/jumbotron.jpg index 60c0b79c2..30c11a2c8 100644 Binary files a/examples/screenshots/jumbotron.jpg and b/examples/screenshots/jumbotron.jpg differ diff --git a/examples/screenshots/theme.jpg b/examples/screenshots/theme.jpg index ef47acb9c..ad527b55a 100644 Binary files a/examples/screenshots/theme.jpg and b/examples/screenshots/theme.jpg differ -- cgit v1.2.3 From e349fb2114804f35e8602a3936b84242ae32420e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Dec 2013 02:14:43 -0800 Subject: fix validation failure --- examples/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/dashboard/index.html b/examples/dashboard/index.html index 47ca987de..e721aa16a 100644 --- a/examples/dashboard/index.html +++ b/examples/dashboard/index.html @@ -46,7 +46,7 @@
  • Profile
  • Help
  • - -- cgit v1.2.3