mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-17 19:21:23 +03:00
Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/scaffolding.html docs/templates/pages/scaffolding.mustache
This commit is contained in:
+3
-1
@@ -20,12 +20,14 @@
|
||||
border-radius: 6px;
|
||||
.box-shadow(0 5px 10px rgba(0,0,0,.2));
|
||||
|
||||
// Overrides for proper insertion
|
||||
white-space: normal;
|
||||
|
||||
// Offset the popover to account for the popover arrow
|
||||
&.top { margin-top: -10px; }
|
||||
&.right { margin-left: 10px; }
|
||||
&.bottom { margin-top: 10px; }
|
||||
&.left { margin-left: -10px; }
|
||||
|
||||
}
|
||||
|
||||
.popover-title {
|
||||
|
||||
Reference in New Issue
Block a user