summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-05-10 09:43:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-10 09:43:15 -0700
commit9096ef382a5c17f4a6618dd19ac203840d807e0a (patch)
tree27e077adfae075493bdaeb2387322fbf62cc59e6 /tools
parent6e079d7e3d30cd8985fc5d1e34c871cdf2ec5068 (diff)
parent3044d243c99f46030521fce650add82db640046a (diff)
downloadbuild-9096ef382a5c17f4a6618dd19ac203840d807e0a.zip
build-9096ef382a5c17f4a6618dd19ac203840d807e0a.tar.gz
build-9096ef382a5c17f4a6618dd19ac203840d807e0a.tar.bz2
am 3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '3044d243c99f46030521fce650add82db640046a' into froyo-plus-aosp * commit '3044d243c99f46030521fce650add82db640046a': add froyo graphic for homepage and fix css bug
Diffstat (limited to 'tools')
-rw-r--r--tools/droiddoc/templates/assets/android-developer-core.css4
-rw-r--r--tools/droiddoc/templates/assets/images/home/froyo-android.pngbin0 -> 17086 bytes
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/droiddoc/templates/assets/android-developer-core.css b/tools/droiddoc/templates/assets/android-developer-core.css
index 08d74c9..40ab2fd 100644
--- a/tools/droiddoc/templates/assets/android-developer-core.css
+++ b/tools/droiddoc/templates/assets/android-developer-core.css
@@ -419,6 +419,10 @@ div.indent {
text-align:left;
}
+#mainBodyRight td p {
+ margin:0 0 1em 0;
+}
+
#mainBodyRight .blueBorderBox {
border:5px solid #ddf0f2;
padding:18px 18px 18px 18px;
diff --git a/tools/droiddoc/templates/assets/images/home/froyo-android.png b/tools/droiddoc/templates/assets/images/home/froyo-android.png
new file mode 100644
index 0000000..c63f7f0
--- /dev/null
+++ b/tools/droiddoc/templates/assets/images/home/froyo-android.png
Binary files differ