Merge branch 'master' into navbar-button-docs

1 files changed, 14 insertions, 16 deletions

diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index 80784d97e..7abf6ed09 100644
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -1,3 +1,11 @@
+/*!
+ * Copyright 2013 Twitter, Inc.
+ *
+ * Licensed under the Creative Commons Attribution 3.0 Unported License. For
+ * details, see http://creativecommons.org/licenses/by/3.0/.
+ */
+
+
 /*
  * Bootstrap Documentation
  * Special styles for presenting Bootstrap's documentation and code examples.
@@ -553,20 +561,10 @@ h1[id] {
 
 /* Common styles for all types */
 .bs-callout {
-  /*position: relative;*/
   margin: 20px 0;
   padding: 20px;
   border-left: 3px solid #eee;
-  /*border-width: 1px 1px 1px 10px;*/
 }
-/*.bs-callout:before {
-  position: absolute;
-  top: 0;
-  left: -20px;
-  color: #fff;
-  width: 20px;
-  height: 20px;
-}*/
 .bs-callout h4 {
   margin-top: 0;
   margin-bottom: 5px;
@@ -574,10 +572,6 @@ h1[id] {
 .bs-callout p:last-child {
   margin-bottom: 0;
 }
-.bs-callout code,
-.bs-callout .highlight {
-  /*background-color: #fff;*/
-}
 
 /* Variations */
 .bs-callout-danger {
@@ -1061,10 +1055,14 @@ h1[id] {
   border: 1px solid #ddd;
 }
 .bs-glyphicons .glyphicon {
-  display: block;
-  margin: 5px auto 10px;
+  margin-top: 5px;
+  margin-bottom: 10px;
   font-size: 24px;
 }
+.bs-glyphicons .glyphicon-class {
+  display: block;
+  text-align: center;
+}
 .bs-glyphicons li:hover {
   background-color: rgba(86,61,124,.1);
 }