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

Merge branch 'master' into pr/11412

Browse Source 
Conflicts:
	dist/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2013-12-01 20:27:30 -08:00
parent 1444a3ca63 561aff7942
commit 4876cbeef8
68 changed files with 1029 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs-assets/css/docs.css
+2 -2
View File
@@ -586,14 +586,14 @@ h1[id] {
border-color: #faebcc;
}
.bs-callout-warning h4 {
color: #c09853;
color: #8a6d3b;
}
.bs-callout-info {
background-color: #f4f8fa;
border-color: #bce8f1;
}
.bs-callout-info h4 {
color: #3a87ad;
color: #34789a;
}