Merge branch 'docs_welcome'

1 files changed, 61 insertions, 10 deletions

diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index 8078a7bac..25ebce136 100644
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -373,7 +373,7 @@ body {
   .carbonad {
     position: absolute;
     top: 20px;
-    right: 0;
+    right: 15px; /* 15px instead of 0 since box-sizing */
     padding: 15px !important;
     width: 330px !important;
   }
@@ -553,33 +553,79 @@ h1[id] {
 
 /* Common styles for all types */
 .bs-callout {
+  /*position: relative;*/
   margin: 20px 0;
-  padding: 15px 30px 15px 15px;
-  border-left: 5px solid #eee;
+  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;
 }
 .bs-callout p:last-child {
   margin-bottom: 0;
 }
 .bs-callout code,
 .bs-callout .highlight {
-  background-color: #fff;
+  /*background-color: #fff;*/
 }
 
 /* Variations */
 .bs-callout-danger {
-  background-color: #fcf2f2;
-  border-color: #dFb5b4;
+  background-color: #fdf7f7;
+  border-color: #eed3d7;
+}
+.bs-callout-danger h4 {
+  color: #b94a48;
 }
 .bs-callout-warning {
-  background-color: #fefbed;
-  border-color: #f1e7bc;
+  background-color: #faf8f0;
+  border-color: #faebcc;
+}
+.bs-callout-warning h4 {
+  color: #c09853;
 }
 .bs-callout-info {
-  background-color: #f0f7fd;
-  border-color: #d0e3f0;
+  background-color: #f4f8fa;
+  border-color: #bce8f1;
+}
+.bs-callout-info h4 {
+  color: #3a87ad;
+}
+
+
+/*
+ * Team members
+ *
+ * Avatars, names, and usernames for core team.
+ */
+
+.bs-team .team-member {
+  color: #555;
+  line-height: 32px;
+}
+.bs-team .team-member:hover {
+  color: #333;
+  text-decoration: none;
+}
+.bs-team iframe {
+  float: right;
+  margin-top: 6px;
+}
+.bs-team img {
+  float: left;
+  width: 32px;
+  margin-right: 10px;
+  border-radius: 4px;
 }
 
 
@@ -1120,6 +1166,11 @@ h1[id] {
  * Odds and ends for optimum docs display.
  */
 
+ /* About page */
+ .bs-about {
+  font-size: 16px;
+ }
+
 /* Examples gallery: space out content better */
 .bs-examples h4 {
   margin-bottom: 5px;