aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-30 01:20:51 -0800
committerMark Otto <[email protected]>2012-01-30 01:20:51 -0800
commitf4e5bc1c536f0e2bd77958dd5575863808d4cfe4 (patch)
tree9cdbbc64bd48c5bac65b12cd9daf29b569514da0
parentdb31efb99587cea660ba5359665b4a6828d9f384 (diff)
downloadbootstrap-f4e5bc1c536f0e2bd77958dd5575863808d4cfe4.tar.xz
bootstrap-f4e5bc1c536f0e2bd77958dd5575863808d4cfe4.zip
namespace popover values
-rw-r--r--docs/assets/bootstrap.zipbin51954 -> 51957 bytes
-rw-r--r--docs/assets/css/bootstrap.css8
-rw-r--r--js/bootstrap-popover.js6
-rw-r--r--less/popovers.less50
4 files changed, 32 insertions, 32 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7a2cddc35..8a4919782 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 5a9068829..82b7dc249 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2928,7 +2928,7 @@ button.btn.small, input[type="submit"].btn.small {
width: 0;
height: 0;
}
-.popover .inner {
+.popover-inner {
padding: 3px;
width: 280px;
overflow: hidden;
@@ -2941,7 +2941,7 @@ button.btn.small, input[type="submit"].btn.small {
-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
}
-.popover .title {
+.popover-title {
padding: 9px 15px;
line-height: 1;
background-color: #f5f5f5;
@@ -2950,7 +2950,7 @@ button.btn.small, input[type="submit"].btn.small {
-moz-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0;
}
-.popover .content {
+.popover-content {
padding: 14px;
background-color: #ffffff;
-webkit-border-radius: 0 0 3px 3px;
@@ -2960,7 +2960,7 @@ button.btn.small, input[type="submit"].btn.small {
-moz-background-clip: padding-box;
background-clip: padding-box;
}
-.popover .content p, .popover .content ul, .popover .content ol {
+.popover-content p, .popover-content ul, .popover-content ol {
margin-bottom: 0;
}
.thumbnails {
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index 57864fc6e..35ff9d0ab 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -38,8 +38,8 @@
, title = this.getTitle()
, content = this.getContent()
- $tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
- $tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
+ $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
+ $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
$tip.removeClass('fade top bottom left right in')
}
@@ -89,7 +89,7 @@
$.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
placement: 'right'
, content: ''
- , template: '<div class="popover"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
+ , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
})
}( window.jQuery )
diff --git a/less/popovers.less b/less/popovers.less
index 6de314d86..558d99ec9 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -21,29 +21,29 @@
width: 0;
height: 0;
}
- .inner {
- padding: 3px;
- width: 280px;
- overflow: hidden;
- background: @black; // has to be full background declaration for IE fallback
- background: rgba(0,0,0,.8);
- .border-radius(6px);
- .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-inner {
+ padding: 3px;
+ width: 280px;
+ overflow: hidden;
+ background: @black; // has to be full background declaration for IE fallback
+ background: rgba(0,0,0,.8);
+ .border-radius(6px);
+ .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-title {
+ padding: 9px 15px;
+ line-height: 1;
+ background-color: #f5f5f5;
+ border-bottom:1px solid #eee;
+ .border-radius(3px 3px 0 0);
+}
+.popover-content {
+ padding: 14px;
+ background-color: @white;
+ .border-radius(0 0 3px 3px);
+ .background-clip(padding-box);
+ p, ul, ol {
+ margin-bottom: 0;
}
- .title {
- padding: 9px 15px;
- line-height: 1;
- background-color: #f5f5f5;
- border-bottom:1px solid #eee;
- .border-radius(3px 3px 0 0);
- }
- .content {
- padding: 14px;
- background-color: @white;
- .border-radius(0 0 3px 3px);
- .background-clip(padding-box);
- p, ul, ol {
- margin-bottom: 0;
- }
- }
-} \ No newline at end of file
+}