diff options
author | smain@google.com <smain@google.com> | 2014-06-19 17:07:46 -0700 |
---|---|---|
committer | smain@google.com <smain@google.com> | 2014-06-19 18:24:28 -0700 |
commit | cda1a9a756cbe694fda94687eccf64fdabb8c775 (patch) | |
tree | 7774ed022044f16e7f3286110c8501ece2e7e710 | |
parent | b8281c70915cc296d7083f46811850e6888ffdf3 (diff) | |
download | build-cda1a9a756cbe694fda94687eccf64fdabb8c775.zip build-cda1a9a756cbe694fda94687eccf64fdabb8c775.tar.gz build-cda1a9a756cbe694fda94687eccf64fdabb8c775.tar.bz2 |
add "static" class to allow hand-written version of collection card for the homepage
and add "no-section" override to resource widget to enable title+description only card layout
and make the landing-secondary button blue
Change-Id: I4432c2ff267c20cb64f9c87524560b2d779c9e91
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/css/default.css | 28 | ||||
-rw-r--r-- | tools/droiddoc/templates-sdk/assets/js/docs.js | 8 |
2 files changed, 28 insertions, 8 deletions
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index 28dced5..2ccabc8 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -5260,6 +5260,9 @@ a.download-sdk { -o-transition: opacity 0.5s; transition: opacity 0.5s; } +.static .card-bg:after { + display:none; +} .card-bg .card-section-icon { position: absolute; top: 50%; @@ -5413,6 +5416,9 @@ a.download-sdk { .resource-card:hover { cursor: pointer; } +.static .resource-card:hover { + cursor: auto; +} .resource-card:hover .card-bg:after { opacity: 0; } @@ -6329,6 +6335,17 @@ a.download-sdk { display: none; } + +/* Override to show the description instead of the content section */ +.no-section .resource-card-3x2 > .card-info .section, +.no-section .resource-card-6x2 > .card-info .section { + display: none; +} +.no-section .resource-card-3x2 > .card-info .description, +.no-section .resource-card-6x2 > .card-info .description { + display: block; +} + /* 1/2 row items */ .resource-card-3x3 > .card-bg, .resource-card-6x3 > .card-bg, .resource-card-9x3 > .card-bg, .resource-card-12x3 > .card-bg, .resource-card-15x3 > .card-bg, .resource-card-18x3 > .card-bg { left: 0; @@ -6425,6 +6442,8 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] border-top-color: #7e3794 !important; } + + /** * UTILITIES */ @@ -6689,15 +6708,15 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] } .landing-button.landing-secondary { - background-color: hsl(8, 70%, 44%); + background-color: #09c; } .landing-button.landing-secondary:hover { - background-color: hsl(8, 70%, 36%); + background-color: #2faddb; } .landing-button.landing-secondary:active { - background-color: hsl(8, 70%, 30%); + background-color: #3990ab; } a.landing-button, @@ -7134,7 +7153,6 @@ Styles for d.a.c/index: .actions-bar { background: #9acd00; margin: 0 -10px; - margin-top:-20px; text-align: center; } @@ -7143,7 +7161,7 @@ Styles for d.a.c/index: text-align: justify; font-size: 0.1px; line-height: 0.1px; - margin: 0 10px; + margin: 0 10px 0 0; } .actions-bar .actions:after { diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index 42cd29e..f6c12b2 100644 --- a/tools/droiddoc/templates-sdk/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk/assets/js/docs.js @@ -4018,9 +4018,11 @@ function showSamples() { var $this = $(this); var remainingHeight = $this.parent().parent().height(); $this.parent().siblings().each(function () - { - var h = $(this).height(); - remainingHeight = remainingHeight - h; + { + if ($(this).is(":visible")) { + var h = $(this).height(); + remainingHeight = remainingHeight - h; + } }); adjustedRemainingHeight = ((remainingHeight)/lineHeight>>0)*lineHeight |