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

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

@ -28,21 +28,21 @@ body {
color:#000; color:#000;
font-size:13px; font-size:13px;
color:#333; color:#333;
background-image:url(images/bg_fade.jpg); background-image:url(images/bg_fade.jpg);
background-repeat:repeat-x; background-repeat:repeat-x;
} }
a, a code { a, a code {
color:#006699; color:#006699;
} }
a:active, a:active,
a:active code { a:active code {
color:#f00; color:#f00;
} }
a:visited, a:visited,
a:visited code { a:visited code {
color:#006699; color:#006699;
} }
@ -107,7 +107,7 @@ dl {
padding:0; padding:0;
} }
dt { dt {
margin:0; margin:0;
padding:0; padding:0;
} }
@ -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;
} }
@ -226,7 +228,7 @@ blockquote {
#header ul { #header ul {
list-style: none; list-style: none;
margin: 7px 0 0; margin: 7px 0 0;
padding: 0; padding: 0;
height: 29px; height: 29px;
} }
@ -340,7 +342,7 @@ blockquote {
} }
#mainBodyFixed h2, #mainBodyFixed h2,
#mainBodyFluid h2 { #mainBodyFluid h2 {
color:#336666; color:#336666;
font-size:1.25em; font-size:1.25em;
margin: 0; margin: 0;
@ -348,7 +350,7 @@ blockquote {
} }
#mainBodyFixed h1, #mainBodyFixed h1,
#mainBodyFluid h1 { #mainBodyFluid h1 {
color:#435A6E; color:#435A6E;
font-size:1.7em; font-size:1.7em;
margin: 1em 0; margin: 1em 0;
@ -356,7 +358,7 @@ blockquote {
#mainBodyFixed .green, #mainBodyFixed .green,
#mainBodyFluid .green, #mainBodyFluid .green,
#jd-content .green { #jd-content .green {
color:#7BB026; color:#7BB026;
background-color:none; background-color:none;
} }
@ -364,13 +366,13 @@ blockquote {
#mainBodyLeft { #mainBodyLeft {
float: left; float: left;
width: 600px; width: 600px;
margin-right: 20px; margin-right: 20px;
color: #333; color: #333;
position:relative; position:relative;
} }
div.indent { div.indent {
margin-left: 40px; margin-left: 40px;
margin-right: 70px; margin-right: 70px;
} }
@ -583,7 +585,7 @@ table.gsc-branding,
.gsc-cursor-box .gsc-cursor div.gsc-cursor-page, .gsc-cursor-box .gsc-cursor div.gsc-cursor-page,
.gsc-cursor-box .gsc-trailing-more-results a.gsc-trailing-more-results, .gsc-cursor-box .gsc-trailing-more-results a.gsc-trailing-more-results,
#leftSearchControl a, #leftSearchControl a,
#leftSearchControl a b { #leftSearchControl a b {
color:#006699; color:#006699;
} }
@ -669,7 +671,7 @@ td.gsc-search-button {
#homeTitle { #homeTitle {
padding:15px 15px 0; padding:15px 15px 0;
height:30px; height:30px;
} }
#homeTitle h2 { #homeTitle h2 {
@ -704,8 +706,8 @@ td.gsc-search-button {
} }
#carouselMain { #carouselMain {
background: url(images/home/bg_home_carousel_board.png) 0 0 no-repeat; background: url(images/home/bg_home_carousel_board.png) 0 0 no-repeat;
height:auto; height:auto;
padding: 25px 21px 0; padding: 25px 21px 0;
overflow:hidden; overflow:hidden;
position:relative; position:relative;
@ -717,19 +719,19 @@ td.gsc-search-button {
} }
#carouselMain .bulletinDesc h3 { #carouselMain .bulletinDesc h3 {
margin:0; margin:0;
padding:0; padding:0;
} }
#carouselMain .bulletinDesc p { #carouselMain .bulletinDesc p {
margin:0; margin:0;
padding:0.7em 0 0; padding:0.7em 0 0;
} }
#carouselWheel { #carouselWheel {
background: url(images/home/bg_home_carousel_wheel.png) 0 0 no-repeat; background: url(images/home/bg_home_carousel_wheel.png) 0 0 no-repeat;
padding-top:40px; padding-top:40px;
height:150px; height:150px;
} }
.clearer { clear:both; } .clearer { clear:both; }
@ -748,17 +750,17 @@ a#arrow-right {
margin:35px 10px 0 0; margin:35px 10px 0 0;
} }
a.arrow-left-off, a.arrow-left-off,
a#arrow-left.arrow-left-off:hover { a#arrow-left.arrow-left-off:hover {
background-position:0 0; background-position:0 0;
} }
a.arrow-right-off, a.arrow-right-off,
a#arrow-right.arrow-right-off:hover { a#arrow-right.arrow-right-off:hover {
background-position:-42px 0; background-position:-42px 0;
} }
a#arrow-left:hover { a#arrow-left:hover {
background-position:0 -42px; background-position:0 -42px;
} }
a#arrow-right:hover { a#arrow-right:hover {
background-position:-42px -42px; background-position:-42px -42px;
} }
a.arrow-left-on { a.arrow-left-on {
@ -778,17 +780,17 @@ a.arrow-left-off {
width:100%; width:100%;
} }
div#list-clip { div#list-clip {
height:110px; height:110px;
width:438px; width:438px;
overflow:hidden; overflow:hidden;
position:relative; position:relative;
float:left; float:left;
} }
div#app-list { div#app-list {
left:0; left:0;
z-index:1; z-index:1;
position:absolute; position:absolute;
margin:11px 0 0; margin:11px 0 0;
_margin-top:13px; _margin-top:13px;
@ -817,14 +819,14 @@ div#app-list {
top:-4px; top:-4px;
} }
#app-list img { #app-list img {
width:90px; width:90px;
height:70px; height:70px;
margin:0; margin:0;
} }
#app-list a.selected, #app-list a.selected,
#app-list a:active.selected, #app-list a:active.selected,
#app-list a:hover.selected { #app-list a:hover.selected {
background:#A4C639; background:#A4C639;
color:#fff; color:#fff;
@ -832,12 +834,12 @@ div#app-list {
text-decoration:none; text-decoration:none;
} }
#app-list a:hover, #app-list a:hover,
#app-list a:active { #app-list a:active {
background:#ff9900; background:#ff9900;
} }
#app-list a:hover span, #app-list a:hover span,
#app-list a:active span { #app-list a:active span {
text-decoration:underline; text-decoration:underline;
} }
@ -851,7 +853,7 @@ div#app-list {
/*IE6*/ /*IE6*/
* html #app-list a { zoom: 1; margin:0 24px 0 15px;} * html #app-list a { zoom: 1; margin:0 24px 0 15px;}
* html #list-clip { * html #list-clip {
width:430px !important; width:430px !important;
} }
@ -1146,13 +1148,13 @@ ul.videoPreviews p.toggle a:hover {
} }
#mainBodyRight ul.videoPreviews p { #mainBodyRight ul.videoPreviews p {
line-height:1.2em; line-height:1.2em;
padding:0; padding:0;
margin:4px 0 0 130px; margin:4px 0 0 130px;
} }
#mainBodyRight ul.videoPreviews img { #mainBodyRight ul.videoPreviews img {
margin-top:5px; margin-top:5px;
} }
/* Pretty printing styles. Used with prettify.js. */ /* Pretty printing styles. Used with prettify.js. */
@ -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;