summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-03-27 03:17:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-27 03:17:10 +0000
commitb8702917c61923bc4dc5f6284482e1296b783bd4 (patch)
tree97a2c5af4ae12f061a8abc503c0ca6fd31d324f2 /tools
parent514c8254d0a78a4153c442bc0789da8a10ce8b0b (diff)
parent75f21bc79e18f5bdf7676eeab6681e8f4a32e688 (diff)
downloadbuild-b8702917c61923bc4dc5f6284482e1296b783bd4.zip
build-b8702917c61923bc4dc5f6284482e1296b783bd4.tar.gz
build-b8702917c61923bc4dc5f6284482e1296b783bd4.tar.bz2
am 75f21bc7: Merge "add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs." into klp-docs
* commit '75f21bc79e18f5bdf7676eeab6681e8f4a32e688': add 2x header logo and add override to viewport width for landing pages. changing the viewport to 970 ensures proper layout space for floating divs.
Diffstat (limited to 'tools')
-rw-r--r--tools/droiddoc/templates-sdk/assets/images/dac_logo@2x.pngbin0 -> 2497 bytes
-rw-r--r--tools/droiddoc/templates-sdk/components/masthead.cs4
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/images/dac_logo@2x.png b/tools/droiddoc/templates-sdk/assets/images/dac_logo@2x.png
new file mode 100644
index 0000000..0f2784d
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/dac_logo@2x.png
Binary files differ
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index 15056e0..beead52 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -9,7 +9,9 @@
<div class="wrap" id="header-wrap">
<div class="col-3 logo">
<a href="<?cs var:toroot ?>index.html">
- <img src="<?cs var:toroot ?>assets/images/dac_logo.png" width="123" height="25" alt="Android Developers" />
+ <img src="<?cs var:toroot ?>assets/images/dac_logo.png"
+ srcset="<?cs var:toroot ?>assets/images/dac_logo@2x.png 2x"
+ width="123" height="25" alt="Android Developers" />
</a>
<div class="btn-quicknav" id="btn-quicknav">
<a href="#" class="arrow-inactive">Quicknav</a>