diff options
| author | Scott Main <smain@google.com> | 2014-03-27 03:35:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-27 03:35:37 +0000 |
| commit | 7964804dd2d55c4acb5eec1e613e8818e3e69de2 (patch) | |
| tree | 7889d807879584c88ecbc53c43f97c5a303a71b2 /tools/droiddoc | |
| parent | 4f31196420399349bebf9da070df0765f29c9666 (diff) | |
| parent | 5429cdc2c84bd753202897a7b3437a7fc522fd8b (diff) | |
| download | build-7964804dd2d55c4acb5eec1e613e8818e3e69de2.zip build-7964804dd2d55c4acb5eec1e613e8818e3e69de2.tar.gz build-7964804dd2d55c4acb5eec1e613e8818e3e69de2.tar.bz2 | |
am 5429cdc2: am bb3ed6fb: am b8702917: 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 '5429cdc2c84bd753202897a7b3437a7fc522fd8b':
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/droiddoc')
| -rw-r--r-- | tools/droiddoc/templates-sdk/assets/images/dac_logo@2x.png | bin | 0 -> 2497 bytes | |||
| -rw-r--r-- | tools/droiddoc/templates-sdk/components/masthead.cs | 4 |
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 Binary files differnew file mode 100644 index 0000000..0f2784d --- /dev/null +++ b/tools/droiddoc/templates-sdk/assets/images/dac_logo@2x.png 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> |
