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 docs_derp

Browse Source 
Conflicts:
	_config.yml
This commit is contained in:
Mark Otto
2013-12-26 21:40:15 -08:00
parent 12980e7ea4 201088cb5f
commit 5b02dbd97a
69 changed files with 847 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs-assets/css/docs.css
+3 -2
View File
@@ -32,6 +32,7 @@
* Miscellaneous
*/
/*csslint ids: false, fallback-colors: false*/
/*
* Scaffolding
@@ -704,7 +705,7 @@ h1[id] {
.bs-team .github-btn {
float: right;
margin-top: 6px;
width: 120px;
width: 180px;
height: 20px;
}
.bs-team img {
@@ -729,8 +730,8 @@ h1[id] {
padding-top: 10px;
padding-bottom: 10px;
background-color: #eee;
border: 1px solid #ddd;
background-color: rgba(86,61,124,.15);
border: 1px solid #ddd;
border: 1px solid rgba(86,61,124,.2);
}