p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am db00a567: am 479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types d 

Merge commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7' into kraken

* commit 'db00a567759a6785c97a21fd3fbc1e6b792df4c7':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
This commit is contained in:
Scott Main 2010-04-10 11:46:50 -07:00 committed by Android Git Automerger
parent b15c119d26 db00a56775
commit 52e67ac24e
2 changed files with 63 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/droiddoc/templates/assets/android-developer-core.css
View File

@ -129,7 +129,9 @@ li pre, li table, li img {
margin:.5em 0 0 1em; margin:.5em 0 0 1em;
} }
dd pre, dd table, dd img { dd pre,
#jd-content dd table,
#jd-content dd img {
margin:1em 0 0 1em; margin:1em 0 0 1em;
} }
@ -1164,8 +1166,10 @@ ul.videoPreviews p.toggle a:hover {
.lit { color: #066; } .lit { color: #066; }
.pun { color: #660; } .pun { color: #660; }
.pln { color: #000; } .pln { color: #000; }
dl.tag-list dt code,
.tag { color: #008; } .tag { color: #008; }
.atn { color: #606; } dl.atn-list dt code,
.atn { color: #828; }
.atv { color: #080; } .atv { color: #080; }
.dec { color: #606; } .dec { color: #606; }

26
tools/droiddoc/templates/assets/android-developer-docs.css
View File

@ -100,7 +100,6 @@
#side-nav li a+a { #side-nav li a+a {
padding: 0; padding: 0;
} }
/*second level (nested) list*/ /*second level (nested) list*/
#side-nav li li li a { #side-nav li li li a {
padding: 0 0 0 28px; padding: 0 0 0 28px;
@ -518,8 +517,7 @@ hr {
color:#111; color:#111;
border-top:2px solid #ccc; border-top:2px solid #ccc;
padding: .5em 0 0; padding: .5em 0 0;
margin: 1.5em 0 1em 0; margin: 2em 0 1em 0;
max-width:968px;
} }
#jd-content h3 { #jd-content h3 {
@ -545,6 +543,10 @@ hr {
position:inherit; position:inherit;
} }
#jd-content table {
margin: 0 0 1em 1em;
}
#jd-content img { #jd-content img {
margin: 0 0 1em 1em; margin: 0 0 1em 1em;
} }
@ -807,13 +809,17 @@ pre.classic {
div.figure { div.figure {
float:right; float:right;
clear:right; clear:right;
padding:0 0 20px 20px; padding:1em 0 1em 2em;
background-color:#fff;
/* width must be defined w/ an inline style matching the image width */ /* width must be defined w/ an inline style matching the image width */
} }
#jd-content div.figure img { p.img-caption {
display:block; margin: -0.5em 0 1em 1em; /* matches default img left-margin */
margin:0 0 10px 0; }
p.table-caption {
margin: 0 0 0.5em 1em; /* matches default table left-margin */
} }
/* BEGIN quickview sidebar element styles */ /* BEGIN quickview sidebar element styles */
@ -967,7 +973,7 @@ table.image-caption {
td.image-caption-i { td.image-caption-i {
font-size:92%; font-size:92%;
padding:0; padding:0 5px;
margin:0; margin:0;
border:0; border:0;
} }
@ -982,10 +988,6 @@ td.image-caption-i img {
text-align:center; text-align:center;
} }
.image-list .caption {
margin:0 2px;
}
td.image-caption-c { td.image-caption-c {
font-size:92%; font-size:92%;
padding:1em 2px 2px 2px; padding:1em 2px 2px 2px;