From 7823136a797f199ff77c022873d9a1091e4c2d8d Mon Sep 17 00:00:00 2001 From: Lipis Date: Thu, 19 Sep 2013 20:48:16 +0200 Subject: Removed the unnecessary override and the !important from .wrap In the sticky footer example there were some weird stuff.. --- examples/sticky-footer/sticky-footer.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/sticky-footer/sticky-footer.css b/examples/sticky-footer/sticky-footer.css index 45be6ccbc..db69addbb 100644 --- a/examples/sticky-footer/sticky-footer.css +++ b/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 +} -- cgit v1.2.3 From c6eca2c9ca8db3ece7c4492b15c25e0d677fa7a5 Mon Sep 17 00:00:00 2001 From: Lipis Date: Thu, 19 Sep 2013 20:49:16 +0200 Subject: Same fix for the navbar example of sticky footer --- examples/sticky-footer-navbar/sticky-footer-navbar.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/sticky-footer-navbar/sticky-footer-navbar.css b/examples/sticky-footer-navbar/sticky-footer-navbar.css index 6978a9997..4869de0e6 100644 --- a/examples/sticky-footer-navbar/sticky-footer-navbar.css +++ b/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 +} -- cgit v1.2.3 From e486bb4f39e79dd55b3c68af134a4624b2fa4c08 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 20:30:16 -0700 Subject: Fixes #10433: Navbar z-index refactor * Resets the default navbar z-index to auto at a certain breakpoint * Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar) --- examples/theme/index.html | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'examples') diff --git a/examples/theme/index.html b/examples/theme/index.html index a0bad8793..bfa8efdcb 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -159,6 +159,18 @@
  • Home
  • About
  • Contact
    • +
  • + Dropdown + +
    • @@ -179,6 +191,18 @@
  • Home
  • About
  • Contact
    • +
  • + Dropdown + +
    • -- cgit v1.2.3 From c71f89518f88d05e4a2f202264498ac85242fcbd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 20 Oct 2013 21:11:51 -0700 Subject: Fix up padding on default navbar example --- examples/navbar/navbar.css | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'examples') diff --git a/examples/navbar/navbar.css b/examples/navbar/navbar.css index f593a6bfc..d2195240b 100644 --- a/examples/navbar/navbar.css +++ b/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; +} -- cgit v1.2.3 From 54cd0f8c2f1aaadefd8447f9ff4cd9bb04fe4e72 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 23 Oct 2013 23:41:17 -0700 Subject: rm dummy 'src' attributes of s & squelch validator warning; fixes #11216 --- examples/carousel/index.html | 18 +++++++++--------- examples/theme/index.html | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/carousel/index.html b/examples/carousel/index.html index a9d5d02bb..7cea9bb4f 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -78,7 +78,7 @@
    - First slide + First slide

    Example headline.

    @@ -88,7 +88,7 @@
    - Second slide + Second slide

    Another example headline.

    @@ -98,7 +98,7 @@
    - Third slide + Third slide

    One more for good measure.

    @@ -123,19 +123,19 @@
    - Generic placeholder image + Generic placeholder image

    Heading

    Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.

    View details »

    - Generic placeholder image + Generic placeholder image

    Heading

    Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.

    View details »

    - Generic placeholder image + Generic placeholder image

    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 »

    @@ -153,7 +153,7 @@

    Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

    - Generic placeholder image + Generic placeholder image
    @@ -161,7 +161,7 @@
    - Generic placeholder image + Generic placeholder image

    Oh yeah, it's that good. See for yourself.

    @@ -177,7 +177,7 @@

    Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.

    - Generic placeholder image + Generic placeholder image
    diff --git a/examples/theme/index.html b/examples/theme/index.html index bfa8efdcb..2573bb31d 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -119,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 -- cgit v1.2.3 From ee9663728417dfbe9575d376c4fd2563a3787428 Mon Sep 17 00:00:00 2001 From: wangsai Date: Wed, 30 Oct 2013 00:13:35 +0800 Subject: remove unused `{{ page.base_url }}` variables, and fix the urls --- examples/carousel/index.html | 2 +- examples/grid/index.html | 2 +- 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/non-responsive/index.html | 2 +- examples/offcanvas/index.html | 2 +- examples/signin/index.html | 2 +- examples/starter-template/index.html | 2 +- examples/sticky-footer-navbar/index.html | 2 +- examples/sticky-footer/index.html | 2 +- examples/theme/index.html | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) (limited to 'examples') diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 7cea9bb4f..14674eebc 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -14,7 +14,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + -
    + + +
    +
    +
    + + + +
    +
    +

    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