From f4877c236968ba61ac76f4862bba49e0354c60e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 21:13:33 -0700 Subject: [PATCH] fix up docs popover examples and copy --- docs/assets/css/bootstrap-responsive.css | 7 +++---- docs/assets/css/bootstrap.css | 3 ++- docs/assets/css/docs.css | 4 ++-- docs/javascript.html | 3 +-- docs/templates/pages/javascript.mustache | 3 +-- less/popovers.less | 3 ++- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 9a9bd33074..6a420b1795 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -800,16 +800,15 @@ .thumbnails { margin-left: 0; } + .thumbnails > li { + float: none; + } [class*="span"], .row-fluid [class*="span"] { display: block; float: none; width: auto; - max-width: 100%; margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; } .input-large, .input-xlarge, diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 61da2f4578..52dbf7a1c0 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4714,7 +4714,7 @@ input[type="submit"].btn.btn-mini { left: 0; z-index: 1010; display: none; - width: 218px; + width: 238px; background-color: #fff; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.2); @@ -4833,6 +4833,7 @@ input[type="submit"].btn.btn-mini { .popover-title { padding: 8px 14px; + margin: 0; font-size: 14px; font-weight: normal; line-height: 18px; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 9593ae772a..c5d92b613e 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -607,8 +607,8 @@ form.bs-docs-example { position: relative; display: block; float: left; - width: 210px; - margin: 10px; + width: 260px; + margin: 20px; } diff --git a/docs/javascript.html b/docs/javascript.html index 888391ba53..c17af37cd8 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -863,8 +863,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

Examples

-

Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover.

-

* Requires Tooltip to be included

+

Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover. Requires Tooltip to be included.

Static popover

Four options are available: top, right, bottom, and left aligned.

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 13d5285b70..d9ef68c7de 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -795,8 +795,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Examples{{/i}}

-

{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover.{{/i}}

-

* {{_i}}Requires Tooltip to be included{{/i}}

+

{{_i}}Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover. Requires Tooltip to be included.{{/i}}

{{_i}}Static popover{{/i}}

{{_i}}Four options are available: top, right, bottom, and left aligned.{{/i}}

diff --git a/less/popovers.less b/less/popovers.less index 5ea79cf73c..2d58a9a241 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -9,7 +9,7 @@ left: 0; z-index: @zindexPopover; display: none; - width: 218px; + width: 238px; background-color: #fff; -webkit-background-clip: padding-box; -moz-background-clip: padding; @@ -47,6 +47,7 @@ } .popover-title { + margin: 0; // reset heading margin padding: 8px 14px; font-size: 14px; font-weight: normal;