From 5fd8ca9089aaaf9af2bf9282f3b95343db896eb9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 10:50:54 -0700 Subject: fixes #13210: clean up tooltip example --- docs/examples/tooltip-viewport/index.html | 18 ++++++++---------- docs/examples/tooltip-viewport/tooltip-viewport.css | 16 +++++++--------- 2 files changed, 15 insertions(+), 19 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html index dc0b47310..ddeb70774 100644 --- a/docs/examples/tooltip-viewport/index.html +++ b/docs/examples/tooltip-viewport/index.html @@ -32,21 +32,19 @@ - - - + + + -

There is a button down there ↓

- - +

- - + + - + - +

diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.css b/docs/examples/tooltip-viewport/tooltip-viewport.css index b9a237cfc..4eff7f685 100644 --- a/docs/examples/tooltip-viewport/tooltip-viewport.css +++ b/docs/examples/tooltip-viewport/tooltip-viewport.css @@ -8,18 +8,16 @@ body { .tooltip .tooltip-inner { min-width: 250px; max-width: 500px; - min-height: 200px; -} -.placeholder { - height: 900px; + min-height: 100px; + text-align: left; } .container-viewport { position: absolute; - top: 600px; - left: 200px; - width: 600px; - height: 400px; - background: #c00; + top: 100px; + left: 250px; + right: 250px; + height: 300px; + background-color: #eee; } .btn-bottom { position: absolute; -- cgit v1.2.3 From 1e3b93804fa88d247d8708529fb44b28d73fd91f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 11:18:59 -0700 Subject: grunt --- docs/examples/tooltip-viewport/tooltip-viewport.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/tooltip-viewport/tooltip-viewport.css b/docs/examples/tooltip-viewport/tooltip-viewport.css index 4eff7f685..26aa2e348 100644 --- a/docs/examples/tooltip-viewport/tooltip-viewport.css +++ b/docs/examples/tooltip-viewport/tooltip-viewport.css @@ -14,8 +14,8 @@ body { .container-viewport { position: absolute; top: 100px; - left: 250px; right: 250px; + left: 250px; height: 300px; background-color: #eee; } -- cgit v1.2.3 From d1cf27bd0336b0dcec3fd40314e405e2a5bc0a66 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 8 Jun 2014 13:28:45 -0700 Subject: fix nested containers (addresses some of #13682) --- docs/examples/carousel/carousel.css | 17 ++++------------- docs/examples/theme/theme.css | 4 ++++ 2 files changed, 8 insertions(+), 13 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/carousel/carousel.css b/docs/examples/carousel/carousel.css index 08448b99c..bd7567af3 100644 --- a/docs/examples/carousel/carousel.css +++ b/docs/examples/carousel/carousel.css @@ -22,7 +22,7 @@ body { } /* Flip around the padding for proper display in narrow viewports */ -.navbar-wrapper .container { +.navbar-wrapper > .container { padding-right: 0; padding-left: 0; } @@ -30,6 +30,9 @@ body { padding-right: 15px; padding-left: 15px; } +.navbar-wrapper .navbar .container { + width: auto; +} /* CUSTOMIZE THE CAROUSEL @@ -63,12 +66,6 @@ body { /* MARKETING CONTENT -------------------------------------------------- */ -/* Pad the edges of the mobile views a bit */ -.marketing { - padding-right: 15px; - padding-left: 15px; -} - /* Center align the text within the three columns below the carousel */ .marketing .col-lg-4 { margin-bottom: 20px; @@ -104,12 +101,6 @@ body { @media (min-width: 768px) { - /* Remove the edge padding needed for mobile */ - .marketing { - padding-right: 0; - padding-left: 0; - } - /* Navbar positioning foo */ .navbar-wrapper { margin-top: 20px; diff --git a/docs/examples/theme/theme.css b/docs/examples/theme/theme.css index 181f99842..b7c8d4cd2 100644 --- a/docs/examples/theme/theme.css +++ b/docs/examples/theme/theme.css @@ -12,3 +12,7 @@ body { .theme-showcase > p > .btn { margin: 5px 0; } + +.theme-showcase .navbar .container { + width: auto; +} -- cgit v1.2.3