use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta

6 files changed, 251 insertions, 77 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d4b1eb8942..715c49baa2 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2644,8 +2644,7 @@ table .span24 {
   padding: 19px;
   margin-bottom: 20px;
   background-color: #f5f5f5;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0, 0, 0, 0.05);
+  border: 1px solid #e3e3e3;
   -webkit-border-radius: 4px;
      -moz-border-radius: 4px;
           border-radius: 4px;
@@ -4531,39 +4530,75 @@ input[type="submit"].btn.btn-mini {
 }
 
 .tooltip.top .tooltip-arrow {
-  bottom: 0;
+  bottom: -10px;
   left: 50%;
-  margin-left: -5px;
-  border-top: 5px solid #000000;
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent;
+  margin-left: -10px;
+  border-top: 10px solid #cccccc;
+  border-top: 10px solid rgba(0, 0, 0, 0.2);
+  border-right: 10px solid transparent;
+  border-left: 10px solid transparent;
+}
+
+.tooltip.top .tooltip-arrow:after {
+  bottom: 1px;
+  left: -9px;
+  border-top: 9px solid #ffffff;
+  border-right: 9px solid transparent;
+  border-left: 9px solid transparent;
 }
 
 .tooltip.left .tooltip-arrow {
   top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
+  right: -10px;
+  margin-top: -10px;
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+  border-left: 10px solid #cccccc;
+  border-left: 10px solid rgba(0, 0, 0, 0.2);
+}
+
+.tooltip.left .tooltip-arrow:after {
+  right: 1px;
+  bottom: -9px;
+  border-top: 9px solid transparent;
+  border-bottom: 9px solid transparent;
+  border-left: 9px solid #ffffff;
 }
 
 .tooltip.bottom .tooltip-arrow {
-  top: 0;
+  top: -10px;
   left: 50%;
-  margin-left: -5px;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-  border-left: 5px solid transparent;
+  margin-left: -10px;
+  border-right: 10px solid transparent;
+  border-bottom: 10px solid #cccccc;
+  border-bottom: 10px solid rgba(0, 0, 0, 0.2);
+  border-left: 10px solid transparent;
+}
+
+.tooltip.bottom .tooltip-arrow:after {
+  top: 1px;
+  left: -9px;
+  border-right: 9px solid transparent;
+  border-bottom: 9px solid #f5f5f5;
+  border-left: 9px solid transparent;
 }
 
 .tooltip.right .tooltip-arrow {
   top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-right: 5px solid #000000;
-  border-bottom: 5px solid transparent;
+  left: -10px;
+  margin-top: -10px;
+  border-top: 10px solid transparent;
+  border-right: 10px solid #cccccc;
+  border-right: 10px solid rgba(0, 0, 0, 0.2);
+  border-bottom: 10px solid transparent;
+}
+
+.tooltip.right .tooltip-arrow:after {
+  bottom: -9px;
+  left: 1px;
+  border-top: 9px solid transparent;
+  border-right: 9px solid #ffffff;
+  border-bottom: 9px solid transparent;
 }
 
 .tooltip-inner {
@@ -4590,59 +4625,107 @@ input[type="submit"].btn.btn-mini {
   left: 0;
   z-index: 1010;
   display: none;
-  padding: 5px;
+  width: 218px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+     -moz-border-radius: 6px;
+          border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
 }
 
 .popover.top {
-  margin-top: -5px;
+  margin-bottom: 10px;
 }
 
 .popover.right {
-  margin-left: 5px;
+  margin-left: 10px;
 }
 
 .popover.bottom {
-  margin-top: 5px;
+  margin-top: 10px;
 }
 
 .popover.left {
-  margin-left: -5px;
+  margin-right: 10px;
 }
 
 .popover.top .arrow {
-  bottom: 0;
+  bottom: -10px;
   left: 50%;
-  margin-left: -5px;
-  border-top: 5px solid #000000;
-  border-right: 5px solid transparent;
-  border-left: 5px solid transparent;
+  margin-left: -10px;
+  border-top: 10px solid #cccccc;
+  border-top: 10px solid rgba(0, 0, 0, 0.2);
+  border-right: 10px solid transparent;
+  border-left: 10px solid transparent;
+}
+
+.popover.top .arrow:after {
+  bottom: 1px;
+  left: -9px;
+  border-top: 9px solid #ffffff;
+  border-right: 9px solid transparent;
+  border-left: 9px solid transparent;
 }
 
 .popover.right .arrow {
   top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-right: 5px solid #000000;
-  border-bottom: 5px solid transparent;
+  left: -10px;
+  margin-top: -10px;
+  border-top: 10px solid transparent;
+  border-right: 10px solid #cccccc;
+  border-right: 10px solid rgba(0, 0, 0, 0.2);
+  border-bottom: 10px solid transparent;
+}
+
+.popover.right .arrow:after {
+  bottom: -9px;
+  left: 1px;
+  border-top: 9px solid transparent;
+  border-right: 9px solid #ffffff;
+  border-bottom: 9px solid transparent;
 }
 
 .popover.bottom .arrow {
-  top: 0;
+  top: -10px;
   left: 50%;
-  margin-left: -5px;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #000000;
-  border-left: 5px solid transparent;
+  margin-left: -10px;
+  border-right: 10px solid transparent;
+  border-bottom: 10px solid #cccccc;
+  border-bottom: 10px solid rgba(0, 0, 0, 0.2);
+  border-left: 10px solid transparent;
+}
+
+.popover.bottom .arrow:after {
+  top: 1px;
+  left: -9px;
+  border-right: 9px solid transparent;
+  border-bottom: 9px solid #f5f5f5;
+  border-left: 9px solid transparent;
 }
 
 .popover.left .arrow {
   top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-top: 5px solid transparent;
-  border-bottom: 5px solid transparent;
-  border-left: 5px solid #000000;
+  right: -10px;
+  margin-top: -10px;
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+  border-left: 10px solid #cccccc;
+  border-left: 10px solid rgba(0, 0, 0, 0.2);
+}
+
+.popover.left .arrow:after {
+  right: 1px;
+  bottom: -9px;
+  border-top: 9px solid transparent;
+  border-bottom: 9px solid transparent;
+  border-left: 9px solid #ffffff;
 }
 
 .popover .arrow {
@@ -4651,39 +4734,28 @@ input[type="submit"].btn.btn-mini {
   height: 0;
 }
 
-.popover-inner {
-  width: 280px;
-  padding: 3px;
-  overflow: hidden;
-  background: #000000;
-  background: rgba(0, 0, 0, 0.8);
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+.popover .arrow:after {
+  position: absolute;
+  display: inline-block;
+  width: 0;
+  height: 0;
+  content: "";
 }
 
 .popover-title {
-  padding: 9px 15px;
-  line-height: 1;
+  padding: 8px 14px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
   background-color: #f5f5f5;
-  border-bottom: 1px solid #eee;
-  -webkit-border-radius: 3px 3px 0 0;
-     -moz-border-radius: 3px 3px 0 0;
-          border-radius: 3px 3px 0 0;
+  border-bottom: 1px solid #e5e5e5;
+  -webkit-border-radius: 5px 5px 0 0;
+     -moz-border-radius: 5px 5px 0 0;
+          border-radius: 5px 5px 0 0;
 }
 
 .popover-content {
-  padding: 14px;
-  background-color: #ffffff;
-  -webkit-border-radius: 0 0 3px 3px;
-     -moz-border-radius: 0 0 3px 3px;
-          border-radius: 0 0 3px 3px;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding-box;
-          background-clip: padding-box;
+  padding: 9px 14px;
 }
 
 .popover-content p,
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 9e6964a84d..a0f3546a4c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -601,6 +601,20 @@ form.bs-docs-example {
   line-height: 18px;
 }
 
+/* Popovers */
+.bs-docs-example-popover {
+  padding-bottom: 24px;
+  background-color: #f9f9f9;
+}
+.bs-docs-example-popover .popover {
+  position: relative;
+  display: block;
+  float: left;
+  width: 210px;
+  margin: 10px;
+}
+
+
 /* Responsive table
 ------------------------- */
 .responsive-utilities th small {
diff --git a/docs/base-css.html b/docs/base-css.html
index 2b679d994c..2b7c1ec712 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1555,6 +1555,9 @@ For example, <code>section</code> should be wrapped as inline.
     </div>
   </div>
 
+  <h3>Glyphicons attribution</h3>
+  <p><a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.</p>
+
 
   <hr class="bs-docs-separator">
 
diff --git a/docs/javascript.html b/docs/javascript.html
index bc82711fb9..7fb1448ec0 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -848,11 +848,52 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
     <h1>Popovers <small>bootstrap-popover.js</small></h1>
   </div>
 
-  <h2>Example</h2>
+  <h2>Examples</h2>
   <p>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.</p>
   <p class="muted"><strong>*</strong> Requires <a href="#tooltips">Tooltip</a> to be included</p>
+
+  <h3>Static popover</h3>
+  <p>Four options are available: top, right, bottom, and left aligned.</p>
+  <div class="bs-docs-example bs-docs-example-popover">
+    <div class="popover top">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover top</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="popover right">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover right</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="popover bottom">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover bottom</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="popover left">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover left</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="clearfix"></div>
+  </div>
+  <p>No markup shown as popovers are generated from javascript and content within a <code>data</code> attribute.</p>
+
+  <h3>Live demo</h3>
   <div class="bs-docs-example" style="padding-bottom: 24px;">
-    <a href="#" class="btn btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">hover for popover</a>
+    <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">Hover for popover</a>
   </div>
 
 
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 583d0709ee..9b79c3d9c5 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -1486,6 +1486,9 @@
     </div>
   </div>
 
+  <h3>Glyphicons attribution</h3>
+  <p>{{_i}}<a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creators have made this possible at not cost to you as developers. As a thank you, we ask you to include an optional link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever practical.{{/i}}</p>
+
 
   <hr class="bs-docs-separator">
 
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index cc1ecf1cbb..a73917f5e3 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -773,11 +773,52 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
     <h1>{{_i}}Popovers{{/i}} <small>bootstrap-popover.js</small></h1>
   </div>
 
-  <h2>{{_i}}Example{{/i}}</h2>
+  <h2>{{_i}}Examples{{/i}}</h2>
   <p>{{_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}}</p>
   <p class="muted"><strong>*</strong> {{_i}}Requires <a href="#tooltips">Tooltip</a> to be included{{/i}}</p>
+
+  <h3>{{_i}}Static popover{{/i}}</h3>
+  <p>{{_i}}Four options are available: top, right, bottom, and left aligned.{{/i}}</p>
+  <div class="bs-docs-example bs-docs-example-popover">
+    <div class="popover top">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover top</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="popover right">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover right</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="popover bottom">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover bottom</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="popover left">
+      <div class="arrow"></div>
+      <h3 class="popover-title">Popover left</h3>
+      <div class="popover-content">
+        <p>Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.</p>
+      </div>
+    </div>
+
+    <div class="clearfix"></div>
+  </div>
+  <p>{{_i}}No markup shown as popovers are generated from javascript and content within a <code>data</code> attribute.{{/i}}</p>
+
+  <h3>Live demo</h3>
   <div class="bs-docs-example" style="padding-bottom: 24px;">
-    <a href="#" class="btn btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}hover for popover{{/i}}</a>
+    <a href="#" class="btn btn-large btn-danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">{{_i}}Hover for popover{{/i}}</a>
   </div>