Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam

Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html

1 files changed, 15 insertions, 2 deletions

diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index a6d106989..aae9e0635 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -222,11 +222,10 @@ body {
 /* Side notes for calling out things
 -------------------------------------------------- */
 
+/* Base styles (regardless of theme) */
 .bs-callout {
   margin: 20px 0;
   padding: 15px 30px 15px 15px;
-  background-color: #fcf2f2;
-  border-left: 5px solid #df7c7b;
 }
 .bs-callout h4 {
   margin-top: 0;
@@ -239,6 +238,20 @@ body {
   background-color: #fff;
 }
 
+/* Themes for different contexts */
+.bs-callout-danger {
+  background-color: #fcf2f2;
+  border-left: 5px solid #df7c7b;
+}
+.bs-callout-warning {
+  background-color: #fefbed;
+  border-left: 5px solid #f5d659;
+}
+.bs-callout-info {
+  background-color: #f0f7fd;
+  border-left: 5px solid #55a9e1;
+}
+
 
 
 /* Special grid styles