mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

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

Browse Source 
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
This commit is contained in:
Mark Otto
2013-07-17 19:33:30 -07:00
parent 06d47b0082 b4e0e4fee6
commit 542e03ae3a
6 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/docs.css
+15 -2
View File
@@ -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