diff options
| author | Mark Otto <[email protected]> | 2013-02-05 22:42:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-02-05 22:42:54 -0800 |
| commit | 421f9f67c44d4b7c971b42808687ae7b71c99151 (patch) | |
| tree | 4aa1c698f535d8ae8f7aae7a4b6d396bc86906a4 /docs/assets/css/bootstrap.css | |
| parent | 6d21d8600739fe16e8993a11f82a4727065ca78a (diff) | |
| parent | 3b56227553f40cc567e161c68c64f1e315fd5241 (diff) | |
| download | bootstrap-421f9f67c44d4b7c971b42808687ae7b71c99151.tar.xz bootstrap-421f9f67c44d4b7c971b42808687ae7b71c99151.zip | |
Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8d6dcca99..83b3c29c2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3835,7 +3835,6 @@ button.close { position: absolute; z-index: 1030; display: block; - padding: 5px; font-size: 11px; line-height: 1.4; opacity: 0; @@ -3849,18 +3848,22 @@ button.close { } .tooltip.top { + padding: 5px 0; margin-top: -3px; } .tooltip.right { + padding: 0 5px; margin-left: 3px; } .tooltip.bottom { + padding: 5px 0; margin-top: 3px; } .tooltip.left { + padding: 0 5px; margin-left: -3px; } @@ -4703,3 +4706,16 @@ a.counter:focus { display: none !important; } } + +.visible-print { + display: none !important; +} + +@media print { + .visible-print { + display: inherit !important; + } + .hidden-print { + display: none !important; + } +} |
