diff options
author | Joe Fernandez <joefernandez@google.com> | 2015-08-13 23:15:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 23:15:45 +0000 |
commit | 251d0ad1914e958044ecbd7d9bad86d8e446ddd3 (patch) | |
tree | f93afff4ae6481d3724e03bfb190f2f20a7939c0 /tools | |
parent | 1fd599cbaeac173245dfb675a28c27bf3fcb2eca (diff) | |
parent | a2869db89eb59e57b7f0cdfc5e526d5257b95ecc (diff) | |
download | build-251d0ad1914e958044ecbd7d9bad86d8e446ddd3.zip build-251d0ad1914e958044ecbd7d9bad86d8e446ddd3.tar.gz build-251d0ad1914e958044ecbd7d9bad86d8e446ddd3.tar.bz2 |
am a2869db8: am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit 'a2869db89eb59e57b7f0cdfc5e526d5257b95ecc':
doc change: Add hero image for m and css for landing pages.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 66 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/images/home/android_m_hero_1200.jpg | bin | 0 -> 112883 bytes |
2 files changed, 66 insertions, 0 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index 693027a..5a2967f 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -8787,3 +8787,69 @@ $spritesheet: width height image $spritesheet-sprites; position: absolute; top: -4px; } + +/* CHANGE EXISTING SELECTOR FOR ANDROID M HERO ONLY + REMOVE THE BELOW STYLES WHEN THE ANDROID M CAROUSEL + GRAPHIC ON THE MAIN LANDING IS TAKEN DOWN */ +.dac-hero.mprev { + background-color: #fff; + background-position: 50% 53%; + background-size: cover; + background-image: url(../../assets/images/home/android_m_hero_1200.jpg); + box-sizing: border-box; + font-size: 16px; + min-height: 550px; + padding-top: 88px; +} +.dac-hero.dac-darken.mprev::before { + background: rgba(0, 0, 0, 0.3); + bottom: 0; + content: ''; + display: block; + left: 0; + position: absolute; + right: 0; + top: 0; +} + +.dac-hero.dac-darken.mprev::before { + background: -webkit-linear-gradient(top, rgba(0, 0, 0, .05), rgba(0, 0, 0, .05), #000 950px); + background: linear-gradient(to bottom, rgba(0, 0, 0, .05), rgba(0, 0, 0, 0.05), #000 950px); +} + +@media (max-width: 719px) { + + .dac-hero.dac-darken.mprev { + background-size: auto 600px; + background-position: 55% 0; + background-repeat: no-repeat; + } + + .dac-hero-figure.mprev { + height: 10px; + margin: 15px 0; + } +} + +@media (max-width: 719px) { + + .dac-hero.dac-darken.mprev { + background-size: auto 600px; + background-position: 55% 0; + background-repeat: no-repeat; + } + + .dac-hero-figure.mprev { + height: 10px; + margin: 15px 0; + } +} + +@media (max-width: 1200px) { + + .dac-hero.dac-darken.mprev { + background-size: auto 600px; + background-position: 55% 0; + background-repeat: no-repeat; + } +}
\ No newline at end of file diff --git a/tools/droiddoc/templates-sdk/assets/images/home/android_m_hero_1200.jpg b/tools/droiddoc/templates-sdk/assets/images/home/android_m_hero_1200.jpg Binary files differnew file mode 100644 index 0000000..6b79295 --- /dev/null +++ b/tools/droiddoc/templates-sdk/assets/images/home/android_m_hero_1200.jpg |