aboutsummaryrefslogtreecommitdiff
path: root/docs-assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-26 21:40:15 -0800
committerMark Otto <[email protected]>2013-12-26 21:40:15 -0800
commit5b02dbd97a0a480b0f800cb1011089dab9980300 (patch)
tree7eb7ffdc3bf67d303b95ab2ab05bfbf3f76503d1 /docs-assets/css
parent12980e7ea47057d7e17c3606604c79c6450b272e (diff)
parent201088cb5f9ab4af062b62ac3a10a2e8f07a6ec5 (diff)
downloadbootstrap-5b02dbd97a0a480b0f800cb1011089dab9980300.tar.xz
bootstrap-5b02dbd97a0a480b0f800cb1011089dab9980300.zip
Merge branch 'master' into docs_derp
Conflicts: _config.yml
Diffstat (limited to 'docs-assets/css')
-rw-r--r--docs-assets/css/docs.css5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index c8efba3ae..2c8470b81 100644
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -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);
}