summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2014-10-15 21:27:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-15 21:27:14 +0000
commitc70ae578118573ec2073012ab57f0307184f74a3 (patch)
treefec52da0eb402941c48771042edb4d67cdca2c4b /tools
parent9d641c41db732c4e9e7a5dac074197f1a9d40bcc (diff)
parent412a13217b1c8d83435dc435713e6c2dae7ba351 (diff)
downloadbuild-c70ae578118573ec2073012ab57f0307184f74a3.zip
build-c70ae578118573ec2073012ab57f0307184f74a3.tar.gz
build-c70ae578118573ec2073012ab57f0307184f74a3.tar.bz2
Merge "Docs: Replacing s.a.c. Android logo to match other sites." into lmp-dev
Diffstat (limited to 'tools')
-rw-r--r--tools/droiddoc/templates-sac/assets/images/sac_logo.pngbin1760 -> 2298 bytes
-rw-r--r--tools/droiddoc/templates-sac/assets/images/sac_logo@2x.pngbin0 -> 4934 bytes
-rw-r--r--tools/droiddoc/templates-sac/components/masthead.cs4
3 files changed, 3 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sac/assets/images/sac_logo.png b/tools/droiddoc/templates-sac/assets/images/sac_logo.png
index 6dc126a..4ad113c 100644
--- a/tools/droiddoc/templates-sac/assets/images/sac_logo.png
+++ b/tools/droiddoc/templates-sac/assets/images/sac_logo.png
Binary files differ
diff --git a/tools/droiddoc/templates-sac/assets/images/sac_logo@2x.png b/tools/droiddoc/templates-sac/assets/images/sac_logo@2x.png
new file mode 100644
index 0000000..4040f3f
--- /dev/null
+++ b/tools/droiddoc/templates-sac/assets/images/sac_logo@2x.png
Binary files differ
diff --git a/tools/droiddoc/templates-sac/components/masthead.cs b/tools/droiddoc/templates-sac/components/masthead.cs
index fb9b71d..a8618c0 100644
--- a/tools/droiddoc/templates-sac/components/masthead.cs
+++ b/tools/droiddoc/templates-sac/components/masthead.cs
@@ -253,7 +253,9 @@ onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" />
<div class="wrap" id="header-wrap">
<div class="col-3 saclogo">
<a href="<?cs var:toroot ?>index.html">
- <img src="<?cs var:toroot ?>assets/images/sac_logo.png" width="114" height="16" alt="Android Developers" />
+ <img src="<?cs var:toroot ?>assets/images/sac_logo.png"
+ srcset="<?cs var:toroot ?>assets/images/sac_logo@2x.png 2x"
+ width="123" height="25" alt="Android Developers" />
</a>
</div>
<ul class="nav-x col-9">