From 601013ca04d6374362c12af5dc48b8c1d44b93cc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 00:11:38 -0700 Subject: drop .muted for .text-muted --- docs/examples/carousel.html | 6 +++--- docs/examples/jumbotron-narrow.html | 2 +- docs/examples/justified-nav.html | 2 +- docs/examples/sticky-footer-navbar.html | 2 +- docs/examples/sticky-footer.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 598a6334b..dd0c3ca1f 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -369,7 +369,7 @@ body {
-

First featurette headling. It'll blow your mind.

+

First featurette headling. It'll blow your mind.

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.

@@ -377,7 +377,7 @@ body {
-

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

+

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

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.

@@ -385,7 +385,7 @@ body {
-

And lastly, this one. Checkmate.

+

And lastly, this one. Checkmate.

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.

diff --git a/docs/examples/jumbotron-narrow.html b/docs/examples/jumbotron-narrow.html index abf07dc72..84a918064 100644 --- a/docs/examples/jumbotron-narrow.html +++ b/docs/examples/jumbotron-narrow.html @@ -94,7 +94,7 @@ title: Narrow page template
  • About
  • Contact
    • -

    Project name

    +

    Project name

    diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html index 7013b150e..f136ee92a 100644 --- a/docs/examples/justified-nav.html +++ b/docs/examples/justified-nav.html @@ -96,7 +96,7 @@ title: Justified nav template
    -

    Project name

    +

    Project name

    • Home
    • Projects
      • diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index b00bfd5ab..9187b7882 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -112,6 +112,6 @@ title: Sticky footer with navbar template diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 722d3aa19..6ddd5a1dc 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/sticky-footer.html @@ -76,6 +76,6 @@ title: Sticky footer template -- cgit v1.2.3 From 70ba9a880e55a4607c413671c99926f7bba9362e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 22:53:35 -0700 Subject: remove padding form sign in form example --- docs/examples/signin.html | 1 - 1 file changed, 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/signin.html b/docs/examples/signin.html index ce3d312dc..673fc46c2 100644 --- a/docs/examples/signin.html +++ b/docs/examples/signin.html @@ -14,7 +14,6 @@ title: Sign in form template .form-signin { max-width: 300px; - padding: 30px; margin: 0 auto; } .form-signin .form-signin-heading, -- cgit v1.2.3 From 6c1ed5638b92b79c07a324268be204138812a048 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 30 Mar 2013 22:54:31 -0700 Subject: actually readd the padding and set it to smaller amount for narrow viewports --- docs/examples/signin.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/signin.html b/docs/examples/signin.html index 673fc46c2..92db3e036 100644 --- a/docs/examples/signin.html +++ b/docs/examples/signin.html @@ -13,7 +13,8 @@ title: Sign in form template } .form-signin { - max-width: 300px; + max-width: 330px; + padding: 15px; margin: 0 auto; } .form-signin .form-signin-heading, -- cgit v1.2.3 From b96ab36d384752c42947297ce3a2d1f0ba941c0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 31 Mar 2013 11:24:31 -0700 Subject: add some container padding for examples --- docs/examples/sticky-footer-navbar.html | 2 +- docs/examples/sticky-footer.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index 9187b7882..96b228212 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -50,7 +50,7 @@ title: Sticky footer with navbar template /* Not required for template or sticky footer method. */ #wrap > .container { - padding-top: 60px; + padding: 60px 15px 0; } .container .credit { margin: 20px 0; diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 6ddd5a1dc..1f27ffabc 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/sticky-footer.html @@ -50,6 +50,7 @@ title: Sticky footer template .container { width: auto; max-width: 680px; + padding: 0 15px; } .container .credit { margin: 20px 0; -- cgit v1.2.3 From d299ff4fce995543c29c0630d58d0a101c477b76 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sun, 31 Mar 2013 21:25:45 -0400 Subject: Fix image paths and carousel controls for carousel example --- docs/examples/carousel.html | 59 +++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 40 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index dd0c3ca1f..0c50c7a14 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -55,12 +55,6 @@ body { padding: 15px 20px; } -/* Offset the responsive button for proper vertical alignment */ -.navbar .navbar-toggle { - margin-top: 10px; -} - - /* CUSTOMIZE THE CAROUSEL -------------------------------------------------- */ @@ -75,16 +69,6 @@ body { z-index: 9; } -.carousel-control { - height: 80px; - margin-top: 0; - font-size: 120px; - text-shadow: 0 1px 1px rgba(0,0,0,.4); - background-color: transparent; - border: 0; - z-index: 10; -} - .carousel .item { height: 500px; } @@ -252,25 +236,21 @@ body {
      -
      -
      - - +
      + + + + + Project name -
      -
      -
      -
      - -
      -
      +
      +
    +
    +
    + @@ -368,7 +347,7 @@ body {
    - +

    First featurette headling. It'll blow your mind.

    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.

    @@ -376,7 +355,7 @@ body {
    - +

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

    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.

    @@ -384,7 +363,7 @@ body {
    - +

    And lastly, this one. Checkmate.

    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.

    -- cgit v1.2.3 From e183dd46a20daa725fe5ad7acb5313d7b20db6f1 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Mon, 1 Apr 2013 09:27:49 -0400 Subject: Update carousel-caption btn styles --- docs/examples/carousel.html | 2 -- 1 file changed, 2 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 0c50c7a14..e97d895c2 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -91,8 +91,6 @@ body { .carousel-caption .lead { margin: 0; line-height: 1.25; - color: #fff; - text-shadow: 0 1px 1px rgba(0,0,0,.4); } .carousel-caption .btn { margin-top: 10px; -- cgit v1.2.3 From 1816483baa9de59dc1ea0cec67fcbd00b28c6b79 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Mon, 1 Apr 2013 09:29:43 -0400 Subject: Add carousel indicators to example --- docs/examples/carousel.html | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index e97d895c2..925314922 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -273,6 +273,12 @@ body { -- cgit v1.2.3 From aa51a36686a62ad5ec0bac3958b08151fc9d5d05 Mon Sep 17 00:00:00 2001 From: Fabien Date: Tue, 2 Apr 2013 13:26:35 +0200 Subject: Fix corss link for sticky footer --- docs/examples/sticky-footer-navbar.html | 2 +- docs/examples/sticky-footer.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index 96b228212..716412a9d 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -104,7 +104,7 @@ title: Sticky footer with navbar template

    Sticky footer with fixed navbar

    Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added within #wrap with padding-top: 60px; on the .container.

    -

    Back to the default sticky footer minus the navbar.

    +

    Back to the default sticky footer minus the navbar.

    diff --git a/docs/examples/sticky-footer.html b/docs/examples/sticky-footer.html index 1f27ffabc..62c108812 100644 --- a/docs/examples/sticky-footer.html +++ b/docs/examples/sticky-footer.html @@ -69,7 +69,7 @@ title: Sticky footer template

    Sticky footer

    Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS.

    -

    Use the sticky footer with a fixed navbar if need be, too.

    +

    Use the sticky footer with a fixed navbar if need be, too.

    -- cgit v1.2.3 From e0bce6af123fc3d935a34aae87d0787e7e54e07f Mon Sep 17 00:00:00 2001 From: Fabien Date: Tue, 2 Apr 2013 13:30:13 +0200 Subject: Replace png img by holder.js in carousel example --- docs/examples/carousel.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index be75a5cc3..538a440da 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -245,7 +245,7 @@ body {
    - +

    Example headline.

    @@ -255,7 +255,7 @@ body {
    - +

    Another example headline.

    @@ -265,7 +265,7 @@ body {
    - +

    One more for good measure.

    @@ -315,7 +315,7 @@ body {
    - +

    First featurette headling. It'll blow your mind.

    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.

    @@ -323,7 +323,7 @@ body {
    - +

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

    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.

    @@ -331,7 +331,7 @@ body {
    - +

    And lastly, this one. Checkmate.

    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.

    -- cgit v1.2.3 From e56461fbd71af38cabff4cc650f6050f765ec603 Mon Sep 17 00:00:00 2001 From: Fabien Date: Tue, 2 Apr 2013 13:39:04 +0200 Subject: Improve responsiveness for tablet and below of navbar in carousel example - Remove margin-top of navbar-wrapper - Remove border radius of navbar - Space out the carousel --- docs/examples/carousel.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 538a440da..e86029221 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -189,6 +189,18 @@ body { font-size: 18px; line-height: 1.5; } + + .navbar-wrapper { + margin-top: 0; + } + + .navbar { + border-radius: 0; + } + + #myCarousel { + margin-top: 54px; + } } -- cgit v1.2.3 From 0ac711059ba7aaa2996a529d7f9bf4110a6dd765 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 2 Apr 2013 16:17:04 -0700 Subject: refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first --- docs/examples/carousel.html | 90 ++++++++++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 34 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index e86029221..792949fb0 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -27,11 +27,10 @@ body { left: 0; right: 0; z-index: 10; - margin-top: 20px; - margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */ } + /* CUSTOMIZE THE CAROUSEL -------------------------------------------------- */ @@ -39,12 +38,12 @@ body { .carousel { margin-bottom: 60px; } - -.carousel .container { - position: relative; - z-index: 9; +/* Since positioning the image, we need to help out the caption */ +.carousel-caption { + z-index: 10; } +/* Declare heights because of positioning of img element */ .carousel .item { height: 500px; } @@ -56,26 +55,21 @@ body { height: 500px; } -.carousel-caption { - background-color: transparent; - position: static; - max-width: 550px; - padding: 0 20px; - margin-top: 200px; -} - -.carousel-caption .btn { - margin-top: 10px; -} - /* MARKETING CONTENT -------------------------------------------------- */ +/* Pad the edges of the mobile views a bit */ +.marketing { + padding-left: 15px; + padding-right: 15px; +} + /* Center align the text within the three columns below the carousel */ .marketing .col-span-4 { text-align: center; + margin-bottom: 20px; } .marketing h2 { font-weight: normal; @@ -121,7 +115,35 @@ body { /* RESPONSIVE CSS -------------------------------------------------- */ -@media (max-width: 979px) { +@media (min-width: 768px) { + + /* Remve the edge padding needed for mobile */ + .marketing { + padding-left: 0; + padding-right: 0; + } + + /* Navbar positioning foo */ + .navbar-wrapper { + margin-top: 20px; + margin-bottom: -90px; /* Negative margin to pull up carousel. 90px is roughly margins and height of navbar. */ + } + /* The navbar becomes detached from the top, so we round the corners */ + .navbar-wrapper .navbar { + border-radius: 4px; + } + + /* Bump up size of carousel content */ + .carousel-caption p { + margin-bottom: 20px; + font-size: 21px; + line-height: 1.4; + } + +} + + +/*@media (max-width: 979px) { .container.navbar-wrapper { margin-bottom: 0; @@ -189,7 +211,7 @@ body { font-size: 18px; line-height: 1.5; } - + .navbar-wrapper { margin-top: 0; } @@ -197,12 +219,12 @@ body { .navbar { border-radius: 0; } - + #myCarousel { margin-top: 54px; } -} +}*/ @@ -212,7 +234,7 @@ body {
    -
    +
    @@ -257,32 +279,32 @@ body {
    - +

    Example headline.

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    -     Sign up today +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    +

    Sign up today

    - +

    Another example headline.

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    - Learn more +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    +

    Learn more

    - +

    One more for good measure.

    -

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    - Browse gallery +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

    +

    Browse gallery

    @@ -304,13 +326,13 @@ body {

    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, vel scelerisque nisl consectetur et.

    +

    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 »

    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, ut fermentum massa justo sit amet risus.

    +

    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 »

    -- cgit v1.2.3 From ddc0e98716d05b2b583c0097a8fc76f976730fc6 Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sun, 28 Apr 2013 09:10:01 -0400 Subject: Update examples after overhaul of navbar navs --- docs/examples/carousel.html | 2 +- docs/examples/jumbotron.html | 2 +- docs/examples/justified-nav.html | 2 +- docs/examples/navbar-fixed-top.html | 2 +- docs/examples/navbar-static-top.html | 2 +- docs/examples/navbar.html | 2 +- docs/examples/starter-template.html | 2 +- docs/examples/sticky-footer-navbar.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 792949fb0..4142b38f4 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -243,7 +243,7 @@ body { Project name
    -
      +
      • Home
      • About
      • Contact
        • diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html index 86d035f07..68231a063 100644 --- a/docs/examples/jumbotron.html +++ b/docs/examples/jumbotron.html @@ -46,7 +46,7 @@ title: Jumbotron template Project name
        -
          +
          • Home
          • About
          • Contact
            • diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html index f136ee92a..f8123388a 100644 --- a/docs/examples/justified-nav.html +++ b/docs/examples/justified-nav.html @@ -97,7 +97,7 @@ title: Justified nav template

            Project name

            -
              +
              • Home
              • Projects
              • Services
                • diff --git a/docs/examples/navbar-fixed-top.html b/docs/examples/navbar-fixed-top.html index 06ed424c2..906ca32c9 100644 --- a/docs/examples/navbar-fixed-top.html +++ b/docs/examples/navbar-fixed-top.html @@ -27,7 +27,7 @@ title: Fixed navbar template Project name
                -
                  +
                  • Home
                  • About
                  • Contact
                    • diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html index 9a234114f..d636cbd3b 100644 --- a/docs/examples/navbar-static-top.html +++ b/docs/examples/navbar-static-top.html @@ -23,7 +23,7 @@ title: Static navbar template Project name
                    -
                      +
                      • Home
                      • About
                      • Contact
                        • diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html index 5b5ffb77b..a74f3b356 100644 --- a/docs/examples/navbar.html +++ b/docs/examples/navbar.html @@ -29,7 +29,7 @@ title: Navbar template Project name
                        -
                          +
                          • Home
                          • About
                          • Contact
                            • diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index 62da929da..18fdaf5fc 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -24,7 +24,7 @@ title: Starter template Project name
                            -
                              +
                              • Home
                              • About
                              • Contact
                                • diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index 716412a9d..429b74f91 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -77,7 +77,7 @@ title: Sticky footer with navbar template Project name
                                -
                                  +
                                  • Home
                                  • About
                                  • Contact
                                    • -- cgit v1.2.3 From 62afdd01763466e413fbe67c7622e08a16fa30aa Mon Sep 17 00:00:00 2001 From: Robert Burns Date: Sun, 28 Apr 2013 22:22:33 -0400 Subject: Update examples after grid changes --- docs/examples/carousel.html | 16 ++++++++-------- docs/examples/grid.html | 18 +++++++++--------- docs/examples/jumbotron-narrow.html | 4 ++-- docs/examples/jumbotron.html | 6 +++--- docs/examples/justified-nav.html | 6 +++--- 5 files changed, 25 insertions(+), 25 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 4142b38f4..954375d4b 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -67,14 +67,14 @@ body { } /* Center align the text within the three columns below the carousel */ -.marketing .col-span-4 { +.marketing .col-lg-4 { text-align: center; margin-bottom: 20px; } .marketing h2 { font-weight: normal; } -.marketing .col-span-4 p { +.marketing .col-lg-4 p { margin-left: 10px; margin-right: 10px; } @@ -323,24 +323,24 @@ body {
                                    -
                                    +

                                    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 »

                                    -
                                    -
                                    +
                                    +

                                    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 »

                                    -
                                    -
                                    +
                                    +

                                    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 »

                                    -
                                    +
                                    diff --git a/docs/examples/grid.html b/docs/examples/grid.html index f2028b8bf..580f69cbf 100644 --- a/docs/examples/grid.html +++ b/docs/examples/grid.html @@ -16,7 +16,7 @@ title: Grid template margin-left: -15px; margin-right: -15px; } - [class*="col-span-"] { + [class*="col-lg-"] { padding-top: 15px; padding-bottom: 15px; background-color: #f5f5f5; @@ -32,22 +32,22 @@ title: Grid template

                                    Three equal columns

                                    -
                                    .col-span-4
                                    -
                                    .col-span-4
                                    -
                                    .col-span-4
                                    +
                                    .col .col-lg-4
                                    +
                                    .col .col-lg-4
                                    +
                                    .col .col-lg-4

                                    Three unequal columns

                                    -
                                    .col-span-3
                                    -
                                    .col-span-6
                                    -
                                    .col-span-3
                                    +
                                    .col .col-lg-3
                                    +
                                    .col .col-lg-6
                                    +
                                    .col .col-lg-3

                                    Two columns

                                    -
                                    .col-span-8
                                    -
                                    .col-span-4
                                    +
                                    .col .col-lg-8
                                    +
                                    .col .col-lg-4

                                    Full width, single column

                                    diff --git a/docs/examples/jumbotron-narrow.html b/docs/examples/jumbotron-narrow.html index 84a918064..a6fd4e950 100644 --- a/docs/examples/jumbotron-narrow.html +++ b/docs/examples/jumbotron-narrow.html @@ -104,7 +104,7 @@ title: Narrow page template
                                -
                                +

                                Subheading

                                Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

                                @@ -115,7 +115,7 @@ title: Narrow page template

                                Maecenas sed diam eget risus varius blandit sit amet non magna.

                                -
                                +

                                Subheading

                                Donec id elit non mi porta gravida at eget metus. Maecenas faucibus mollis interdum.

                                diff --git a/docs/examples/jumbotron.html b/docs/examples/jumbotron.html index 68231a063..3982a34d9 100644 --- a/docs/examples/jumbotron.html +++ b/docs/examples/jumbotron.html @@ -85,17 +85,17 @@ title: Jumbotron template
                                -
                                +

                                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 »

                                diff --git a/docs/examples/justified-nav.html b/docs/examples/justified-nav.html index f8123388a..a87b3b9d1 100644 --- a/docs/examples/justified-nav.html +++ b/docs/examples/justified-nav.html @@ -119,17 +119,17 @@ title: Justified nav template
                                -
                                +

                                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 a62e97091c6c1bd732a8f7e0761e724dfe50e0df Mon Sep 17 00:00:00 2001 From: Seth Lilly Date: Thu, 2 May 2013 14:03:54 -0300 Subject: Corrected typo in carousel.html Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag. --- docs/examples/carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel.html b/docs/examples/carousel.html index 954375d4b..cd6855aab 100644 --- a/docs/examples/carousel.html +++ b/docs/examples/carousel.html @@ -350,7 +350,7 @@ body {
                                -

                                First featurette headling. It'll blow your mind.

                                +

                                First featurette heading. It'll blow your mind.

                                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.

                                -- cgit v1.2.3 From 07117f97b6a156d1ddff0292c907599fb33d602a Mon Sep 17 00:00:00 2001 From: Kevin Ingersoll Date: Fri, 3 May 2013 15:22:27 +1200 Subject: Use padding instead of #push with box-sizing: border-box --- docs/examples/sticky-footer-navbar.html | 7 ++----- docs/examples/sticky-footer.html | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/sticky-footer-navbar.html b/docs/examples/sticky-footer-navbar.html index 429b74f91..fe6681ef6 100644 --- a/docs/examples/sticky-footer-navbar.html +++ b/docs/examples/sticky-footer-navbar.html @@ -22,14 +22,13 @@ title: Sticky footer with navbar template height: 100%; /* Negative indent footer by its height */ margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; } /* Set the fixed height of the footer here */ - #push, #footer { height: 60px; - } - #footer { background-color: #f5f5f5; } @@ -106,8 +105,6 @@ title: Sticky footer with navbar template

                                Pin a fixed-height footer to the bottom of the viewport in desktop browsers with this custom HTML and CSS. A fixed navbar has been added within #wrap with padding-top: 60px; on the .container.

                                Back to the default sticky footer minus the navbar.

                                - -
                                - -
                            -
                              +
                              • Default
                              • Static top
                              • Fixed top
                                • diff --git a/docs/examples/navbar-static-top.html b/docs/examples/navbar-static-top.html index d636cbd3b..065d16d5f 100644 --- a/docs/examples/navbar-static-top.html +++ b/docs/examples/navbar-static-top.html @@ -40,11 +40,11 @@ title: Static navbar template
                            - +
                    diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html index a74f3b356..4c0f9938b 100644 --- a/docs/examples/navbar.html +++ b/docs/examples/navbar.html @@ -46,7 +46,7 @@ title: Navbar template
                -