Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db00a567 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 479f4a5c: Merge "cherry-pick from master:... 

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 docs) tweak st

Merge commit '479f4a5c' into froyo-plus-aosp

* commit '479f4a5c':
  cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
parents 19e9fff3 479f4a5c

tools/droiddoc/templates/assets/android-developer-core.css

+49 −45
Original line number Diff line number Diff line
@@ -129,7 +129,9 @@ li pre, li table, li img { 
  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;

}
@@ -1164,8 +1166,10 @@ ul.videoPreviews p.toggle a:hover { 
.lit { color: #066; }

.pun { color: #660; }

.pln { color: #000; }

dl.tag-list dt code,

.tag { color: #008; }

.atn { color: #606; }

dl.atn-list dt code,

.atn { color: #828; }

.atv { color: #080; }

.dec { color: #606; }

tools/droiddoc/templates/assets/android-developer-docs.css

+14 −12
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 
#side-nav li a+a {

  padding: 0;

}



/*second level (nested) list*/

#side-nav li li li a { 

  padding: 0 0 0 28px;
@@ -518,8 +517,7 @@ hr { 
  color:#111;

  border-top:2px solid #ccc;

  padding: .5em 0 0;

  margin: 1.5em 0 1em 0;

  max-width:968px;

  margin: 2em 0 1em 0;

}



#jd-content h3 {
@@ -545,6 +543,10 @@ hr { 
  position:inherit;

}



#jd-content table {

  margin: 0 0 1em 1em;

}



#jd-content img {

  margin: 0 0 1em 1em;

}
@@ -807,13 +809,17 @@ pre.classic { 
div.figure {

  float: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 */

}



#jd-content div.figure img {

  display:block;

  margin:0 0 10px 0;

p.img-caption {

  margin: -0.5em 0 1em 1em; /* matches default img left-margin */

}



p.table-caption {

  margin: 0 0 0.5em 1em; /* matches default table left-margin */

}



/* BEGIN quickview sidebar element styles */
@@ -967,7 +973,7 @@ table.image-caption { 


td.image-caption-i {

  font-size:92%;

  padding:0;

  padding:0 5px;

  margin:0;

  border:0;

}
@@ -982,10 +988,6 @@ td.image-caption-i img { 
  text-align:center;

}



.image-list .caption {

  margin:0 2px;

}



td.image-caption-c {

  font-size:92%;

  padding:1em 2px 2px 2px;