diff options
author | Dirk Dougherty <ddougherty@google.com> | 2015-05-06 17:13:01 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-06 17:13:01 +0000 |
commit | 0717cb2251b0a972a73462841e346fc49aa6e804 (patch) | |
tree | b34abb555bed1de661d09cba56034dcd64e246b4 | |
parent | 0ba68bafa3b465110d10da1a57a1843ff91b2f3a (diff) | |
parent | e94fcf31a08a7cce45171b5f8cce29b50d2cefd8 (diff) | |
download | build-0717cb2251b0a972a73462841e346fc49aa6e804.tar.gz build-0717cb2251b0a972a73462841e346fc49aa6e804.tar.bz2 build-0717cb2251b0a972a73462841e346fc49aa6e804.zip |
am e94fcf31: am 29e93436: Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
* commit 'e94fcf31a08a7cce45171b5f8cce29b50d2cefd8':
Swap templates-sdk and templates-sdk-dev files to enable redesign builds by default.
36 files changed, 7673 insertions, 7673 deletions
diff --git a/tools/droiddoc/templates-sdk-dev/assets/css/default.css b/tools/droiddoc/templates-sdk-dev/assets/css/default.css index a105834de..cc4dce711 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/css/default.css +++ b/tools/droiddoc/templates-sdk-dev/assets/css/default.css @@ -17,31 +17,18 @@ html, body { height: 100%; margin: 0; padding: 0; - background-color: #fff; + background-color:#F9F9F9; -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; /* prevent subpixel antialiasing, which thickens the text */ /* text-rendering: optimizeLegibility; */ /* turned off ligatures due to bug 5945455 */ } body { - color: #515151; - color: rgba(0, 0, 0, .68); - font: 14px/24px Roboto, sans-serif; + color: #222; + font: 14px/19px Roboto, sans-serif; font-weight: 400; letter-spacing:.1; - min-width: 940px; - padding:0 20px; } - -body.responsive { - min-width: 0; -} - -@media (max-width: 719px) { - body.responsive { - padding: 0 10px; - } -} + padding:0 10px; } #page-container { width: 940px; @@ -111,252 +98,44 @@ body.responsive { #devdoc-nav.fixed { position: fixed; margin:0; - top: 84px; /* sticky-header height + 20px gutter */ + top: 65px; /* sticky-header height + 20px gutter */ } -@media (max-width: 719px) { - .responsive #devdoc-nav { - /* hide it temporarily, so responsive content can be tested. */ - /* Need to implement a more future proof solution for responsive navigation */ - display: none; - } +#devdoc-nav span.small { + font-size:12px; + font-weight:normal; } #content { width: 760px; float: left; } - -/***** PREVIOUSLY style.css ******************/ -/* This should be close to the top, so it is easier to override. */ -[dir='rtl'] { - direction: rtl; -} -html { - line-height: 20px; -} -pre, table, input, textarea, code { - font-size: 1em; -} -address, abbr, cite { - font-style: normal; -} -[dir='rtl'] th { - text-align: right; -} -html[lang^=ja] blockquote, html[lang^=ja] q, html[lang^=ko] blockquote, html[lang^=ko] q, -html[lang^=zh] blockquote, html[lang^=zh] q { - font-style: normal; -} -q { - font-style: italic; -} -fieldset, iframe, img { - border: 0; -} -img { - border: none; - -ms-interpolation-mode: bicubic; - max-width: 100%; - vertical-align: middle; -} -video { - max-width: 100%; - object-fit: cover; -} -q { - quotes: none; -} -sup, sub { - font-size: 11px; - line-height: 0; -} - -table, fieldset { - margin: 0; -} -/* Biggest type */ -.display-1 { - font-size: 56px; - line-height: 68px; -} -@media (max-width: 719px) { - .display-1 { - font-size: 44px; - line-height: 56px; - } -} -h1, h2, h3 { - color: #212121; - color: rgba(0, 0, 0, .87); -} -h1 { - font-size: 44px; - line-height: 56px; - margin: 24px 0 12px; - font-weight: 300; -} -h1.short { - margin-right:320px; -} -@media (max-width: 719px) { - h1 { - font-size: 36px; - line-height: 48px; - } -} -h2 { - font-size: 28px; - line-height: 32px; - margin: 24px 0 16px; - font-weight: 400; -} -h3 { - font-size: 24px; - line-height: 32px; - font-weight: 400; - margin: 16px 0; -} -h4 { - font-size: 18px; - line-height: 24px; - margin: 12px 0; - font-weight: 500; -} -h5, h6 { - font-size: 16px; - line-height: 24px; - margin: 8px 0; -} -hr { /* applied to the bottom of h2 elements */ - height: 1px; - margin: 7px 0 12px; - border: 0; - background: #e5e5e5; -} -p, pre, table, form { - margin: 0 0 12px; -} -small { - font-size: 11.5px; - color: #000; -} -ul, ol { - margin: 0 0 15px 20px; - padding: 0; -} -[dir='rtl'] ul, [dir='rtl'] ol { - margin: 10px 30px 10px 10px; -} -ul ul, ul ol, ol ul, ol ol { - margin-bottom: 0; - margin-top: 0; -} -li { - margin: 0 0 12px; -} -dt { - margin: 24px 0 12px; -} -dd { - margin:0 0 10px 40px; -} -dd p, -dd pre, -dd ul, -dd ol, -dd dl { - margin-top:10px; -} -li p, -li pre, -li ul, -li ol, -li dl { - margin-top: 6px; - margin-bottom: 6px; -} -dl dd dl:first-child { - margin-top: 0; -} -pre strong, pre b, a strong, a b, a code { - color: inherit; -} -pre, code { - color: #060; - font: 13px/18px 'Courier New', monospace; - -webkit-font-smoothing: subpixel-antialiased; - -moz-osx-font-smoothing: auto; -} - -legend { - display: none; -} -a:link, a:visited, .link-color { - color: #0ae; - text-decoration: none; -} -a:focus, a:hover, a:active { - color: #0ae; - text-decoration: none; -} -a.white { - color: #fff; - text-decoration:underline; -} -a.white:hover, a.white:active { - color: #ccc !important; -} -strong, b { - font-weight: bold; -} -table { - border-collapse: collapse; - border-spacing: 0; - border:0; - margin: .5em 1em 1em 0; - width:100%; /* consistent table widths; within IE's quirks */ - background-color:#f7f7f7; -} -th, td { - padding: 4px 12px; - vertical-align: top; - text-align: left; -} -td { - background-color:inherit; - border:solid 1px #DDD; -} -td *:last-child { - margin-bottom:0; -} -th { - background-color: #999; - color: #fff; - border:solid 1px #DDD; - font-weight: normal; -} -tr:first-of-type th:first-of-type:empty { - visibility: hidden; -} - a:hover, acronym:hover { - color: #7aa1b0; } + color: #7aa1b0 !important; } a:focus, a:active { - color: #33b5e5; } + color: #33b5e5 !important; } a.external-link { background:url('../images/styles/open_new_page.png') no-repeat 100% 50%; padding-right:16px; } +img { + border: none; } #jd-content img { margin-bottom:15px; } +ul { + margin: 0; + padding: 0; } + +strong { + font-weight: 500; } + em { font-style: italic; } @@ -376,7 +155,6 @@ video.with-shadow { /* disclosures mixin */ /* content layout */ -/* This grid is deprecated in favor of .cols and .col-X */ .layout-content-row { display: inline-block; margin-bottom: 10px; } @@ -486,12 +264,12 @@ video.with-shadow { /* sublinks */ } #nav li { list-style-type: none; - font-size: 12px; + font-size: 14px; margin:0; padding:0; - line-height: 18px; } + line-height: 15px; } #nav a { - color: #505050; + color: #555555; text-decoration: none; word-wrap:break-word; } #nav .nav-section-header { @@ -510,8 +288,9 @@ video.with-shadow { /* section header links */ #nav > li > div > a { display: block; - font-weight: 700; - padding: 13px 0 12px 10px; } + color: #333333; + font-weight: 500; + padding: 10px 0 10px 10px; } #nav .nav-section-header:after { content: ''; background: transparent url(../images/styles/disclosure_down.png) no-repeat scroll 50% 50%; @@ -519,7 +298,7 @@ video.with-shadow { height: 34px; display: block; position: absolute; - top: 6px; + top: 0; right: 0; } #nav .nav-section-header.empty { padding:0; } @@ -533,24 +312,22 @@ video.with-shadow { #nav .nav-section li a { /* first gen child (2nd level li) */ display:block; - font-weight: 700; + font-weight: normal; text-transform: none; - padding: 13px 5px 13px 10px; + padding: 7px 5px 7px 10px; } #nav .nav-section li li a { /* second gen child (3rd level li) */ - font-weight: 400; - padding: 7px 5px 7px 10px; + padding: 5px 5px 5px 10px; } #nav li.expanded .nav-section-header { - background: #f0f0f0; } - #nav li.expanded .nav-section-header.empty { - background: none; } + background:#e9e9e9; + background: rgba(0, 0, 0, 0.05); } #nav li.expanded li .nav-section-header { - background: none; } + background: transparent; } #nav li.expanded li ul { /* 3rd level ul */ - padding:6px 0 1px 20px; + padding:0 0 0 10px; } #nav li.expanded > .nav-section-header:after { content: ''; @@ -617,12 +394,16 @@ video.with-shadow { padding-bottom:0; } #nav li.expanded ul > li { - background:#f7f7f7; } + background:#efefef; + background: rgba(0, 0, 0, 0.03); } #nav li.expanded ul > li li { background:inherit; } #nav li ul.tree-list-children ul { display:block; } +#nav.samples-nav li li li { + font-size:13px; +} #nav.samples-nav li li li a { padding-top:3px; padding-bottom:3px; @@ -642,19 +423,25 @@ video.with-shadow { /* content header */ .content-header { - position: relative; -} -.content-header:before, -.content-header:after { - content: ''; - display: table; - /* Clear heading margins, to make absolutely positioned nav a bit more predictable. */ -} + height: 30px; + margin:36px 0 23px; /* same as h1 */ + padding:0 0 10px;} /* same as h1 */ .content-header.just-links { margin-bottom:0; padding-bottom:0;} +.content-header h1 { + margin:0; + padding:0; + width: 700px; +} +.content-header > div:first-child { + height:1px; /* set fixed height for the header div to ensure the + next/prev links align with toc on training classes */ +} + .content-footer { + border-top: 1px solid #ccc; margin-top: 10px; padding-top:10px; width:100%; } @@ -666,7 +453,7 @@ video.with-shadow { margin-right:0; } .content-footer.wrap { - max-width:940px; + width:940px; } .content-footer .plus-container { margin:5px 0 0; @@ -680,10 +467,7 @@ a.back-link { } .content-header .paging-links { - position: absolute; - right: 0; - top: 8px; - width: 220px; + margin-top:-25px; } .paging-links { position: relative; @@ -692,7 +476,9 @@ a.back-link { position: absolute; } .paging-links a, .training-nav-top a { - text-decoration: none; } + color: #555555; + text-decoration: none; + text-transform: uppercase; } .paging-links .prev-page-link:before, .training-nav-top .prev-page-link:before, a.back-link:before { @@ -731,25 +517,20 @@ a.back-link { } .training-nav-top a { - border-bottom:0; - box-sizing: border-box; - color: inherit; display:block; float:left; - padding:10px 0; - line-height:30px; + width:122px; + height:28px; + padding: 8px; + line-height:28px; text-align:center; - width: 50%; - } - - .training-nav-top a.prev-page-link { - padding-left: 15px; - text-align: left; + border:1px solid #DADADA; + border-bottom:0; } .training-nav-top a.next-page-link { - padding-right: 15px; - text-align: right; + border-left:0; + width:123px; } .paging-links a.disabled, @@ -776,50 +557,31 @@ a.back-link { /* list of classes on course landing page */ ol.class-list { - counter-reset: class; - list-style: none; - margin: 60px 0 0; + list-style:none; + margin-left:0; } ol.class-list>li { - box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.26); - margin: 0 0 20px; - overflow: hidden; + margin:0 0 15px; + padding:5px 0 0; + overflow:hidden; + border-top:1px solid #ccc; } - ol.class-list .title { - background: #00bcd4; - color: #fff; - display: block; - font-size: 20px; - font-weight: 500; - height: 32px; - margin: 0; - padding: 52px 16px 12px; - position: relative; - } - ol.class-list .title:before { - border-bottom: 1px solid white; - box-sizing: border-box; - /* Disable the numbers for now, since vert few classes need to be taken in order. */ - /* content: counter(class); */ - counter-increment: class; - height: 40px; - left: 0; - padding: 10px 1px 0 5px; - position: absolute; - top: 0; - text-align: right; - min-width: 30px; + ol.class-list li a.title { + font-size:16px; + margin:0; + clear:left; + display:block; + height:32px; + padding:0 4px; } - ol.class-list .title h2 { - color: currentColor; - font-size: inherit; - font-weight: inherit; + ol.class-list li a.title h2 { + color:inherit; margin:0 0 10px; display:block; float:left; width:675px; } - ol.class-list .title span { + ol.class-list li a.title span { display:none; float:left; font-size:18px; @@ -828,71 +590,40 @@ a.back-link { width: 10px; height: 32px; } + ol.class-list li a.title:hover { + background:#ddd; + color:#258AAF !important; + } + ol.class-list li a.title:hover span { + display:block; + } - ol.class-list .description { - box-sizing: border-box; + #jd-content + ol.class-list li img { + float:left; + clear:left; + width:64px; + margin:0 20px 0 0; + } + ol.class-list li p.description { float:left; display:block; + width:250px; margin:0; - padding: 16px 10px 16px 16px; - width: 50%; } - ol.class-list .description.article { + ol.class-list li p.description.article { width: 550px; } ol.class-list ol { - box-sizing: border-box; - float: left; - list-style: none; - margin: 0; - padding: 16px 16px 16px 10px; - width: 50%; - } - ol.class-list .lessons li { - margin: 0 0 6px; - line-height: 16px; - } - - /* Class colors */ - ol.class-list li:nth-child(10n+1) .title { - background: #00bcd4; - } - ol.class-list li:nth-child(10n+2) .title { - background: #4db6ac; - } - ol.class-list li:nth-child(10n+3) .title { - background: #66bb6a; - } - ol.class-list li:nth-child(10n+4) .title { - background: #7cb342; - } - ol.class-list li:nth-child(10n+5) .title { - background: #afb42b; - } - ol.class-list li:nth-child(10n+6) .title { - background: #ffb300; - } - ol.class-list li:nth-child(10n+7) .title { - background: #ff7043; - } - ol.class-list li:nth-child(10n+8) .title { - background: #ec407a; - } - ol.class-list li:nth-child(10n+9) .title { - background: #ab47bc; + float:left; + width:320px; + margin:0 0 0 30px; + list-style:none; + margin:0 0 0 20px; } - ol.class-list li:nth-child(10n+10) .title { - background: #7e57c2; - } - - @media (max-width: 719px) { - .responsive ol.class-list ol, - .responsive ol.class-list .description { - float: none; - margin: 16px; - padding: 0; - width: auto; - } + ol.class-list div.lessons li { + margin:0 0 6px; + line-height:16px; } @@ -1340,6 +1071,233 @@ scroll top left; + + + + + + + + + + + + + + + +/***** PREVIOUSLY style.css ******************/ + + + + + +@media screen, projection, print { +[dir='rtl'] { + direction: rtl; +} +html { + line-height: 20px; +} +pre, table, input, textarea, code { + font-size: 1em; +} +address, abbr, cite { + font-style: normal; +} +[dir='rtl'] th { + text-align: right; +} +html[lang^=ja] blockquote, html[lang^=ja] q, html[lang^=ko] blockquote, html[lang^=ko] q, +html[lang^=zh] blockquote, html[lang^=zh] q { + font-style: normal; +} +q { + font-style: italic; +} +fieldset, iframe, img { + border: 0; +} +img { + -ms-interpolation-mode: bicubic; + vertical-align: middle; + max-width: 100%; +} +q { + quotes: none; +} +sup, sub { + font-size: 11px; + line-height: 0; +} +} + +@media screen, projection { + +table, fieldset { + margin: 0; +} +h1 { + color:#333; + font-size: 34px; + margin: 36px 0 27px; + padding:0 0 10px; + font-weight:300; +} +h1, h2 { + line-height: 30px; +} +h1.short { + margin-right:320px; +} +h1.short { + margin-right:320px; +} +h1.super { + font-size: 37px; +} +h2 { + color:#333; + font-size: 26px; + margin: 32px 0 20px; + padding:0; + font-weight:300; +} +h3 { + color:#333; + font-size: 21px; + font-weight:400; + margin:21px 0 14px 0; +} +h3, h4 { + line-height: 21px; +} +h4 { + font-size: 18px; + margin: 12px 0; + font-weight:500; +} +h5 { + font-size: 14px; +} +h5, h6 { + margin: 5px 0; +} +h6 { + font-size: 12px; +} +hr { /* applied to the bottom of h2 elements */ + height: 1px; + margin: 3px 0 12px; + border: 0; + background: #ccc; +} +p, pre, table, form { + margin: 0 0 15px; +} +small { + font-size: 11.5px; + color: #000; +} +ul, ol { + margin: 0 0 15px 18px; + padding: 0; +} +[dir='rtl'] ul, [dir='rtl'] ol { + margin: 10px 30px 10px 10px; +} +ul ul, ul ol, ol ul, ol ol { + margin-bottom: 0; + margin-top: 0; +} +li { + margin:0 0 5px; +} +dd { + margin:0 0 10px 30px; +} +dd p, +dd pre, +dd ul, +dd ol, +dd dl { + margin-top:10px; +} +li p, +li pre, +li ul, +li ol, +li dl { + margin-top:5px; + margin-bottom:5px; +} +dl dd dl:first-child { + margin-top:0; +} +pre strong, pre b, a strong, a b, a code { + color: inherit; +} +pre, code { + color: #060; + font: 13px/1.5 monospace; +} +code { + font-weight:bold; + font: 13px/14px monospace; +} + +legend { + display: none; +} +a:link, a:visited, .link-color { + color: #258aaf; + text-decoration: none; +} +a:focus, a:hover, a:active { + color: #33B5E5; + text-decoration: none; +} +a.white { + color: #fff; + text-decoration:underline; +} +a.white:hover, a.white:active { + color: #ccc !important; +} +strong, b { + font-weight:bold; + color: #222; +} +table { + border-collapse: collapse; + border-spacing: 0; + border:0; + margin: .5em 1em 1em 0; + width:100%; /* consistent table widths; within IE's quirks */ + background-color:#f7f7f7; +} +th, td { + padding: 4px 12px; + vertical-align: top; + text-align: left; +} +td { + background-color:inherit; + border:solid 1px #DDD; +} +td *:last-child { + margin-bottom:0; +} +th { + background-color: #999; + color: #fff; + border:solid 1px #DDD; + font-weight: normal; +} +tr:first-of-type th:first-of-type:empty { + visibility: hidden; +} + /* -------------------------------------------------------------------------- Footer */ @@ -1510,11 +1468,236 @@ color-stop(50%, #acbc00), color-stop(50%, #bdde00), color-stop(100%, #bdde00)); } /* ============================================================================= + Columns + ========================================================================== */ + +@media screen, projection, print { +.full { + padding: 2.5em 0; + border-top: solid 1px #ddd; + border-bottom: solid 1px #ddd; + background: #f7f7f7; +} +.wrap { + margin: 0 auto; + width: 940px; + clear: both; +} +.cols { + height: 1%; + margin: 0 -1.533742331288343558282%; + width: 103.06748466257669%} +*+html .cols { + margin-bottom: 20px; +} +.cols:after { + clear: both; + content: ' '; + display: block; + height: 0; + visibility: hidden; +} +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, +.col-13, .col-14, .col-15, .col-16 { + display: inline; + float: left; + margin-left: 10px; + margin-right: 10px; +} +/* +* html .col-1, * html .col-2, * html .col-3, * html .col-4, * html .col-5, * html .col-6, * html +.col-7, * html .col-8, * html .col-9, * html .col-10, * html .col-11, * html .col-12 { + margin: 0; + padding: 0 1.4% 20px; +} +[dir='rtl'] .col-1, [dir='rtl'] .col-2, [dir='rtl'] .col-3, [dir='rtl'] .col-4, [dir='rtl'] .col-5, +[dir='rtl'] .col-6, [dir='rtl'] .col-7, [dir='rtl'] .col-8, [dir='rtl'] .col-9, [dir='rtl'] .col-10, +[dir='rtl'] .col-11, [dir='rtl'] .col-12 { + float: right; +} +*/ +.col-1 { width: 40px } +.col-2 { width: 100px } +.col-3 { width: 160px } +.col-4 { width: 220px } +.col-5 { width: 280px } +.col-6 { width: 340px } +.col-7 { width: 400px } +.col-8 { width: 460px } +.col-9 { width: 520px } +.col-10 { width: 580px } +.col-11 { width: 640px } +.col-12 { width: 700px } +.col-13 { width: 760px } +.col-14 { width: 820px } +.col-15 { width: 880px } +.col-16 { width: 940px } +} + +.col-right { + margin-right:0px; +} + +@media screen and (max-width:772px) { +.col-5, .col-6, .col-7 { + clear: both; + width: 97.0238096%} +} + +/* ============================================================================= Layout ========================================================================== */ @media screen, projection, print { /* -------------------------------------------------------------------------- +Header, Login, Nav-X, Search +*/ +#header { + margin: 0; + padding: 0; +} +#header:before, #header:after { + content: ""; + display: table; + clear: both +} +.logo, .nav-x { + float: left; +} +.nav-x { + margin-top: -2px; + list-style-type: none; +} +.nav-x a { + color: #333; + font-size: 16px; +} +.about a.selected { + color: #9933CC; +} +.design a.selected { + color: #33b5e5; +} +.develop a.selected { + color: #F80; +} +.distribute a.selected { + color: #9C0; +} + + + +.nav-x li { + display: inline; + margin-right: 45px; +} +.search { + float: right; + position: relative; + width: 220px +} +.search .bottom, .search .left, .search .right { + position: absolute; + background-color: #a3a3a3; +} +.search .bottom { + width: 220px; + height: 1px; + top: 24px; + left: 0 +} +.search .left, .search .right { + height: 5px; + width: 1px +} +.search .left { top: 19px; left: 0 } +.search .right { top: 19px; right: 0 } +.search form { + float: left; + margin-top: 2px; + width: inherit; +} +.search .close, +#player-frame .close { + position: absolute; + right: 8px; + bottom: 4px; + width: 16px; + height: 16px; + margin: 0; + text-indent: -1000em; + background: url(../images/close.png) no-repeat 0 0; + z-index:9999; +} +.search .close:hover, .search .close:focus, +#player-frame .close:hover, #player-frame .close:focus { + background-position: -16px 0; + cursor:pointer; +} +#player-frame .close { + top: 6px; +} +.search form input { + color: #999; + font-size: 1em; + width: inherit; + border: none; + margin: 0; + padding:0 0 0 6px; + z-index: 1500; + background-color: transparent +} +.search:hover .bottom, .search:hover .left, .search:hover .right { + background-color: #33b5e5; +} +.search:hover .icon { + background-position: -8px 0 +} +.search form input:focus { + color: #222; + font-weight: bold; + outline:0; +} +/* Search Dropdown */ +.search-dropdown { + padding: 15px; + width: 192px; + border: solid 1px #c5c5c5; + background: #fff; + position: absolute; + top: 35px; + left: 0; + -moz-box-shadow: 0 0 10px rgba(0,0,0,0.2); + -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.2); + box-shadow: 0 0 10px rgba(0,0,0,0.2) +} +.search-dropdown ul, .search-dropdown ul li { + list-style-type: none; + margin: 0; + padding: 0 +} +.search-dropdown ul li { + clear: both +} +.search-dropdown img { + float: left; + margin: 0 10px 10px 0 +} +.search-dropdown h6 { + color: #222; + margin: 0; + line-height: normal +} +.search-dropdown .desc { + color: #999; + font-size: 11.5px; + line-height: normal; + margin: 0; +} +.search-dropdown li a:hover h6, .search-dropdown li a:hover .desc { + color: #33b5e5 +} +/* -------------------------------------------------------------------------- Buttons */ .button, a.button, .button-secondary, a.button-secondary { @@ -1628,7 +1811,7 @@ endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */ -webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05); -moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05); box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05); - color: #0ae !important; + color: #258AAF !important; } .button.big { font-size:20px; @@ -1697,37 +1880,18 @@ EndColorStr='#ececec'); width:291px; } -.training-nav-top { - border:1px solid #e5e5e5; - border-width: 1px 1px 0; - bottom: -56px; - box-sizing: border-box; - position: absolute; - right: 0; - width: 280px; +.training-nav-top, +.training-nav-bottom { + float:right; + margin:0 0 0 20px; } -@media (max-width: 719px) { - .responsive .training-nav-top { - left: 0; - width: auto; - } - - .responsive #tb-wrapper { - clear: none; - float: none; - margin-left: 0; - } - - .responsive #tb { - float: none; - width: auto; - } +.training-nav-top { + position:relative; + top:73px; } .training-nav-bottom { - float:right; - margin:0 0 0 20px; padding:0 0 20px; } @@ -1740,37 +1904,33 @@ EndColorStr='#ececec'); } #tb-wrapper { - margin:56px 0 0 20px; /* negative top-margin to counter the content-header bottom margin */ + margin:51px 0 0 20px; /* negative top-margin to counter the content-header bottom margin */ } #tb, #qv { - border: 1px solid #e5e5e5; - box-sizing: border-box; - float: right; - padding: 5px 0; - width: 240px; + font-size:13px; + line-height:18px; + width:238px; + border:1px solid #ccc; + float:right; } #tb { - width:280px; + width:278px; } #tb h2, #qv h2 { - border-top: 1px solid #e5e5e5; - color: inherit; - font-size: 16px; - line-height: 24px; - margin: 15px 0 4px; - padding: 10px 15px 0; + margin:10px 15px; + padding:0; + text-transform:uppercase; + border-bottom:1px solid gainsboro; } -#tb h2:first-child, -#qv h2:first-child { - border-top: 0; - padding-top: 0; - margin-top: 10px; +#tb *, +#qv * { + font-size:inherit; } #tb .download-box, @@ -1782,6 +1942,7 @@ EndColorStr='#ececec'); #qv .download-box .filename { font-size:11px; margin:4px 4px 10px; + color:#666; } @@ -1798,9 +1959,9 @@ EndColorStr='#ececec'); width:226px; font-size:13px; line-height:18px; - border-left:3px solid #a9e27d; + border-left:4px solid #99CC00; float:right; - padding:0 0 0 20px; + padding:0 0 0 10px; margin:0 0 1em 20px; } @@ -1824,15 +1985,7 @@ EndColorStr='#ececec'); #tb ol, #tb ul, #qv ul { - list-style-type: none; - margin:0 15px 10px 15px; -} - -#tb li, -#qv li { - margin: 4px 0; - padding: 0 0 0 16px; - position: relative; + margin:0 15px 10px 35px; } #tb p { @@ -1852,7 +2005,11 @@ EndColorStr='#ececec'); #qv ul ul, .sidebox ol ol, .sidebox ul ul { - margin: 8px 0; + margin-bottom:0; +} + +#qv ol ol { + margin:3px 0 3px 15px; } .sidebox p, @@ -1988,6 +2145,7 @@ form .form-error input[type='text'], form .form-error textarea { border-radius: 2px; margin: 10px 0; padding: 20px; + color: #666; position: relative; background: #f9f9f9; } @@ -2285,7 +2443,7 @@ a:visited, border-bottom: 1px solid #CCC; background:#e9e9e9; background: rgba(0, 0, 0, 0.05); /* matches #nav li.expanded */ - line-height: 19px; /* Fix regression after page line-height is bumped to 24px */ + } #api-nav-title { padding:0 5px; @@ -2637,7 +2795,7 @@ a#butterbar-message:hover { } /* -------------------------------------------------------------------------- -Misc and article typography +Misc */ @@ -2684,46 +2842,27 @@ pre.classic { p.img-caption { margin: -10px 0 20px; - font-size: 13px; -} - -div.figure-center { - margin: 32px auto 24px; - max-width: 100%; + font-size:13px; + color:#666; } div.figure, div.figure-right { - clear: right; - float: right; - margin: 10px 0 0 0; - padding: 0 0 0 20px; - max-width: 50%; + float:right; + clear:right; + margin:10px 0 0 0; + padding:0 0 0 20px; /* width must be defined w/ an inline style matching the image width */ } div.figure-left { - clear: left; - float: left; - margin: 10px 0 0 0; - padding: 0 20px 0 0; - max-width: 50%; + float:left; + clear:left; + margin:10px 0 0 0; + padding:0 20px 0 0; /* width must be defined w/ an inline style matching the image width */ } -@media (max-width: 719px) { - /* Collapse on mobile. */ - .responsive div.figure, - .responsive div.figure-right, - .responsive div.figure-left { - float: none; - clear: none; - padding: 0; - margin: 32px auto 24px; - max-width: 100%; - } -} - img.frame { border:1px solid #DDD; padding:4px; @@ -2732,31 +2871,38 @@ img.frame { p.table-caption { margin: 0 0 4px 0; font-size:13px; + color:#666; } p.code-caption { margin-bottom: 4px; font: 12px/1.5 monospace; + color:#666; +} + +div.note, +div.caution, +div.warning { + margin: 0 0 15px; } p.note, div.note, p.caution, div.caution, p.warning, div.warning { - padding: 0 0 0 20px; - border-left: 3px solid; - margin: 16px 0; + padding: 0 0 0 10px; + border-left: 4px solid; } p.note, div.note { - border-color: #66c2ff; + border-color: #258AAF; } p.caution, div.caution { - border-color: #f81; + border-color: #FF8800; } p.warning, div.warning { - border-color: #f55; + border-color: #ff4443; } div.note.design { @@ -2819,7 +2965,8 @@ div.design-announce p { a.notice-developers-video, a.notice-developers, a.notice-designers-video, -a.notice-designers { +a.notice-designers, +a.notice-designers-material { float:right; clear:right; width:238px; @@ -2830,13 +2977,15 @@ a.notice-designers { a.notice-developers-video.wide, a.notice-developers.wide, a.notice-designers-video.wide, -a.notice-designers.wide { +a.notice-designers.wide, +a.notice-designers-material.wide { width:278px; } a.notice-developers-video div, a.notice-developers div, a.notice-designers-video div, -a.notice-designers div { +a.notice-designers div, +a.notice-designers-material div { min-height:40px; background:url('../images/styles/notice-developers@2x.png') no-repeat 10px 10px; background-size:40px 40px; @@ -2854,16 +3003,22 @@ a.notice-developers-video div { background:url('../images/styles/notice-developers-video@2x.png') no-repeat 10px 10px; background-size:40px 40px; } +a.notice-designers-material div { + background:url('../images/styles/notice-designers-material@2x.png') no-repeat 10px 10px; + background-size:40px 40px; +} a.notice-developers-video:hover, a.notice-developers:hover, a.notice-designers-video:hover, -a.notice-designers:hover { +a.notice-designers:hover, +a.notice-designers-material:hover { background:#eee; } a.notice-developers-video h3, a.notice-developers h3, a.notice-designers-video h3, -a.notice-designers h3 { +a.notice-designers h3, +a.notice-designers-material h3 { font-size:13px; line-height:18px; font-weight:bold; @@ -2874,14 +3029,16 @@ a.notice-designers h3 { a.notice-developers-video p, a.notice-developers p, a.notice-designers-video p, -a.notice-designers p { +a.notice-designers p, +a.notice-designers-material p { margin:0; line-height:14px; } a.notice-developers-video.left, a.notice-developers.left, a.notice-designers-video.left, -a.notice-designers.left { +a.notice-designers.left, +a.notice-designers-material.left { margin-left:0; float:left; } @@ -3308,15 +3465,6 @@ Page-Specific Styles } */ -/* First paragraph of a content pages is a bit larger - - note the very specific selector. */ -.jd-descr > p:first-child, -.jd-descr > #tb-wrapper + p, -.jd-descr > #qv-wrapper + p { - font-size: 16px; - margin-bottom: 16px; -} - /* page-top-right container for reference pages (holds links to summary tables) */ #api-info-block { @@ -3528,7 +3676,6 @@ h5.jd-tagtitle { font-style:italic; } - /* Inline api level indicator for methods */ div.api-level { font-size:.8em; @@ -3549,6 +3696,27 @@ table.jd-tagtable th { } + + + + + + + + + + + + + + + + + + + + + /* SEARCH FILTER */ .menu-container { @@ -3558,39 +3726,53 @@ table.jd-tagtable th { font-weight:normal; } -.search_filtered_wrapper { - position: absolute; - right: 18px; - top: 64px; +.search_filtered_wrapper.reference { + width: 193px; + float: right; +} +.search_filtered_wrapper.docs { + width:875px; + float: left; + position:absolute; + top:26px; + right:66px; } .suggest-card { - float:right; position:relative; width:170px; min-height:90px; padding:5px; border: solid 1px #C5C5C5; background: white; + top: 15px; margin-right:-5px; -moz-box-shadow: 0 0 10px rgba(0,0,0,0.2); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); } .suggest-card.reference { - z-index: 998; - width: auto; + position:absolute; + z-index:999; + min-width:171px; /* +padding and border makes this match input width */ + min-height:93px; /* add 3px because this has 1 not 4px top border */ + width:auto; + top:41px; + margin:0; } .suggest-card.develop { z-index:997; border-top: solid 4px #F80; + float:right; } .suggest-card.design { z-index:996; border-top: solid 4px #33b5e5; + float:right; } .suggest-card.distribute { z-index:995; border-top: solid 4px #9C0; + float:right; } .child-card { width:100%; @@ -3670,6 +3852,8 @@ ul.search_filtered { + + /* SEARCH RESULTS */ @@ -3791,7 +3975,7 @@ td.gsc-search-button { #searchResults h2#searchTitle { padding:0; - margin:30px 0 5px; + margin:5px 0; border:none; } @@ -3840,7 +4024,7 @@ td.gsc-search-button { #searchResults .gsc-tabHeader.gsc-tabhInactive, #searchResults .gsc-cursor-page { text-decoration:none; - color:#0ae; + color:#258AAF; border: solid 1px #DADADA; } @@ -3854,7 +4038,7 @@ td.gsc-search-button { background-image: -ms-linear-gradient(top, #F9F9F9, #ECECEC); background-image: -o-linear-gradient(top, #F9F9F9, #ECECEC); background-image: linear-gradient(top, #F9F9F9, #ECECEC); - filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f9f9f9', + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f9f9f9', EndColorStr='#ececec'); color: #33B5E5; } @@ -3879,8 +4063,58 @@ EndColorStr='#ececec'); + /************ STICKY NAV BAR ******************/ +#header-wrapper { + background: #f9f9f9; + margin: 0 -10px 0 -10px; + padding: 31px 10px 0px 10px; + position: relative; +} +#header-wrapper #nav-x div.wrap { + max-width: 940px; + height: 38px; +} +#header-wrapper #nav-x ul.nav-x li { + margin-right: 31px !important; + margin-top: 5px; + margin-bottom: 0px; + height: 30px; +} +#header-wrapper #nav-x > div.wrap ul.nav-x li.active { + color: #669900; + border-bottom: 3px solid #669900; +} +#header-wrapper #nav-x > div.wrap ul.nav-x li.active a { + color: #669900; +} +#header-wrapper #nav-x > div.wrap ul.nav-x a { + font-size: 14.5px; +} +#header-wrapper .developer-console-btn { + float: right; + background: #fefefe; + border-radius: 4px; + padding: 8px 14px; + box-shadow: 1px 1px 0px #7a7a7a; + font-size: 14px; + margin-top: -6px; + cursor: pointer; + color: #464646; + margin-right: 20px; +} +/* not currently used */ +#header-wrapper .shadow { + width: 1034px; + height: 4px; + position: absolute; + left: 50%; + margin-left: -517px; + bottom: -4px; + background-image: url(../images/header-shadow.png); +} + #context { clear: both; padding-top: 14px; @@ -3924,8 +4158,78 @@ EndColorStr='#ececec'); display: none; } +/* Sticky Nav overrides */ +.sticky-menu { + position: fixed; + width: 940px; + height: 0px; + z-index: 51; + top: 12px; +} +#sticky-header { + display: none; + padding: 0 10px; + position: fixed; + background: #f9f9f9; + top: 0px; + left: 0px; + right: 0px; + height: 45px; + box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1); + border-bottom: 1px solid #a5c43a; + z-index: 50; +} +#sticky-header.design { + border-bottom: 1px solid #33b5e5; +} +#sticky-header.develop { + border-bottom: 1px solid #F80; +} +#sticky-header.distribute { + border-bottom: 1px solid #9C0; +} +#sticky-header.about { + border-bottom: 1px solid #9933CC; +} +#sticky-header > div { + overflow: hidden; + *zoom: 1; + width: 940px; + margin: 0 auto; + clear: both; + padding-top: 9px; +} +#sticky-header > div .logo { + float: left; + width: 26px; + height: 25px; + background: url(../images/dac_logo.png); + background-image: -webkit-image-set(url(../images/dac_logo.png) 1x, url(../images/dac_logo@2x.png) 2x); + z-index: 52; + position: relative; +} +#sticky-header > div .top { + float: left; + width: 38px; + height: 38px; + position: relative; + background: url(../images/styles/gototop.png); + z-index: 52; +} +#sticky-header > div .breadcrumb { + float: left; + padding: 0 0 0 10px; + border-left: 1px solid #d2d2d2; + line-height: 24px; + font-size: 14px; + position: relative; + top: 0px; + z-index: 52; +} + /* offset the <a name=""> tags to account for sticky nav */ -body.reference a[name] { +body.reference a[name], +div.renderscript a[name] { visibility: hidden; display: block; position: relative; @@ -3933,6 +4237,76 @@ body.reference a[name] { } +} + + + + + + + +/*********** PREVIOUSLY dac-styles.css ***************/ + + +#header { + border-bottom:0; +} + +#header .wrap { + max-width:940px; + height:41px; + border-bottom:1px solid; + border-color: #ccc; + position:relative; +} + +.about #header .wrap { + border-color: #9933CC; +} + +.design #header .wrap { + border-color: #33b5e5; +} + +.develop #header .wrap { + border-color: #F80; +} + +.distribute #header .wrap { + border-color: #9C0; +} + +.logo a { + float:left; +} + +#header .logo { + margin-top: -6px; + margin-left: 0px; + margin-bottom:0px; + width: 160px; + padding-right:10px; +} + + +#header-wrap .logo.landing-logo { + width:220px; + margin:0; + padding:0; + margin-bottom:22px; +} +#header-wrap .logo.landing-logo img { + padding:0 0 0 10px; +} + +.search { + height:25px; + margin-top: -3px; + margin-bottom: 0px; +} + + + /* Quicknav */ .btn-quicknav { width:20px; @@ -3970,6 +4344,17 @@ body.reference a[name] { display:block; } +.nav-x li { + display:block; + float:left; + margin-right:45px; + -webkit-transition: all 0.25s linear; + -moz-transition: all 0.25s linear; + -ms-transition: all 0.25s linear; + -o-transition: all 0.25s linear; + transition: all 0.25s linear; +} + #header-wrap.quicknav .nav-x li { min-width:160px; margin-right:20px; @@ -4055,6 +4440,105 @@ body.reference a[name] { } +/* SEARCH AND MORE */ +.search { + position: absolute; + width: 50px; + height:28px; + display: block; + margin-top:-3px; + margin-bottom:7px; + overflow:hidden; + z-index:100; + right:54px; + -webkit-transition: width 0.4s ease; + -moz-transition: width 0.4s ease; + -o-transition: width 0.4s ease; + transition: width 0.4s ease; +} + +.search #search-btn { + width:50px; + height:28px; + background:url(../images/icon_search.png) no-repeat; + float:left; +} + +.search-inner { + width:245px; +} + +.search:hover, .search.active { + width:245px; +} + +.search .bottom, .search .left, .search .right { + position: absolute; + background-color: #a2a2a2 +} + +.search .bottom { + width: 214px; + height: 1px; + top: 24px; + left: 0 +} + +.search .left, .search .right { + height: 5px; + width: 1px +} + +.search .left { + top: 22px; + left: 56px; + background-color:#CCC; +} + +.search .right { + top: 22px; + left: 238px; + background-color:#CCC; +} + +.search form { + margin-top: 2px; + width: 162px; + float:left; +} + +.search form input { + color: #2f2f2f; + font-size: 0.95em; + width: 178px; + border: none; + margin-left: 6px; + z-index: 1500; + position: relative; + background-color: transparent; + border-bottom:1px solid #CCC; + padding:0 0 0 4px; + outline:none; + height:24px; +} + +.search:hover form input { + border-bottom:1px solid #33B5E5; +} + +.search:hover .bottom, .search:hover .left, .search:hover .right { + background-color: #33b5e5; +} + +.search:hover #search-btn { + background-position: 0 -28px +} + +.search form input:focus { + color: #222; + font-weight: bold +} + .moremenu { float: right; position: relative; @@ -4207,9 +4691,9 @@ body.reference a[name] { height:12px; text-indent:-8000px; list-style:none; - margin: 0 3px; + margin: 0 2px; border-radius:6px; - background-color:#ddd; + background-color:#ccc; cursor:pointer; -webkit-transition:color .5s ease-in; -moz-transition:color .5s ease-in; @@ -4217,13 +4701,13 @@ body.reference a[name] { transition:color .5s ease-in; } .slideshow-container .pagination ul li:hover { - background-color:#bbb; + background-color:#999; } .slideshow-container .pagination ul li.active { - background-color:#6ab344; + background-color:#33b5e5; } .slideshow-container .pagination ul li.active:hover { - background-color:#6ab344; + background-color:#33b5e5; } .slideshow-container ul li { display:inline; @@ -4243,14 +4727,27 @@ a.download-sdk { padding-bottom:0px; } +#nav-x { + padding-top: 13px; +} + +#nav-x .wrap { + min-height:32px; +} + +#nav-x .wrap, #searchResults.wrap { max-width:940px; - border-bottom:1px solid #e5e5e5; + border-bottom:1px solid #CCC; } #searchResults.wrap #leftSearchControl { min-height:700px } +.nav-x { + margin-left:0; + margin-bottom:0; +} @@ -4320,7 +4817,7 @@ a.download-sdk { } .jspDrag { - background: #ccc; + background: #bbb; position: relative; top: 0; left: 0; @@ -4563,7 +5060,7 @@ a.download-sdk { display:none; margin: -1px auto 0; position: relative; - max-width: 940px; + width: 940px; height: 0px; } #player-frame { @@ -4575,22 +5072,6 @@ a.download-sdk { height: 330px; position: relative; } -#player-frame .close { - position: absolute; - right: 8px; - bottom: 4px; - width: 16px; - height: 16px; - margin: 0; - text-indent: -1000em; - top: 6px; - background: url(../images/close.png) no-repeat 0 0; - z-index:9999; -} -#player-frame .close:hover, #player-frame .close:focus { - background-position: -16px 0; - cursor:pointer; -} @@ -4645,7 +5126,7 @@ a.download-sdk { } .landing-docs .normal-links a { - color:#0ae !important; + color:#258aaf !important; } .plusone { @@ -4769,6 +5250,9 @@ a.download-sdk { .home-sections ul li.last { margin-right: 0px; } +.fullpage #footer { + margin-top: -40px; +} /************ DISTRIBUTE PAGES ******************/ @@ -4810,10 +5294,1228 @@ a.download-sdk { } .figure img, .border-img { - box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37); margin-bottom: 15px; } +/************ RESOURCE CARDS ******************/ + +/* Resource cards, 12, 13, 16-col */ + +/* Basic card-styling with shadow */ +.resource-card { + border-radius: 1px; + box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.12); + background: #fefefe; +} + +/* Styling for background image including tinting and section icons in stacks */ +.card-bg { + display: block; + position: absolute; + vertical-align: top; + width: 100%; + left: 0; + top: 0; + background-size: cover; + background-repeat: no-repeat; + background-position: center; + background-image: url(../images/resource-card-default-android.jpg); +} +.card-bg:after { + content: ""; + display: block; + height: 100%; + width: 100%; + opacity: 1; + background: rgba(0, 0, 0, 0.2); + -webkit-transition: opacity 0.5s; + -moz-transition: opacity 0.5s; + -o-transition: opacity 0.5s; + transition: opacity 0.5s; +} +.static .card-bg:after { + display:none; +} +.card-bg .card-section-icon { + position: absolute; + top: 50%; + width: 100%; + margin-top: -35px; + text-align: center; + padding-top: 65px; + z-index: 100; +} +.card-bg .card-section-icon .icon { + position: absolute; + left: 50%; + margin-left: -28px; + top: 0px; + width: 56px; + height: 56px; + background-repeat: no-repeat; + background-position: 50% 50%; + background-image: url(../images/stack-icon.png); +} +.card-bg .card-section-icon .section { + text-transform: uppercase; + color: white; + font-size: 14px; +} + +.card-info { + position: absolute; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: hidden; + background: #fefefe; + padding: 4px 12px 6px 12px; +} +.card-info .section { + text-transform: uppercase; + color: #898989; + font-size: 12px; + margin-bottom: 1px; +} +.card-info .title { + color: #363636; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + padding-bottom: 5px; + margin-bottom: -2px; + font-size: 16px; +} +.card-info .description { + overflow: hidden; +} +.card-info .description .text { + color: #464646; + font: 13px/15px Roboto Condensed; + overflow: hidden; + width:100%; +} +.card-info .description .util { + position: absolute; + right: 5px; + bottom: 70px; /*-2px;*/ + opacity: 0; + -webkit-transition: opacity 0.5s; + -moz-transition: opacity 0.5s; + -o-transition: opacity 0.5s; + transition: opacity 0.5s; +} +.card-info.empty-desc .title { + white-space: normal; + overflow: visible; +} +.card-info.empty-desc .description { + display: none; +} +/* Truncate card summaries at bounding box and + * and apply ellipsis at lower right */ +.ellipsis { + overflow: hidden; + float:right; + line-height: 15px; + width:100%; +} +.resource-card-6x6 .card-info .description .teddddddxt { + float:left; + position:relative; + margin-left:0; +} +.ellipsis:before { + content:""; + float: left; + width: 5px; + height:100%; +} +.ellipsis > *:first-child.text { + float: right; + width: 100% !important; + margin-left: -5px; +} +.ellipsis:after { + content: "\02026"; + height:17px; + padding-bottom:4px; + + box-sizing: content-box; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + + float: right; position: relative; + top: -16px; left: 100%; + width: 4em; margin-left: -4em; + padding-right: 5px; + + background: -webkit-gradient(linear, left top, right top, + from(rgba(255, 255, 255, 0)), to(white), color-stop(65%, white)); + background: -moz-linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); + background: -o-linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); + background: -ms-linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); + background: linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); +} +.ellipsis:after { + font-style: normal; color: #aaa; + font-size:13px; + text-align: right; +} + +/* Flow Layout */ +.resource-flow-layout { + display: inline-block; +} +.resource-flow-layout .resource-card, .resource-flow-layout .resource-card-stack { + float: left; + position: relative; +} +.resource-flow-layout .resource-card-stack > .resource-card { + margin-right: 0px !important; +} +.resource-flow-layout:after { + content: "."; + display: block; + height: 0; + position:relative; + clear: both; + visibility: hidden; +} +.resource-card:hover { + cursor: pointer; +} +.static .resource-card:hover { + cursor: auto; +} +.resource-card:hover .card-bg:after { + opacity: 0; +} +/* disabled to make way for fade/ellipsis truncation, + and the plusone moves up. +.resource-card:hover .card-info .description .text { + padding-right: 70px; +} */ +.resource-card:hover .card-info .description .util { + opacity: 1; +} + +/* Carousel Layout */ +/* Carousel styles for landing page */ +.resource-carousel-layout { + margin: 20px 0 20px 0; + position: relative; + overflow: hidden; +} +.resource-carousel-layout .slideshow-prev, .resource-carousel-layout .slideshow-next { + display: none; +} +.resource-carousel-layout .pagination { + bottom: 0px; +} +.resource-carousel-layout .frame li { + position: relative; +} +.resource-carousel-layout .frame li .card-bg { + height: 300px; +} +.resource-carousel-layout .frame li .card-info { + padding: 7px 15px 0px 15px; + top: 300px; +} +.resource-carousel-layout .frame li .card-info .section { + font-size: 13px; + margin-bottom: 7px; +} +.resource-carousel-layout .frame li .card-info .title { + font-size: 25px; + margin-bottom: 2px; +} +.resource-carousel-layout .frame li .card-info .description { + font-family: 15px/16px Roboto Condensed, sans-serif; +} +.resource-carousel-layout .frame li .card-info .description .text { + height: 40px; +} +.resource-carousel-layout .frame li .card-info .description .util { + bottom:97px; + right:4px; +} + +/* Stack Layout */ +.resource-stack-layout { + display: inline-block; +} +.resource-stack-layout .resource-card-stack { + float: left; + position: relative; +} +.resource-stack-layout .resource-card { + margin-bottom: 20px; + display: block; + position: relative; +} +.resource-stack-layout .section-card-menu > .card-info .section, .resource-stack-layout .section-card > .card-info .title { + /*text-transform: uppercase;*/ + color: #898989; + font-size: 17px; + line-height: 24px; + margin-bottom: 6px; +} +.resource-stack-layout .section-card { + height: 284px; +} +.resource-stack-layout .section-card > .card-bg { + height: 192px; +} +.resource-stack-layout .section-card > .card-info { + padding: 4px 12px 6px 12px; + top: 192px; +} +.resource-stack-layout .section-card > .card-info .section { + display: none; +} +.resource-stack-layout .section-card > .card-info .title { + font-size: 17px; + border-bottom: 1px solid #959595; + padding-bottom: 0px; +} +.resource-stack-layout .section-card > .card-info .description { + font-size: 13px; + line-height: 15px; +} +.resource-stack-layout .section-card > .card-info .description .text { + height: 30px; +} +.resource-stack-layout .related-card { + height: 90px; +} +.resource-stack-layout .related-card > .card-bg { + left: 0; + top: 0; + width: 90px; + height: 100%; + position: absolute; + display: block; +} +.resource-stack-layout .related-card > .card-info { + left: 90px; + padding: 4px 12px 4px 12px; +} +.resource-stack-layout .related-card > .card-info .section { + font-size: 12px; + margin-bottom: 1px; + display: none; +} +.resource-stack-layout .related-card > .card-info .title { + font-size: 16px; + margin-bottom: -2px; + white-space: normal; + overflow: visible; + text-overflow: ellipsis; +} +.resource-stack-layout .related-card > .card-info .title:after { + content: url(../images/link-out.png); + display: block; +} +.resource-stack-layout .related-card > .card-info .description { + display: none; +} +.resource-stack-layout .section-card-menu { + /* Flexible height */ + display: block; + height: auto; + width: auto; +} +.resource-stack-layout .section-card-menu .card-bg { + height: 155px; + /* Flexible height */ + position: relative; + display: inline-block; + vertical-align: top; +} +.resource-stack-layout .section-card-menu .card-info { + padding: 4px 12px 0px 12px; + /* Flexible height */ + position: relative; + left: auto; + top: auto; + right: auto; + bottom: auto; +} +.resource-stack-layout .section-card-menu .card-info ul { + list-style: none; + margin: 0; +} +.resource-stack-layout .section-card-menu .card-info ul li { + list-style: none; + margin: 0; + padding: 15px 0; + border-top-width: 1px; + border-top-style: solid; + border-top-color: #959595; +} +.resource-stack-layout .section-card-menu .card-info ul li a, .resource-stack-layout .section-card-menu .card-info ul li a:focus, .resource-stack-layout .section-card-menu .card-info ul li a:link, .resource-stack-layout .section-card-menu .card-info ul li a:visited, .resource-stack-layout .section-card-menu .card-info ul li a:active, .resource-stack-layout .section-card-menu .card-info ul li a:hover { + color: #363636 !important; +} +.resource-stack-layout .section-card-menu .card-info ul li:first-child { + border-top: none; +} +.resource-stack-layout .section-card-menu .card-info ul li:hover .title:after { + opacity: 1; + -webkit-transition: opacity 0.5s; + -moz-transition: opacity 0.5s; + -o-transition: opacity 0.5s; + transition: opacity 0.5s; +} +.resource-stack-layout .section-card-menu .card-info ul li:hover .description { + max-height: 30px; + opacity: 1; + -webkit-transition: max-height 0.5s, opacity 1s; + -moz-transition: max-height 0.5s, opacity 1s; + -o-transition: max-height 0.5s, opacity 1s; + transition: max-height 0.5s, opacity 1s; +} +.resource-stack-layout .section-card-menu .card-info .title { + font-size: 16px; + margin-bottom: -2px; + position: relative; +} +.resource-stack-layout .section-card-menu .card-info .title:after { + background: url(../images/stack-arrow-right.png); + content: ''; + opacity: 0; + -webkit-transition: opacity 0.25s; + -moz-transition: opacity 0.25s; + -o-transition: opacity 0.25s; + transition: opacity 0.25s; + position: absolute; + right: 0px; + top: 3px; + width: 10px; + height: 15px; +} +.resource-stack-layout .section-card-menu .card-info .title.more { + text-transform: uppercase; + color: #898989; + display: inline-block; +} +.resource-stack-layout .section-card-menu .card-info .title.more:after { + background: url(../images/stack-arrow-right.png); + content: ''; + display: block; + position: absolute; + right: -20px; + top: 3px; + width: 10px; + height: 15px; +} +.resource-stack-layout .section-card-menu .card-info .description { + max-height: 0px; + opacity: 0; + overflow: hidden; + font-size: 13px; + line-height: 15px; + /* Hover off */ + -webkit-transition: max-height 0.5s, opacity 0.5s; + -moz-transition: max-height 0.5s, opacity 0.5s; + -o-transition: max-height 0.5s, opacity 0.5s; + transition: max-height 0.5s, opacity 0.5s; +} +.resource-stack-layout .section-card-menu .card-info .description .text { + height: 30px; +} +.resource-stack-layout:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + +/* Generate the flow layout styles for a 3-column 16-col span */ +.resource-flow-layout.col-16 { + margin: 0 -14px 0 0; + width: 954px; +} +.resource-flow-layout.col-16 .resource-card, .resource-flow-layout.col-16 .resource-card-stack { + margin: 0 14px 20px 0; +} +.resource-flow-layout.col-16 .resource-card-row-stack-last { + margin-bottom: 0px !important; +} +.resource-flow-layout.col-16 .resource-card-col-stack-last { + margin-bottom: 0px !important; +} +.resource-flow-layout.col-16 .resource-card-3x6 { + width: 145px; + height: 284px; +} +.resource-flow-layout.col-16 .resource-card-3x12 { + width: 145px; + height: 588px; +} +.resource-flow-layout.col-16 .resource-card-3x18 { + width: 145px; + height: 892px; +} +.resource-flow-layout.col-16 .resource-card-6x6 { + width: 304px; + height: 284px; +} +.resource-flow-layout.col-16 .resource-card-6x12 { + width: 304px; + height: 588px; +} +.resource-flow-layout.col-16 .resource-card-6x18 { + width: 304px; + height: 892px; +} +.resource-flow-layout.col-16 .resource-card-9x6 { + width: 463px; + height: 284px; +} +.resource-flow-layout.col-16 .resource-card-9x12 { + width: 463px; + height: 588px; +} +.resource-flow-layout.col-16 .resource-card-9x18 { + width: 463px; + height: 892px; +} +.resource-flow-layout.col-16 .resource-card-12x6 { + width: 622px; + height: 284px; +} +.resource-flow-layout.col-16 .resource-card-12x12 { + width: 622px; + height: 588px; +} +.resource-flow-layout.col-16 .resource-card-12x18 { + width: 622px; + height: 892px; +} +.resource-flow-layout.col-16 .resource-card-15x6 { + width: 781px; + height: 284px; +} +.resource-flow-layout.col-16 .resource-card-15x12 { + width: 781px; + height: 588px; +} +.resource-flow-layout.col-16 .resource-card-15x18 { + width: 781px; + height: 892px; +} +.resource-flow-layout.col-16 .resource-card-18x6 { + width: 940px; + height: 284px; +} +.resource-flow-layout.col-16 .resource-card-18x12 { + width: 940px; + height: 420px; +} +.resource-flow-layout.col-16 .resource-card-18x18 { + width: 940px; + height: 892px; +} +.resource-flow-layout.col-16 .resource-card-3x2 { + width: 145px; + height: 95px; +} +.resource-flow-layout.col-16 .resource-card-3x2x3 { + width: 145px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-16 .resource-card-3x3 { + width: 145px; + height: 142px; +} +.resource-flow-layout.col-16 .resource-card-3x3x2 { + width: 145px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-16 .resource-card-6x2 { + width: 304px; + height: 95px; +} +.resource-flow-layout.col-16 .resource-card-6x2x3 { + width: 304px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-16 .resource-card-6x3 { + width: 304px; + height: 142px; +} +.resource-flow-layout.col-16 .resource-card-6x3x2 { + width: 304px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-16 .resource-card-9x2 { + width: 463px; + height: 95px; +} +.resource-flow-layout.col-16 .resource-card-9x2x3 { + width: 463px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-16 .resource-card-9x3 { + width: 463px; + height: 142px; +} +.resource-flow-layout.col-16 .resource-card-9x3x2 { + width: 463px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-16 .resource-card-12x2 { + width: 622px; + height: 95px; +} +.resource-flow-layout.col-16 .resource-card-12x2x3 { + width: 622px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-16 .resource-card-12x3 { + width: 622px; + height: 142px; +} +.resource-flow-layout.col-16 .resource-card-12x3x2 { + width: 622px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-16 .resource-card-15x2 { + width: 781px; + height: 95px; +} +.resource-flow-layout.col-16 .resource-card-15x2x3 { + width: 781px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-16 .resource-card-15x3 { + width: 781px; + height: 142px; +} +.resource-flow-layout.col-16 .resource-card-15x3x2 { + width: 781px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-16 .resource-card-18x2 { + width: 940px; + height: 95px; +} +.resource-flow-layout.col-16 .resource-card-18x2x3 { + width: 940px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-16 .resource-card-18x3 { + width: 940px; + height: 142px; +} +.resource-flow-layout.col-16 .resource-card-18x3x2 { + width: 940px; + height: 138px; + margin-bottom: 8px; +} + +/* Generate the flow layout styles for a 3-column 16-col span */ +.resource-flow-layout.col-12 { + margin: 0 -14px 0 0; + width: 714px; +} + +.resource-flow-layout.col-12 .resource-card, .resource-flow-layout.col-12 .resource-card-stack { + margin: 0 14px 20px 0; +} +.resource-flow-layout.col-12 .resource-card-row-stack-last { + margin-bottom: 0px !important; +} +.resource-flow-layout.col-12 .resource-card-col-stack-last { + margin-bottom: 0px !important; +} +.resource-flow-layout.col-12 .resource-card-3x6 { + width: 105px; + height: 284px; +} +.resource-flow-layout.col-12 .resource-card-3x12 { + width: 105px; + height: 588px; +} +.resource-flow-layout.col-12 .resource-card-3x18 { + width: 105px; + height: 892px; +} +.resource-flow-layout.col-12 .resource-card-6x6 { + width: 224px; + height: 284px; +} +.resource-flow-layout.col-12 .resource-card-6x12 { + width: 224px; + height: 588px; +} +.resource-flow-layout.col-12 .resource-card-6x18 { + width: 224px; + height: 892px; +} +.resource-flow-layout.col-12 .resource-card-9x6 { + width: 343px; + height: 284px; +} +.resource-flow-layout.col-12 .resource-card-9x12 { + width: 343px; + height: 588px; +} +.resource-flow-layout.col-12 .resource-card-9x18 { + width: 343px; + height: 892px; +} +.resource-flow-layout.col-12 .resource-card-12x6 { + width: 462px; + height: 284px; +} +.resource-flow-layout.col-12 .resource-card-12x12 { + width: 462px; + height: 588px; +} +.resource-flow-layout.col-12 .resource-card-12x18 { + width: 462px; + height: 892px; +} +.resource-flow-layout.col-12 .resource-card-15x6 { + width: 581px; + height: 284px; +} +.resource-flow-layout.col-12 .resource-card-15x12 { + width: 581px; + height: 588px; +} +.resource-flow-layout.col-12 .resource-card-15x18 { + width: 581px; + height: 892px; +} +.resource-flow-layout.col-12 .resource-card-18x6 { + width: 700px; + height: 284px; +} +.resource-flow-layout.col-12 .resource-card-18x12 { + width: 700px; + height: 420px; +} +.resource-flow-layout.col-12 .resource-card-18x18 { + width: 700px; + height: 892px; +} +.resource-flow-layout.col-12 .resource-card-3x2 { + width: 105px; + height: 95px; +} +.resource-flow-layout.col-12 .resource-card-3x2x3 { + width: 105px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-12 .resource-card-3x3 { + width: 105px; + height: 142px; +} +.resource-flow-layout.col-12 .resource-card-3x3x2 { + width: 105px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-12 .resource-card-6x2 { + width: 224px; + height: 95px; +} +.resource-flow-layout.col-12 .resource-card-6x2x3 { + width: 224px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-12 .resource-card-6x3 { + width: 224px; + height: 142px; +} +.resource-flow-layout.col-12 .resource-card-6x3x2 { + width: 224px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-12 .resource-card-9x2 { + width: 343px; + height: 95px; +} +.resource-flow-layout.col-12 .resource-card-9x2x3 { + width: 343px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-12 .resource-card-9x3 { + width: 343px; + height: 142px; +} +.resource-flow-layout.col-12 .resource-card-9x3x2 { + width: 343px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-12 .resource-card-12x2 { + width: 462px; + height: 95px; +} +.resource-flow-layout.col-12 .resource-card-12x2x3 { + width: 462px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-12 .resource-card-12x3 { + width: 462px; + height: 142px; +} +.resource-flow-layout.col-12 .resource-card-12x3x2 { + width: 462px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-12 .resource-card-15x2 { + width: 581px; + height: 95px; +} +.resource-flow-layout.col-12 .resource-card-15x2x3 { + width: 581px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-12 .resource-card-15x3 { + width: 581px; + height: 142px; +} +.resource-flow-layout.col-12 .resource-card-15x3x2 { + width: 581px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-12 .resource-card-18x2 { + width: 700px; + height: 95px; +} +.resource-flow-layout.col-12 .resource-card-18x2x3 { + width: 700px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-12 .resource-card-18x3 { + width: 700px; + height: 142px; +} +.resource-flow-layout.col-12 .resource-card-18x3x2 { + width: 700px; + height: 138px; + margin-bottom: 8px; +} + +/* Generate the flow layout styles for a 3-column 13-col span */ + +.resource-flow-layout.col-13 { + margin: 0 -14px 0 0; + width: 774px; +} +.resource-flow-layout.col-13 .resource-card, .resource-flow-layout.col-13 .resource-card-stack { + margin: 0 14px 20px 0; +} +.resource-flow-layout.col-13 .resource-card-row-stack-last { + margin-bottom: 0px !important; +} +.resource-flow-layout.col-13 .resource-card-col-stack-last { + margin-bottom: 0px !important; +} +.resource-flow-layout.col-13 .resource-card-3x6 { + width: 115px; + height: 284px; +} +.resource-flow-layout.col-13 .resource-card-3x12 { + width: 115px; + height: 588px; +} +.resource-flow-layout.col-13 .resource-card-3x18 { + width: 115px; + height: 892px; +} +.resource-flow-layout.col-13 .resource-card-6x6 { + width: 244px; + height: 284px; +} +.resource-flow-layout.col-13 .resource-card-6x12 { + width: 244px; + height: 588px; +} +.resource-flow-layout.col-13 .resource-card-6x18 { + width: 244px; + height: 892px; +} +.resource-flow-layout.col-13 .resource-card-9x6 { + width: 373px; + height: 284px; +} +.resource-flow-layout.col-13 .resource-card-9x12 { + width: 373px; + height: 588px; +} +.resource-flow-layout.col-13 .resource-card-9x18 { + width: 373px; + height: 892px; +} +.resource-flow-layout.col-13 .resource-card-12x6 { + width: 502px; + height: 284px; +} +.resource-flow-layout.col-13 .resource-card-12x12 { + width: 502px; + height: 588px; +} +.resource-flow-layout.col-13 .resource-card-12x18 { + width: 502px; + height: 892px; +} +.resource-flow-layout.col-13 .resource-card-15x6 { + width: 631px; + height: 284px; +} +.resource-flow-layout.col-13 .resource-card-15x12 { + width: 631px; + height: 588px; +} +.resource-flow-layout.col-13 .resource-card-15x18 { + width: 631px; + height: 892px; +} +.resource-flow-layout.col-13 .resource-card-18x6 { + width: 760px; + height: 284px; +} +.resource-flow-layout.col-13 .resource-card-18x12 { + width: 760px; + height: 420px; +} +.resource-flow-layout.col-13 .resource-card-18x18 { + width: 760px; + height: 892px; +} +.resource-flow-layout.col-13 .resource-card-3x2 { + width: 115px; + height: 95px; +} +.resource-flow-layout.col-13 .resource-card-3x2x3 { + width: 115px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-13 .resource-card-3x3 { + width: 115px; + height: 142px; +} +.resource-flow-layout.col-13 .resource-card-3x3x2 { + width: 115px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-13 .resource-card-6x2 { + width: 244px; + height: 95px; +} +.resource-flow-layout.col-13 .resource-card-6x2x3 { + width: 244px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-13 .resource-card-6x3 { + width: 244px; + height: 142px; +} +.resource-flow-layout.col-13 .resource-card-6x3x2 { + width: 244px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-13 .resource-card-9x2 { + width: 373px; + height: 95px; +} +.resource-flow-layout.col-13 .resource-card-9x2x3 { + width: 373px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-13 .resource-card-9x3 { + width: 373px; + height: 142px; +} +.resource-flow-layout.col-13 .resource-card-9x3x2 { + width: 373px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-13 .resource-card-12x2 { + width: 502px; + height: 95px; +} +.resource-flow-layout.col-13 .resource-card-12x2x3 { + width: 502px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-13 .resource-card-12x3 { + width: 502px; + height: 142px; +} +.resource-flow-layout.col-13 .resource-card-12x3x2 { + width: 502px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-13 .resource-card-15x2 { + width: 631px; + height: 95px; +} +.resource-flow-layout.col-13 .resource-card-15x2x3 { + width: 631px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-13 .resource-card-15x3 { + width: 631px; + height: 142px; +} +.resource-flow-layout.col-13 .resource-card-15x3x2 { + width: 631px; + height: 138px; + margin-bottom: 8px; +} +.resource-flow-layout.col-13 .resource-card-18x2 { + width: 760px; + height: 95px; +} +.resource-flow-layout.col-13 .resource-card-18x2x3 { + width: 760px; + height: 90px; + margin-bottom: 7px; +} +.resource-flow-layout.col-13 .resource-card-18x3 { + width: 760px; + height: 142px; +} +.resource-flow-layout.col-13 .resource-card-18x3x2 { + width: 760px; + height: 138px; + margin-bottom: 8px; +} + +/* + The following are styles for cards in the flowlayout above, styled by the number of rows they span +*/ +/* Single row items, might be simpler to just apply a class */ +.resource-card-3x6 > .card-bg, .resource-card-6x6 > .card-bg, .resource-card-9x6 > .card-bg, .resource-card-12x6 > .card-bg, .resource-card-15x6 > .card-bg, .resource-card-18x6 > .card-bg { + height: 192px; +} +.resource-card-3x6 > .card-info, .resource-card-6x6 > .card-info, .resource-card-9x6 > .card-info, .resource-card-12x6 > .card-info, .resource-card-15x6 > .card-info, .resource-card-18x6 > .card-info { + padding: 4px 12px 6px 12px; + top: 192px; +} +.resource-card-3x6 > .card-info .section, .resource-card-6x6 > .card-info .section, .resource-card-9x6 > .card-info .section, .resource-card-12x6 > .card-info .section, .resource-card-15x6 > .card-info .section, .resource-card-18x6 > .card-info .section { + font-size: 12px; + margin-bottom: 1px; +} +.resource-card-3x6 > .card-info .title, .resource-card-6x6 > .card-info .title, .resource-card-9x6 > .card-info .title, .resource-card-12x6 > .card-info .title, .resource-card-15x6 > .card-info .title, .resource-card-18x6 > .card-info .title { + font-size: 16px; + margin-bottom: -2px; +} +.resource-card-3x6 > .card-info .description, .resource-card-6x6 > .card-info .description, .resource-card-9x6 > .card-info .description, .resource-card-12x6 > .card-info .description, .resource-card-15x6 > .card-info .description, .resource-card-18x6 > .card-info .description { + font-size: 13px; + line-height: 15px; +} +.resource-card-3x6 > .card-info .description .text, .resource-card-6x6 > .card-info .description .text, .resource-card-9x6 > .card-info .description .text, .resource-card-12x6 > .card-info .description .text, .resource-card-15x6 > .card-info .description .text, .resource-card-18x6 > .card-info .description .text { + height: 30px; +} + +/* Double row items */ +.resource-card-3x12 > .card-bg, .resource-card-6x12 > .card-bg, .resource-card-9x12 > .card-bg, .resource-card-12x12 > .card-bg, .resource-card-15x12 > .card-bg, .resource-card-18x12 > .card-bg { + height: 320px; +} +.resource-card-3x12 > .card-info, .resource-card-6x12 > .card-info, .resource-card-9x12 > .card-info, .resource-card-12x12 > .card-info, .resource-card-15x12 > .card-info, .resource-card-18x12 > .card-info { + padding: 4px 12px 6px 12px; + top: 320px; +} +.resource-card-3x12 > .card-info .section, .resource-card-6x12 > .card-info .section, .resource-card-9x12 > .card-info .section, .resource-card-12x12 > .card-info .section, .resource-card-15x12 > .card-info .section, .resource-card-18x12 > .card-info .section { + font-size: 12px; + margin-bottom: 1px; +} +.resource-card-3x12 > .card-info .title, .resource-card-6x12 > .card-info .title, .resource-card-9x12 > .card-info .title, .resource-card-12x12 > .card-info .title, .resource-card-15x12 > .card-info .title, .resource-card-18x12 > .card-info .title { + font-size: 16px; + margin-bottom: -2px; + white-space: normal; +} +.resource-card-3x12 > .card-info .description, .resource-card-6x12 > .card-info .description, .resource-card-9x12 > .card-info .description, .resource-card-12x12 > .card-info .description, .resource-card-15x12 > .card-info .description, .resource-card-18x12 > .card-info .description { + font-size: 13px; + line-height: 15px; +} + +/* 1/3 row items */ +.resource-card-3x2 > .card-bg, .resource-card-6x2 > .card-bg, .resource-card-9x2 > .card-bg, .resource-card-12x2 > .card-bg, .resource-card-15x2 > .card-bg, .resource-card-18x2 > .card-bg { + left: 0; + top: 0; + width: 90px; + height: 100%; + position: absolute; + display: block; +} +.resource-card-3x2 > .card-info, .resource-card-6x2 > .card-info, .resource-card-9x2 > .card-info, .resource-card-12x2 > .card-info, .resource-card-15x2 > .card-info, .resource-card-18x2 > .card-info { + left: 90px; + padding: 4px 12px 4px 12px; + height: 80px; + overflow: hidden; +} +.resource-card-3x2 > .card-info .section, .resource-card-6x2 > .card-info .section, .resource-card-6x3 > .card-info .section, .resource-card-9x2 > .card-info .section, .resource-card-12x2 > .card-info .section, .resource-card-15x2 > .card-info .section, .resource-card-18x2 > .card-info .section { + font-size: 12px; + margin-bottom: 1px; + /* display: none; */ +} +.resource-card-3x2 > .card-info .title, .resource-card-6x2 > .card-info .title, .resource-card-9x2 > .card-info .title, .resource-card-12x2 > .card-info .title, .resource-card-15x2 > .card-info .title, .resource-card-18x2 > .card-info .title { + font-size: 16px; + margin-bottom: -2px; + white-space: normal; + overflow: visible; + text-overflow: ellipsis; +} +.resource-card-3x2 > .card-info .title:after, .resource-card-6x2 > .card-info .title:after, .resource-card-9x2 > .card-info .title:after, .resource-card-12x2 > .card-info .title:after, .resource-card-15x2 > .card-info .title:after, .resource-card-18x2 > .card-info .title:after { + /* content: url(../images/link-out.png); */ + display: block; +} +.resource-card-3x2 > .card-info .description, .resource-card-6x2 > .card-info .description, .resource-card-9x2 > .card-info .description, .resource-card-12x2 > .card-info .description, .resource-card-15x2 > .card-info .description, .resource-card-18x2 > .card-info .description { + 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; + top: 0; + width: 90px; + height: 100%; + position: absolute; + display: block; +} +.resource-card-3x3 > .card-info, .resource-card-6x3 > .card-info, .resource-card-9x3 > .card-info, .resource-card-12x3 > .card-info, .resource-card-15x3 > .card-info, .resource-card-18x3 > .card-info { + left: 90px; + padding: 4px 12px 0px 12px; +} +.resource-card-3x3 > .card-info .section, .resource-card-6x3 > .card-info .section, .resource-card-9x3 > .card-info .section, .resource-card-12x3 > .card-info .section, .resource-card-15x3 > .card-info .section, .resource-card-18x3 > .card-info .section { + font-size: 12px; + margin-bottom: 1px; + display: none; +} +.resource-card-3x3 > .card-info .title, .resource-card-6x3 > .card-info .title, .resource-card-9x3 > .card-info .title, .resource-card-12x3 > .card-info .title, .resource-card-15x3 > .card-info .title, .resource-card-18x3 > .card-info .title { + font-size: 16px; + margin-bottom: -2px; + white-space: normal; + overflow: visible; +} +.resource-card-3x3 > .card-info .description .text, .resource-card-6x3 > .card-info .description .text, .resource-card-9x3 > .card-info .description .text, .resource-card-12x3 > .card-info .description .text, .resource-card-15x3 > .card-info .description .text, .resource-card-18x3 > .card-info .description .text { + font-size: 12px; + line-height: 15px; + padding-right: 0px !important; + height: 80px; +} +.resource-card-3x3 > .card-info .description .util, .resource-card-6x3 > .card-info .description .util, .resource-card-9x3 > .card-info .description .util, .resource-card-12x3 > .card-info .description .util, .resource-card-15x3 > .card-info .description .util, .resource-card-18x3 > .card-info .description .util { + display: none; +} +/* placement of plusone */ +.resource-card-6x12 > .card-info .description .util, .resource-card-9x12 > .card-info .description .util, .resource-card-12x12 > .card-info .description .util, .resource-card-15x12 > .card-info .description .util { + bottom:2px; +} +.resource-card-18x12 > .card-info .description .util { + bottom:2px; +} +/* Overrides for col-16 6x6 cards linking to local content on landing pages. + Suppresses "section" and puts the title above a hairline rule. */ +.landing .card-info .section, .resource-flow-layout.col-16.landing .resource-card-9x6 .card-info .section { + display:none; +} +.landing .card-info .title { + color: #898989; + font-size: 17px; + line-height: 24px; + margin-bottom: 6px; + border-bottom: 1px solid #959595; + padding-bottom: 0px; +} +.landing .card-info .description { + font-size: 13px; + line-height: 15px; +} +.landing .card-info .description .text { +height:30px; +} +.landing .resource-card-6x6 > .card-info .description .util, .landing .resource-card-9x6 > .card-info .description .util { + bottom:2px; +} +/* + Generate a resource stack layout for a 3 column widget spanning 16 grid cols +*/ +.resource-stack-layout.col-16 { + margin: 0 -14px 0 0; + width: 954px; +} +.resource-stack-layout.col-16 .resource-card-stack { + margin: 0 14px 0 0; + width: 304px; +} + +/* Example of card menu tinting */ +.resource-widget[data-section=distribute\/tools] .section-card-menu +.card-bg:after { + background: rgba(126, 55, 148, 0.4) !important; +} +.resource-widget[data-section=distribute\/tools] .section-card-menu +.card-section-icon .icon { + background-color: #7e3794 !important; +} +.resource-widget[data-section=distribute\/tools] .section-card-menu +.card-info ul li { + border-top-color: #7e3794 !important; +} + +/* tinting for stacks */ + +div.jd-descr > .resource-widget[data-section=distribute\/tools] +.section-card-menu .card-info ul li { + border-top-color: #7e3794 !important; +} + + /** * UTILITIES @@ -4840,13 +6542,11 @@ a.download-sdk { */ .landing-h1 { - color: #44555d; - font-weight: 300; - font-size: 56px; - line-height: 80px; + font-weight: 100; + font-size: 60px; + line-height: 78px; text-align: center; letter-spacing: -1px; - margin-bottom: 6px; } .landing-pre-h1 { @@ -4857,11 +6557,11 @@ a.download-sdk { text-align: center; letter-spacing: -1px; text-transform: uppercase; + } .landing-h1.hero { text-align: left; - color: #fff; } .landing-h2 { @@ -4872,10 +6572,10 @@ a.download-sdk { } .landing-subhead { - color: #78868d; + color: #999999; font-size: 20px; - font-weight: 300; - line-height: 32px; + line-height: 28px; + font-weight:300; text-align: center; } .landing-subhead.hero { @@ -4912,21 +6612,23 @@ a.download-sdk { * LAYOUT */ +#body-content, +.fullpage, +#jd-content, +.jd-descr, +.landing-body-content { + height: 100%; +} + .landing-section { - background: #eceff1; - clear: both; - padding: 80px 20px 80px; - margin: 0 -20px; + padding: 80px 10px 80px; + width: 100%; + margin-left: -10px; text-rendering: optimizeLegibility; } -@media (max-width: 719px) { - .responsive .landing-section { - margin-left: -10px; - margin-right: -10px; - padding-left: 10px; - padding-right: 10px; - } +#extending-android-to-wearables { + padding-top: 30px; } .landing-short-section { @@ -4934,7 +6636,7 @@ a.download-sdk { } .landing-gray-background { - background-color: #b0bec5; + background-color: #e9e9e9; } .landing-white-background { @@ -4946,19 +6648,24 @@ a.download-sdk { background-color: hsl(8, 70%, 54%); } -.landing-red-background .landing-h1 { - color: white; -} - -.landing-red-background .landing-subhead { +.landing-subhead-red { color: hsl(8, 71%, 84%); text-align: left; } +.landing-subhead-red p { + margin-top: 20px; +} + +.landing-hero-container { + height: 100%; +} + .preview-hero { - height: calc(100vh - 128px); + height: calc(100% - 110px); min-height: 504px; + margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../preview/images/hero.jpg); @@ -4970,8 +6677,9 @@ a.download-sdk { } .wear-hero { - height: calc(100vh - 128px); + height: calc(100% - 110px); min-height: 504px; + margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../wear/images/hero.jpg); @@ -4983,8 +6691,9 @@ a.download-sdk { } .tv-hero { - height: calc(100vh - 128px); + height: calc(100% - 110px); min-height: 504px; + margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../tv/images/hero.jpg); @@ -4996,8 +6705,9 @@ a.download-sdk { } .auto-hero { - height: calc(100vh - 128px); + height: calc(100% - 110px); min-height: 504px; + margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../auto/images/hero.jpg); @@ -5010,16 +6720,16 @@ a.download-sdk { .landing-hero-scrim { background: black; - height: 100%; - left: 0; - position: absolute; opacity: .2; + position: absolute; width: 100%; + height: 100%; + margin-left: -10px; } .landing-hero-wrap { margin: 0 auto; - max-width: 940px; + width: 940px; clear: both; height: 100%; position: relative; @@ -5206,6 +6916,17 @@ a.landing-button:visited { margin-bottom: 20px; } +.col-3-wide { + display: inline; + float: left; + margin-left: 10px; + margin-right: 10px; +} + +.col-3-wide { + width: 302px; +} + /** * ANIMATION */ @@ -5249,7 +6970,7 @@ a.landing-button:visited { } #video-frame { - max-width:940px; + width:940px; height:100%; margin:72px auto; display:none; @@ -5320,7 +7041,8 @@ Styles for d.a.c/index: /* Generic full screen carousel styling to be used across pages. */ .fullscreen-carousel { - margin: 0 -20px; + margin: 0 -10px; + width: 100%; overflow: hidden; position: relative; } @@ -5359,6 +7081,7 @@ Styles for d.a.c/index: font-weight: 300; font-size: 18px; line-height: 24px; + -webkit-font-smoothing: antialiased; } .fullscreen-carousel .hero .hero-bg { @@ -5492,19 +7215,48 @@ Styles for d.a.c/index: } + + + +/* + Styles for the entity link used in the actions bar and in the cta of + the resources that appear in the tab carousel. +*/ +.actions-bar a:after, +.resource .cta:after { + content: '›'; + font-weight: 400; + font-size: 22px; + left: 5px; + line-height: 1; + position: relative; + top: 1px; + transition: left 190ms ease-out; +} + +.actions-bar a:hover:after, +.resource .cta:hover:after { + left: 10px; +} + + + + /* Styles for the actions bar. */ .actions-bar { - background: #b0bec5; + background: #9acd00; + margin: 0 -10px; text-align: center; } .actions-bar .actions { - padding: 24px 0; + padding: 30px 0 30px; text-align: justify; font-size: 0.1px; line-height: 0.1px; + margin: 0 10px 0 0; } .actions-bar .actions:after { @@ -5518,28 +7270,23 @@ Styles for d.a.c/index: } .actions-bar a { - font-size: 24px; - line-height: 50px; + font-size: 21px; + line-height: 27px; color: #fff; font-weight: 300; + -webkit-font-smoothing: antialiased; } -.actions-bar .dac-sprite { - margin: 0 -6px 0 -12px; - -webkit-transition: all 190ms ease-out; - transition: all 190ms ease-out; +.actions-bar a:after { + top: 0px; + font-size: 22px; } -.actions-bar a:hover .dac-sprite { - - transform: translateX(5px); +.actions-bar a:hover { + color: #fff !important; } -@media (max-width: 719px) { - .responsive .actions-bar .actions > div { - display: block; - } -} + @@ -5703,3043 +7450,3 @@ a.home-new-cta-btn:hover, .resource-card-6x2 > .card-bg.helpouts-card-bg:after { display:none; } - -.dac-visible-mobile-block, .dac-mobile-only, .dac-visible-mobile-inline, .dac-visible-mobile-inline-block, .dac-visible-tablet-block, .dac-visible-tablet-inline, .dac-visible-tablet-inline-block, .dac-visible-desktop-block, .dac-visible-desktop-inline, .dac-visible-desktop-inline-block { - display: none !important; -} - -@media (max-width: 719px) { - .responsive .dac-hidden-mobile { - display: none !important; - } - - .responsive .dac-visible-mobile-block, .responsive .dac-mobile-only { - display: block !important; - } - - .responsive .dac-visible-mobile-inline { - display: inline !important; - } - - .responsive .dac-visible-mobile-inline-block { - display: inline-block !important; - } -} - -@media (min-width: 720px) and (max-width: 979px) { - .responsive .dac-hidden-tablet { - display: none !important; - } - - .responsive .dac-visible-tablet-block { - display: block !important; - } - - .responsive .dac-visible-tablet-inline { - display: inline !important; - } - - .responsive .dac-visible-tablet-inline-block { - display: inline-block !important; - } -} - -@media (min-width: 980px) { - .responsive .dac-hidden-desktop { - display: none !important; - } - - .responsive .dac-visible-desktop-block { - display: block !important; - } - - .responsive .dac-visible-desktop-inline { - display: inline !important; - } - - .responsive .dac-visible-desktop-inline-block { - display: inline-block !important; - } -} - -/* New CSS */ -/************ RESOURCE CARDS ******************/ -/* Basic card-styling with shadow */ -.resource-card { - background: #fff; - box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.21); - display: block; - position: relative; -} - -/* Styling for background image including tinting and section icons in stacks */ -.card-bg { - bottom: 131px; - display: block; - position: absolute; - vertical-align: top; - width: 100%; - left: 0; - top: 0; - background-size: cover; - background-repeat: no-repeat; - background-position: center; - background-image: url(../images/resource-card-default-android.jpg); -} - -.card-bg:after { - content: ""; - display: block; - height: 100%; - width: 100%; - opacity: 1; - background: rgba(0, 0, 0, 0.05); - -webkit-transition: opacity 0.5s; - transition: opacity 0.5s; -} - -.static .card-bg:after { - display: none; -} - -.card-bg .card-section-icon { - position: absolute; - top: 50%; - width: 100%; - margin-top: -35px; - text-align: center; - padding-top: 65px; - z-index: 100; -} - -.card-bg .card-section-icon .icon { - position: absolute; - left: 50%; - margin-left: -28px; - top: 0px; - width: 56px; - height: 56px; - background-repeat: no-repeat; - background-position: 50% 50%; - background-image: url(../images/stack-icon.png); -} - -.card-bg .card-section-icon .section { - text-transform: uppercase; - color: white; - font-size: 14px; -} - -.card-info { - position: absolute; - box-sizing: border-box; - height: 131px; - right: 0; - bottom: 0; - left: 0; - overflow: hidden; - background: #fefefe; - padding: 6px 12px; -} - -.card-info .section { - color: #898989; - font-size: 11px; - font-weight: 700; - letter-spacing: 0.77px; - line-height: 20px; - text-transform: uppercase; -} - -.card-info .title { - color: #333; - font-size: 18px; - font-weight: 500; - line-height: 24px; - margin-bottom: 2px; - max-height: 48px; - overflow: hidden; - padding-bottom: 5px; - text-overflow: ellipsis; - white-space: normal; -} - -.card-info .description { - overflow: hidden; -} - -.card-info .description .text { - color: #666; - font-size: 14px; - height: 60px; - line-height: 20px; - overflow: hidden; - width: 100%; -} - -.card-info .description .util { - position: absolute; - right: 5px; - bottom: 70px; - opacity: 0; - -webkit-transition: opacity 0.5s; - transition: opacity 0.5s; -} - -.card-info.empty-desc .title { - white-space: normal; - overflow: visible; -} - -.card-info.empty-desc .description { - display: none; -} - -/* Truncate card summaries at bounding box and - * and apply ellipsis at lower right */ -.ellipsis { - overflow: hidden; - float: right; - line-height: 15px; - width: 100%; -} - -.ellipsis:before { - content: ""; - float: left; - width: 5px; - height: 100%; -} - -.ellipsis > *:first-child.text { - float: right; - width: 100% !important; - margin-left: -5px; -} - -.ellipsis:after { - content: "\02026"; - height: 17px; - padding-bottom: 4px; - box-sizing: content-box; - float: right; - position: relative; - top: -16px; - left: 100%; - width: 4em; - margin-left: -4em; - padding-right: 5px; - background: -webkit-gradient(linear, left top, right top, from(rgba(255, 255, 255, 0)), to(white), color-stop(65%, white)); - background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0), white 65%, white); - background: linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); -} - -.ellipsis:after { - font-style: normal; - color: #aaa; - font-size: 13px; - text-align: right; -} - -.resource-card:hover { - cursor: pointer; -} - -.static .resource-card:hover { - cursor: auto; -} - -.resource-card:hover .card-bg:after { - opacity: 0; -} - -.resource-card:hover .card-info .description .util { - opacity: 1; -} - -/* Carousel Layout */ -/* Carousel styles for landing page */ -.resource-carousel-layout { - height: 531px; - margin: 20px 0 20px 0; - padding: 0 !important; - position: relative; - overflow: hidden; -} - -.resource-carousel-layout .slideshow-prev, .resource-carousel-layout .slideshow-next { - display: none; -} - -.resource-carousel-layout .pagination { - bottom: 97px; - left: auto; - padding-right: 10px; - right: 0; - text-align: right; - width: 16.66666667%; -} - -.resource-carousel-layout .pagination ul li { - text-indent: 8000px; -} - -.resource-carousel-layout .frame li { - position: relative; -} - -.resource-carousel-layout .frame li .card-bg { - bottom: 131px; -} - -.resource-carousel-layout .frame li .card-info { - height: 131px; - padding: 6px 12px; - top: auto; -} - -.resource-carousel-layout .frame li .card-info .title { - font-size: 28px; - font-weight: 400; - line-height: 32px; -} - -.resource-carousel-layout .frame li .card-info .description .text { - height: 40px; -} - -.resource-carousel-layout .frame li .card-info .description .util { - bottom: 97px; - right: 4px; -} - -/* Stack Layout */ -.resource-stack-layout { - display: inline-block; - padding: 0; -} - -.resource-stack-layout .section-card-menu > .card-info .section, .resource-stack-layout .section-card > .card-info .title { - /*text-transform: uppercase;*/ - color: #898989; - font-size: 17px; - line-height: 24px; - margin-bottom: 6px; -} - -.resource-stack-layout .section-card { - height: 284px; -} - -.resource-stack-layout .section-card > .card-bg { - height: 192px; -} - -.resource-stack-layout .section-card > .card-info { - padding: 4px 12px 6px 12px; - top: 192px; -} - -.resource-stack-layout .section-card > .card-info .section { - display: none; -} - -.resource-stack-layout .section-card > .card-info .title { - font-size: 17px; - border-bottom: 1px solid #959595; - padding-bottom: 0px; -} - -.resource-stack-layout .section-card > .card-info .description { - font-size: 13px; - line-height: 15px; -} - -.resource-stack-layout .section-card > .card-info .description .text { - height: 30px; -} - -.resource-stack-layout .related-card { - height: 90px; -} - -.resource-stack-layout .related-card > .card-bg { - left: 0; - top: 0; - width: 90px; - height: 100%; - position: absolute; - display: block; -} - -.resource-stack-layout .related-card > .card-info { - left: 90px; - padding: 4px 12px 4px 12px; -} - -.resource-stack-layout .related-card > .card-info .section { - font-size: 12px; - margin-bottom: 1px; - display: none; -} - -.resource-stack-layout .related-card > .card-info .title { - font-size: 16px; - margin-bottom: -2px; - white-space: normal; - overflow: visible; - text-overflow: ellipsis; -} - -.resource-stack-layout .related-card > .card-info .title:after { - content: url(../images/link-out.png); - display: block; -} - -.resource-stack-layout .related-card > .card-info .description { - display: none; -} - -.resource-stack-layout .section-card-menu { - /* Flexible height */ - display: block; - height: auto; - width: auto; -} - -.resource-stack-layout .section-card-menu .card-bg { - height: 155px; - /* Flexible height */ - position: relative; - display: inline-block; - vertical-align: top; -} - -.resource-stack-layout .section-card-menu .card-info { - padding: 4px 12px 0px 12px; - /* Flexible height */ - position: relative; - left: auto; - top: auto; - right: auto; - bottom: auto; -} - -.resource-stack-layout .section-card-menu .card-info ul { - list-style: none; - margin: 0; -} - -.resource-stack-layout .section-card-menu .card-info ul li { - list-style: none; - margin: 0; - padding: 15px 0; - border-top-width: 1px; - border-top-style: solid; - border-top-color: #959595; -} - -.resource-stack-layout .section-card-menu .card-info ul li a, .resource-stack-layout .section-card-menu .card-info ul li a:focus, .resource-stack-layout .section-card-menu .card-info ul li a:link, .resource-stack-layout .section-card-menu .card-info ul li a:visited, .resource-stack-layout .section-card-menu .card-info ul li a:active, .resource-stack-layout .section-card-menu .card-info ul li a:hover { - color: #333 !important; -} - -.resource-stack-layout .section-card-menu .card-info ul li:first-child { - border-top: none; -} - -.resource-stack-layout .section-card-menu .card-info ul li:hover .title:after { - opacity: 1; - -webkit-transition: opacity 0.5s; - transition: opacity 0.5s; -} - -.resource-stack-layout .section-card-menu .card-info ul li:hover .description { - max-height: 30px; - opacity: 1; - -webkit-transition: max-height 0.5s, opacity 1s; - transition: max-height 0.5s, opacity 1s; -} - -.resource-stack-layout .section-card-menu .card-info .title { - font-size: 16px; - margin-bottom: -2px; - position: relative; -} - -.resource-stack-layout .section-card-menu .card-info .title:after { - background: url(../images/stack-arrow-right.png); - content: ''; - opacity: 0; - -webkit-transition: opacity 0.25s; - transition: opacity 0.25s; - position: absolute; - right: 0px; - top: 3px; - width: 10px; - height: 15px; -} - -.resource-stack-layout .section-card-menu .card-info .title.more { - text-transform: uppercase; - color: #898989; - display: inline-block; -} - -.resource-stack-layout .section-card-menu .card-info .title.more:after { - background: url(../images/stack-arrow-right.png); - content: ''; - display: block; - position: absolute; - right: -20px; - top: 3px; - width: 10px; - height: 15px; -} - -.resource-stack-layout .section-card-menu .card-info .description { - max-height: 0px; - opacity: 0; - overflow: hidden; - font-size: 13px; - line-height: 15px; - /* Hover off */ - -webkit-transition: max-height 0.5s, opacity 0.5s; - transition: max-height 0.5s, opacity 0.5s; -} - -.resource-stack-layout .section-card-menu .card-info .description .text { - height: 30px; -} - -.resource-stack-layout:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -.resource-card, .resource-card-stack { - margin-bottom: 20px; -} - -.resource-card-row-stack-last { - margin-bottom: 0px !important; -} - -.resource-card-col-stack-last { - margin-bottom: 0px !important; -} - -.resource-card-3x6 { - height: 300px; -} - -.resource-card-3x12 { - height: 620px; -} - -.resource-card-3x18 { - height: 940px; -} - -.resource-card-6x6 { - height: 300px; -} - -.resource-card-6x12 { - height: 620px; -} - -.resource-card-6x18 { - height: 940px; -} - -.resource-card-9x6 { - height: 300px; -} - -.resource-card-9x12 { - height: 620px; -} - -.resource-card-9x18 { - height: 940px; -} - -.resource-card-12x6 { - height: 300px; -} - -.resource-card-12x12 { - height: 620px; -} - -.resource-card-12x18 { - height: 940px; -} - -.resource-card-15x6 { - height: 300px; -} - -.resource-card-15x12 { - height: 620px; -} - -.resource-card-15x18 { - height: 940px; -} - -.resource-card-18x6 { - height: 300px; -} - -.resource-card-18x12 { - height: 620px; -} - -.resource-card-18x18 { - height: 940px; -} - -.resource-card-3x2 { - height: 100px; -} - -.resource-card-3x2x3 { - height: 90px; - margin-bottom: 15px; -} - -.resource-card-3x3 { - height: 150px; -} - -.resource-card-3x3x2 { - height: 142px; - margin-bottom: 16px; -} - -.resource-card-6x2 { - height: 100px; -} - -.resource-card-6x2x3 { - height: 90px; - margin-bottom: 15px; -} - -.resource-card-6x3 { - height: 150px; -} - -.resource-card-6x3x2 { - height: 142px; - margin-bottom: 16px; -} - -.resource-card-9x2 { - height: 100px; -} - -.resource-card-9x2x3 { - height: 90px; - margin-bottom: 15px; -} - -.resource-card-9x3 { - height: 150px; -} - -.resource-card-9x3x2 { - height: 142px; - margin-bottom: 16px; -} - -.resource-card-12x2 { - height: 100px; -} - -.resource-card-12x2x3 { - height: 90px; - margin-bottom: 15px; -} - -.resource-card-12x3 { - height: 150px; -} - -.resource-card-12x3x2 { - height: 142px; - margin-bottom: 16px; -} - -.resource-card-15x2 { - height: 100px; -} - -.resource-card-15x2x3 { - height: 90px; - margin-bottom: 15px; -} - -.resource-card-15x3 { - height: 150px; -} - -.resource-card-15x3x2 { - height: 142px; - margin-bottom: 16px; -} - -.resource-card-18x2 { - height: 100px; -} - -.resource-card-18x2x3 { - height: 90px; - margin-bottom: 15px; -} - -.resource-card-18x3 { - height: 150px; -} - -.resource-card-18x3x2 { - height: 142px; - margin-bottom: 16px; -} - -/* - The following are styles for cards in the flowlayout above, styled by the number of rows they span -*/ -/* Single row, 2 column items. */ -.resource-card-9x6 { - height: 390px; -} - -/* Double row, 1 column items. Eg full width video thumbnails. */ -.resource-card-18x12 { - height: 558px; -} - -/* 1/3 row items */ -.resource-card-3x2 > .card-bg, .resource-card-6x2 > .card-bg, .resource-card-9x2 > .card-bg, .resource-card-12x2 > .card-bg, .resource-card-15x2 > .card-bg, .resource-card-18x2 > .card-bg { - left: 0; - top: 0; - width: 90px; - height: 100%; - position: absolute; - display: block; -} - -.resource-card-3x2 > .card-info, .resource-card-6x2 > .card-info, .resource-card-9x2 > .card-info, .resource-card-12x2 > .card-info, .resource-card-15x2 > .card-info, .resource-card-18x2 > .card-info { - height: 100%; - left: 90px; - padding: 6px 12px; - overflow: hidden; -} - -.resource-card-3x2 > .card-info .title, .resource-card-6x2 > .card-info .title, .resource-card-9x2 > .card-info .title, .resource-card-12x2 > .card-info .title, .resource-card-15x2 > .card-info .title, .resource-card-18x2 > .card-info .title { - max-height: 48px; - white-space: normal; -} - -.resource-card-3x2 > .card-info .description, .resource-card-6x2 > .card-info .description, .resource-card-9x2 > .card-info .description, .resource-card-12x2 > .card-info .description, .resource-card-15x2 > .card-info .description, .resource-card-18x2 > .card-info .description { - display: none; -} - -.resource-card-3x2 > .card-info .text, .resource-card-6x2 > .card-info .text, .resource-card-9x2 > .card-info .text, .resource-card-12x2 > .card-info .text, .resource-card-15x2 > .card-info .text, .resource-card-18x2 > .card-info .text { - height: auto; -} - -/* 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, .resource-card-6x3, .resource-card-9x3, .resource-card-12x3, .resource-card-15x3, .resource-card-18x3 { - height: 160px; -} - -.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; - top: 0; - width: 90px; - height: 100%; - position: absolute; - display: block; -} - -.resource-card-3x3 > .card-info, .resource-card-6x3 > .card-info, .resource-card-9x3 > .card-info, .resource-card-12x3 > .card-info, .resource-card-15x3 > .card-info, .resource-card-18x3 > .card-info { - height: 100%; - left: 90px; - padding: 6px 12px; -} - -.resource-card-3x3 > .card-info .section, .resource-card-6x3 > .card-info .section, .resource-card-9x3 > .card-info .section, .resource-card-12x3 > .card-info .section, .resource-card-15x3 > .card-info .section, .resource-card-18x3 > .card-info .section { - display: none; -} - -.resource-card-3x3 > .card-info .title, .resource-card-6x3 > .card-info .title, .resource-card-9x3 > .card-info .title, .resource-card-12x3 > .card-info .title, .resource-card-15x3 > .card-info .title, .resource-card-18x3 > .card-info .title { - max-height: 96px; - white-space: normal; -} - -.resource-card-3x3 > .card-info .text, .resource-card-6x3 > .card-info .text, .resource-card-9x3 > .card-info .text, .resource-card-12x3 > .card-info .text, .resource-card-15x3 > .card-info .text, .resource-card-18x3 > .card-info .text { - height: auto; -} - -.resource-card-3x3 > .card-info .util, .resource-card-6x3 > .card-info .util, .resource-card-9x3 > .card-info .util, .resource-card-12x3 > .card-info .util, .resource-card-15x3 > .card-info .util, .resource-card-18x3 > .card-info .util { - display: none; -} - -/* placement of plusone */ -.resource-card-6x12 > .card-info .description .util, .resource-card-9x12 > .card-info .description .util, .resource-card-12x12 > .card-info .description .util, .resource-card-15x12 > .card-info .description .util { - bottom: 2px; -} - -.resource-card-18x12 > .card-info .description .util { - bottom: 2px; -} - -/* Overrides for col-16 6x6 cards linking to local content on landing pages. - Suppresses "section". */ -.landing .card-info .section { - display: none; -} - -/* - Generate a resource stack layout for a 3 column widget spanning 16 grid cols -*/ -.resource-stack-layout.col-16 { - margin: 0 -14px 0 0; - width: 954px; -} - -.resource-stack-layout.col-16 .resource-card-stack { - margin: 0 14px 0 0; - width: 304px; -} - -/* Example of card menu tinting */ -.resource-widget[data-section=distribute\/tools] .section-card-menu .card-bg:after { - background: rgba(126, 55, 148, 0.4) !important; -} - -.resource-widget[data-section=distribute\/tools] .section-card-menu .card-section-icon .icon { - background-color: #7e3794 !important; -} - -.resource-widget[data-section=distribute\/tools] .section-card-menu .card-info ul li { - border-top-color: #7e3794 !important; -} - -/* tinting for stacks */ -div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-menu .card-info ul li { - border-top-color: #7e3794 !important; -} - -.dac-fab { - background: #fff; - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.21); - box-sizing: border-box; - border-radius: 50%; - border: none; - cursor: pointer; - display: inline-block; - font-size: 0; - height: 36px; - line-height: 36px; - outline: 0; - padding: 0; - text-align: center; - -webkit-transition: box-shadow .3s; - transition: box-shadow .3s; - vertical-align: middle; - width: 36px; -} - -.dac-fab:hover, a:hover > .dac-fab { - box-shadow: 0 3px 8px rgba(0, 0, 0, 0.21); -} - -.dac-fab.dac-primary { - background: #00c7a0; -} - -.dac-fab.dac-large { - height: 54px; - line-height: 54px; - width: 54px; -} - -/* Footer component */ -.dac-footer { - border-top: 1px solid #f9f9f9; - color: #999; - font-size: 12px; - padding-bottom: 20px; -} - -.dac-footer a { - color: #999; -} - -.dac-footer p { - margin: 7px 0 0; -} - -.dac-footer-main { - padding: 30px 0; -} - -.dac-footer-reachout { - text-align: right; -} - -.dac-footer-contact, .dac-footer-social { - display: inline; -} - -.dac-footer-social-link + .dac-footer-social-link { - margin-left: 8px; -} - -.dac-footer a.dac-footer-getnews, .dac-footer a.dac-footer-contact-link { - color: #000; - cursor: pointer; - font-size: 20px; - font-weight: 300; - margin-right: 24px; - vertical-align: middle; -} - -.dac-footer-getnews > .dac-fab { - margin-left: 4px; -} - -.dac-footer-separator { - background: #f9f9f9; - margin: 0 0 12px; -} - -.dac-footer-links a + a:before { - content: '|'; - cursor: default; - margin: 0 10px 0 8px; -} - -.dac-footer .locales { - float: right; - margin: 0; -} - -.dac-footer .locales select { - background-color: #f9f9f9; - border: none; - border-radius: 0; - color: #999; - font-size: 12px; - height: auto; - margin-top: -2px; - padding: 8px 12px; -} - -@media (max-width: 719px) { - .responsive .dac-footer-reachout { - text-align: left; - } - - .responsive .dac-footer-social { - display: block; - } - - .responsive .dac-footer-social-link, .responsive .dac-footer-contact-link { - display: inline-block; - margin-top: 20px; - } - - .responsive .dac-footer .locales { - display: block; - float: none; - margin-top: 15px; - } -} - -/* ============================================================================= - Columns - ========================================================================== */ -.wrap { - margin: 0 auto; - max-width: 940px; - clear: both; -} - -.cols { - margin-left: -10px; - margin-right: -10px; - /** - * For modern browsers - * 1. The space content is one way to avoid an Opera bug when the - * contenteditable attribute is included anywhere else in the document. - * Otherwise it causes space to appear at the top and bottom of elements - * that are clearfixed. - * 2. The use of `table` rather than `block` is only necessary if using - * `:before` to contain the top-margins of child elements. - */ -} - -.cols:before, .cols:after { - content: ' '; - /* 1 */ - display: table; - /* 2 */ -} - -.cols:after { - clear: both; -} - -[class*=col-] { - box-sizing: border-box; - float: left; - min-height: 1px; - padding-left: 10px; - padding-right: 10px; - position: relative; -} - -.col-1 { - width: 6.25%; -} - -.col-2 { - width: 12.5%; -} - -.col-3 { - width: 18.75%; -} - -.col-4 { - width: 25%; -} - -.col-5 { - width: 31.25%; -} - -.col-6 { - width: 37.5%; -} - -.col-7 { - width: 43.75%; -} - -.col-8 { - width: 50%; -} - -.col-9 { - width: 56.25%; -} - -.col-10 { - width: 62.5%; -} - -.col-11 { - width: 68.75%; -} - -.col-12 { - width: 75%; -} - -.col-13 { - width: 81.25%; -} - -.col-14 { - width: 87.5%; -} - -.col-15 { - width: 93.75%; -} - -.col-16 { - width: 100%; -} - -.col-13 .col-1 { - width: 7.69230769%; -} - -.col-13 .col-2 { - width: 15.38461538%; -} - -.col-13 .col-3 { - width: 23.07692308%; -} - -.col-13 .col-4 { - width: 30.76923077%; -} - -.col-13 .col-5 { - width: 38.46153846%; -} - -.col-13 .col-6 { - width: 46.15384615%; -} - -.col-13 .col-7 { - width: 53.84615385%; -} - -.col-13 .col-8 { - width: 61.53846154%; -} - -.col-13 .col-9 { - width: 69.23076923%; -} - -.col-13 .col-10 { - width: 76.92307692%; -} - -.col-13 .col-11 { - width: 84.61538462%; -} - -.col-13 .col-12 { - width: 92.30769231%; -} - -.col-13 .col-13 { - width: 100%; -} - -.col-12 .col-1 { - width: 8.33333333%; -} - -.col-12 .col-2 { - width: 16.66666667%; -} - -.col-12 .col-3 { - width: 25%; -} - -.col-12 .col-4 { - width: 33.33333333%; -} - -.col-12 .col-5 { - width: 41.66666667%; -} - -.col-12 .col-6 { - width: 50%; -} - -.col-12 .col-7 { - width: 58.33333333%; -} - -.col-12 .col-8 { - width: 66.66666667%; -} - -.col-12 .col-9 { - width: 75%; -} - -.col-12 .col-10 { - width: 83.33333333%; -} - -.col-12 .col-11 { - width: 91.66666667%; -} - -.col-12 .col-12 { - width: 100%; -} - -.col-1of1, .col-2of2, .col-3of3, .col-4of4, .col-5of5, .col-6of6, .col-8of8, .col-10of10, .col-12of12, .col-16of16 { - width: 100%; -} - -.col-1of2, .col-2of4, .col-3of6, .col-4of8, .col-5of10, .col-6of12, .col-8of16 { - width: 50%; -} - -.col-1of3, .col-2of6, .col-4of12 { - width: 33.33333333%; -} - -.col-2of3, .col-4of6, .col-8of12 { - width: 66.66666667%; -} - -.col-1of4, .col-2of8, .col-3of12, .col-4of16 { - width: 25%; -} - -.col-3of4, .col-6of8, .col-9of12, .col-12of16 { - width: 75%; -} - -.col-1of5, .col-2of10 { - width: 20%; -} - -.col-2of5, .col-4of10 { - width: 40%; -} - -.col-3of5, .col-6of10 { - width: 60%; -} - -.col-4of5, .col-8of10 { - width: 80%; -} - -.col-1of6, .col-2of12 { - width: 16.66666667%; -} - -.col-5of6, .col-10of12 { - width: 83.33333333%; -} - -.col-1of8, .col-2of16 { - width: 12.5%; -} - -.col-3of8, .col-6of16 { - width: 37.5%; -} - -.col-5of8, .col-10of16 { - width: 62.5%; -} - -.col-7of8, .col-14of16 { - width: 87.5%; -} - -.col-1of10 { - width: 10%; -} - -.col-3of10 { - width: 30%; -} - -.col-7of10 { - width: 70%; -} - -.col-9of10 { - width: 90%; -} - -.col-1of12 { - width: 8.33333333%; -} - -.col-5of12 { - width: 41.66666667%; -} - -.col-7of12 { - width: 58.33333333%; -} - -.col-11of12 { - width: 91.66666667%; -} - -.col-1of16 { - width: 6.25%; -} - -.col-3of16 { - width: 18.75%; -} - -.col-5of16 { - width: 31.25%; -} - -.col-7of16 { - width: 43.75%; -} - -.col-9of16 { - width: 56.25%; -} - -.col-11of16 { - width: 68.75%; -} - -.col-13of16 { - width: 81.25%; -} - -.col-15of16 { - width: 93.75%; -} - -.col-pull-1of1, .col-pull-2of2, .col-pull-3of3, .col-pull-4of4, .col-pull-5of5, .col-pull-6of6, .col-pull-8of8, .col-pull-10of10, .col-pull-12of12, .col-pull-16of16 { - left: -100%; -} - -.col-pull-1of2, .col-pull-2of4, .col-pull-3of6, .col-pull-4of8, .col-pull-5of10, .col-pull-6of12, .col-pull-8of16 { - left: -50%; -} - -.col-pull-1of3, .col-pull-2of6, .col-pull-4of12 { - left: -33.33333333%; -} - -.col-pull-2of3, .col-pull-4of6, .col-pull-8of12 { - left: -66.66666667%; -} - -.col-pull-1of4, .col-pull-2of8, .col-pull-3of12, .col-pull-4of16 { - left: -25%; -} - -.col-pull-3of4, .col-pull-6of8, .col-pull-9of12, .col-pull-12of16 { - left: -75%; -} - -.col-pull-1of5, .col-pull-2of10 { - left: -20%; -} - -.col-pull-2of5, .col-pull-4of10 { - left: -40%; -} - -.col-pull-3of5, .col-pull-6of10 { - left: -60%; -} - -.col-pull-4of5, .col-pull-8of10 { - left: -80%; -} - -.col-pull-1of6, .col-pull-2of12 { - left: -16.66666667%; -} - -.col-pull-5of6, .col-pull-10of12 { - left: -83.33333333%; -} - -.col-pull-1of8, .col-pull-2of16 { - left: -12.5%; -} - -.col-pull-3of8, .col-pull-6of16 { - left: -37.5%; -} - -.col-pull-5of8, .col-pull-10of16 { - left: -62.5%; -} - -.col-pull-7of8, .col-pull-14of16 { - left: -87.5%; -} - -.col-pull-1of10 { - left: -10%; -} - -.col-pull-3of10 { - left: -30%; -} - -.col-pull-7of10 { - left: -70%; -} - -.col-pull-9of10 { - left: -90%; -} - -.col-pull-1of12 { - left: -8.33333333%; -} - -.col-pull-5of12 { - left: -41.66666667%; -} - -.col-pull-7of12 { - left: -58.33333333%; -} - -.col-pull-11of12 { - left: -91.66666667%; -} - -.col-pull-1of16 { - left: -6.25%; -} - -.col-pull-3of16 { - left: -18.75%; -} - -.col-pull-5of16 { - left: -31.25%; -} - -.col-pull-7of16 { - left: -43.75%; -} - -.col-pull-9of16 { - left: -56.25%; -} - -.col-pull-11of16 { - left: -68.75%; -} - -.col-pull-13of16 { - left: -81.25%; -} - -.col-pull-15of16 { - left: -93.75%; -} - -.col-push-1of1, .col-push-2of2, .col-push-3of3, .col-push-4of4, .col-push-5of5, .col-push-6of6, .col-push-8of8, .col-push-10of10, .col-push-12of12, .col-push-16of16 { - left: 100%; -} - -.col-push-1of2, .col-push-2of4, .col-push-3of6, .col-push-4of8, .col-push-5of10, .col-push-6of12, .col-push-8of16 { - left: 50%; -} - -.col-push-1of3, .col-push-2of6, .col-push-4of12 { - left: 33.33333333%; -} - -.col-push-2of3, .col-push-4of6, .col-push-8of12 { - left: 66.66666667%; -} - -.col-push-1of4, .col-push-2of8, .col-push-3of12, .col-push-4of16 { - left: 25%; -} - -.col-push-3of4, .col-push-6of8, .col-push-9of12, .col-push-12of16 { - left: 75%; -} - -.col-push-1of5, .col-push-2of10 { - left: 20%; -} - -.col-push-2of5, .col-push-4of10 { - left: 40%; -} - -.col-push-3of5, .col-push-6of10 { - left: 60%; -} - -.col-push-4of5, .col-push-8of10 { - left: 80%; -} - -.col-push-1of6, .col-push-2of12 { - left: 16.66666667%; -} - -.col-push-5of6, .col-push-10of12 { - left: 83.33333333%; -} - -.col-push-1of8, .col-push-2of16 { - left: 12.5%; -} - -.col-push-3of8, .col-push-6of16 { - left: 37.5%; -} - -.col-push-5of8, .col-push-10of16 { - left: 62.5%; -} - -.col-push-7of8, .col-push-14of16 { - left: 87.5%; -} - -.col-push-1of10 { - left: 10%; -} - -.col-push-3of10 { - left: 30%; -} - -.col-push-7of10 { - left: 70%; -} - -.col-push-9of10 { - left: 90%; -} - -.col-push-1of12 { - left: 8.33333333%; -} - -.col-push-5of12 { - left: 41.66666667%; -} - -.col-push-7of12 { - left: 58.33333333%; -} - -.col-push-11of12 { - left: 91.66666667%; -} - -.col-push-1of16 { - left: 6.25%; -} - -.col-push-3of16 { - left: 18.75%; -} - -.col-push-5of16 { - left: 31.25%; -} - -.col-push-7of16 { - left: 43.75%; -} - -.col-push-9of16 { - left: 56.25%; -} - -.col-push-11of16 { - left: 68.75%; -} - -.col-push-13of16 { - left: 81.25%; -} - -.col-push-15of16 { - left: 93.75%; -} - -@media (max-width: 960px) and (min-width: 720px) { - .responsive .col-tablet-1of1, .responsive .col-tablet-2of2, .responsive .col-tablet-3of3, .responsive .col-tablet-4of4, .responsive .col-tablet-5of5, .responsive .col-tablet-6of6, .responsive .col-tablet-8of8, .responsive .col-tablet-10of10, .responsive .col-tablet-12of12, .responsive .col-tablet-16of16 { - width: 100%; - } - - .responsive .col-tablet-1of2, .responsive .col-tablet-2of4, .responsive .col-tablet-3of6, .responsive .col-tablet-4of8, .responsive .col-tablet-5of10, .responsive .col-tablet-6of12, .responsive .col-tablet-8of16 { - width: 50%; - } - - .responsive .col-tablet-1of3, .responsive .col-tablet-2of6, .responsive .col-tablet-4of12 { - width: 33.33333333%; - } - - .responsive .col-tablet-2of3, .responsive .col-tablet-4of6, .responsive .col-tablet-8of12 { - width: 66.66666667%; - } - - .responsive .col-tablet-1of4, .responsive .col-tablet-2of8, .responsive .col-tablet-3of12, .responsive .col-tablet-4of16 { - width: 25%; - } - - .responsive .col-tablet-3of4, .responsive .col-tablet-6of8, .responsive .col-tablet-9of12, .responsive .col-tablet-12of16 { - width: 75%; - } - - .responsive .col-tablet-1of5, .responsive .col-tablet-2of10 { - width: 20%; - } - - .responsive .col-tablet-2of5, .responsive .col-tablet-4of10 { - width: 40%; - } - - .responsive .col-tablet-3of5, .responsive .col-tablet-6of10 { - width: 60%; - } - - .responsive .col-tablet-4of5, .responsive .col-tablet-8of10 { - width: 80%; - } - - .responsive .col-tablet-1of6, .responsive .col-tablet-2of12 { - width: 16.66666667%; - } - - .responsive .col-tablet-5of6, .responsive .col-tablet-10of12 { - width: 83.33333333%; - } - - .responsive .col-tablet-1of8, .responsive .col-tablet-2of16 { - width: 12.5%; - } - - .responsive .col-tablet-3of8, .responsive .col-tablet-6of16 { - width: 37.5%; - } - - .responsive .col-tablet-5of8, .responsive .col-tablet-10of16 { - width: 62.5%; - } - - .responsive .col-tablet-7of8, .responsive .col-tablet-14of16 { - width: 87.5%; - } - - .responsive .col-tablet-1of10 { - width: 10%; - } - - .responsive .col-tablet-3of10 { - width: 30%; - } - - .responsive .col-tablet-7of10 { - width: 70%; - } - - .responsive .col-tablet-9of10 { - width: 90%; - } - - .responsive .col-tablet-1of12 { - width: 8.33333333%; - } - - .responsive .col-tablet-5of12 { - width: 41.66666667%; - } - - .responsive .col-tablet-7of12 { - width: 58.33333333%; - } - - .responsive .col-tablet-11of12 { - width: 91.66666667%; - } - - .responsive .col-tablet-1of16 { - width: 6.25%; - } - - .responsive .col-tablet-3of16 { - width: 18.75%; - } - - .responsive .col-tablet-5of16 { - width: 31.25%; - } - - .responsive .col-tablet-7of16 { - width: 43.75%; - } - - .responsive .col-tablet-9of16 { - width: 56.25%; - } - - .responsive .col-tablet-11of16 { - width: 68.75%; - } - - .responsive .col-tablet-13of16 { - width: 81.25%; - } - - .responsive .col-tablet-15of16 { - width: 93.75%; - } -} - -.col-3-wide { - width: 33.33333333%; -} - -@media (max-width: 719px) { - .responsive [class*=col-] { - float: none; - left: 0; - width: auto; - } -} - -/* Header component */ -.dac-header { - background: #fff; - height: 64px; - margin: 0 -20px; -} - -.about .dac-header, .distribute .dac-header, .develop .dac-header { - height: 128px; -} - -.dac-header-inner { - background: #fff; - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.07); - box-sizing: border-box; - height: 64px; -} - -.dac-header.dac-sub .dac-header-inner { - border-bottom: 1px solid #e5e5e5; - box-shadow: none; -} - -.dac-header.is-sticky .dac-header-inner { - left: 0; - position: fixed; - top: 0; - right: 0; - -webkit-animation: .3s dac-header-show; - animation: .3s dac-header-show; - z-index: 52; -} - -.dac-header-logo { - border-right: 1px solid #e5e5e5; - display: block; - font-size: 20px; - font-weight: 300; - float: left; - letter-spacing: .3px; - line-height: 36px; - margin-right: 16px; - padding: 14px 24px 14px; -} - -.dac-header-logo:link, .dac-header-logo:visited, .dac-header-logo:hover, .dac-header-logo:active { - color: #444; -} - -.dac-header-logo-image { - margin-right: 5px; - vertical-align: top; -} - -.dac-header-consoleBtn { - border: 1px solid #c5c5c5; - border-radius: 4px; - box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.11); - background: #fff; - float: right; - font-size: 14px; - line-height: 28px; - margin: 17px 30px 17px 10px; - padding: 0 10px; - position: relative; - z-index: 52; -} - -.dac-header-consoleBtn > .dac-sprite { - margin-right: 5px; -} - -.dac-header-consoleBtn:link, .dac-header-consoleBtn:visited, .dac-header-consoleBtn:hover, .dac-header-consoleBtn:active { - color: #666; -} - -.dac-header-consoleBtn:focus { - background: rgba(63, 81, 181, 0.1); - outline: 0; -} - -@media (max-width: 719px) { - .responsive .dac-header { - height: 64px; - text-align: center; - } - - .responsive .dac-header-logo { - border-right: 0; - display: inline-block; - margin-right: 0; - float: none; - } - - .responsive .dac-header.dac-sub { - display: none; - } - - .responsive .dac-header-consoleBtn { - display: none; - } -} - -@-webkit-keyframes dac-header-show { - 0% { - -webkit-transform: translateY(-64px); - transform: translateY(-64px); - } - - 100% { - -webkit-transform: translateY(0); - transform: translateY(0); - } -} - -@keyframes dac-header-show { - 0% { - -webkit-transform: translateY(-64px); - transform: translateY(-64px); - } - - 100% { - -webkit-transform: translateY(0); - transform: translateY(0); - } -} - -/* Header Breadcrumbs component */ -.dac-header-crumbs { - display: none; - list-style-type: none; - margin: 0; -} - -.is-sticky .dac-header-crumbs { - display: block; -} - -.dac-header-crumbs-item { - float: left; - position: relative; - margin: 0; - padding-left: 10px; -} - -.dac-header-crumbs-item:before { - color: #444; - content: '>'; - font-weight: 300; - font-size: 20px; - left: 0; - line-height: 28px; - padding: 16px 0; - position: absolute; -} - -.dac-header-crumbs-item:first-child:before { - content: none; -} - -.dac-header-crumbs-link { - display: block; - font-size: 16px; - font-weight: 300; - line-height: 32px; - padding: 16px 16px; - -webkit-transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); - transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); -} - -.dac-header-crumbs-link:link, .dac-header-crumbs-link:visited, .dac-header-crumbs-link:hover, .dac-header-crumbs-link:active { - color: #444; -} - -.dac-header-crumbs-link:focus { - background: rgba(63, 81, 181, 0.1); - outline: 0; -} - -.dac-header-crumbs-link.current { - color: #6ab344; - font-weight: 400; -} - -@media (max-width: 719px) { - .responsive .dac-header-crumbs { - display: none; - } -} - -/* Header site search component */ -.dac-header-search { - background: #fff; - border-left: 1px solid #e5e5e5; - display: block; - float: right; - height: 28px; - padding: 18px 0; - position: relative; - overflow: hidden; - -webkit-transition: width 0.4s ease, left 0.4s ease; - transition: width 0.4s ease, left 0.4s ease; - width: 64px; - z-index: 52; -} - -.dac-header-search:hover, .dac-header-search.active { - width: 228px; -} - -.dac-header-search-inner { - width: 228px; -} - -.dac-header-search-btn { - background: url(../images/icon_search.png) 50% 0 no-repeat; - height: 28px; - position: absolute; - width: 64px; -} - -.dac-header-search:hover .dac-header-search-btn { - background-position: 50% -28px; -} - -.dac-header-search-form { - left: 54px; - opacity: 0; - position: absolute; - right: 24px; - top: 20px; - -webkit-transition: opacity .4s; - transition: opacity .4s; -} - -.dac-header-search:hover .dac-header-search-form, .dac-header-search.active .dac-header-search-form { - opacity: 1; -} - -.dac-header-search-input { - background-color: transparent; - border: none; - border-bottom: 1px solid #CCC; - box-sizing: border-box; - color: #2f2f2f; - font-size: 14px; - height: 24px; - outline: none; - padding: 4px 20px 4px 0; - width: 100%; - z-index: 1500; -} - -.dac-header-search:hover .dac-header-search-input { - border-bottom: 1px solid #33b5e5; -} - -.dac-header-search-input:focus { - color: #222; - font-weight: bold; - outline: 0; -} - -.dac-header-search-close { - position: absolute; - right: 4px; - bottom: 4px; - width: 16px; - height: 16px; - margin: 0; - text-indent: -1000em; - background: url(../images/close.png) no-repeat 0 0; - z-index: 9999; -} - -.dac-header-search-close:hover, .dac-header-search-close:focus { - background-position: -16px 0; - cursor: pointer; -} - -@media (max-width: 719px) { - .responsive .dac-header-search { - position: absolute; - left: calc(100% - 64px); - right: 0; - top: 0; - width: auto; - } - - .responsive .dac-header-search:hover, .responsive .dac-header-search.active { - left: 64px; - width: auto; - } -} - -/* Main navigation component */ -.is-sticky .dac-nav, .dac-nav-head, .dac-nav-toggle { - display: none; -} - -.dac-nav-list { - list-style-type: none; - left: 192px; - margin: 0; - position: absolute; - right: 0; - top: 0; - z-index: 51; -} - -.dac-nav-item { - float: left; - margin: 0; -} - -.dac-nav-head { - margin-bottom: 10px; -} - -.dac-nav-dimmer { - background: #000; - display: none; - height: 100%; - left: 0; - opacity: 0; - position: fixed; - top: 0; - -webkit-transition: visibility 0s linear .3s, opacity .3s linear; - transition: visibility 0s linear .3s, opacity .3s linear; - -webkit-transform: translateZ(0); - transform: translateZ(0); - visibility: hidden; - width: 100%; - z-index: 52; -} - -.dac-nav-hamburger { - display: inline-block; - height: 15px; - width: 16px; -} - -.dac-nav-hamburger-top, .dac-nav-hamburger-mid, .dac-nav-hamburger-bot { - background: #999; - display: block; - height: 3px; - margin: 3px 0 0; - width: 100%; -} - -.dac-nav-link { - display: block; - font-size: 16px; - font-weight: 300; - letter-spacing: .24px; - line-height: 32px; - padding: 18px 16px 14px; - -webkit-transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); - transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); -} - -.dac-nav-link:link, .dac-nav-link:visited, .dac-nav-link:hover, .dac-nav-link:active { - color: #444; -} - -.dac-nav-link:focus { - background: rgba(63, 81, 181, 0.1); - outline: 0; -} - -.dac-nav-link.has-subnav, .dac-nav-link.selected { - border-bottom: 3px solid #6ab344; - font-weight: 500; - padding-bottom: 11px; -} - -.dac-nav-secondary { - border-bottom: 1px solid #e5e5e5; - display: none; - left: -192px; - list-style-type: none; - margin: 0; - position: absolute; - top: 64px; - right: 0; -} - -.dac-nav-link.has-subnav + .dac-nav-secondary, .dac-nav-link.selected + .dac-nav-secondary { - display: block; -} - -.dac-nav-secondary .dac-nav-link { - padding: 17px 16px 15px; -} - -.dac-nav-secondary .dac-nav-link:link, .dac-nav-secondary .dac-nav-link:visited, .dac-nav-secondary .dac-nav-link:hover, .dac-nav-secondary .dac-nav-link:active { - color: #666; -} - -@media (min-width: 720px) and (max-width: 979px) { - .responsive .dac-nav-secondary .dac-nav-link { - padding-left: 8px; - padding-right: 8px; - } -} - -.dac-nav-secondary .dac-nav-item:first-child .dac-nav-link { - padding-left: 20px; -} - -.dac-nav-secondary .dac-nav-link.selected { - border: none; - font-weight: 700; -} - -@media (max-width: 719px) { - .responsive.dac-nav-open { - overflow: hidden; - } - - .responsive .dac-nav-toggle { - border-right: 1px solid #e5e5e5; - display: inline-block; - position: absolute; - left: 0; - line-height: 64px; - text-align: center; - width: 64px; - } - - .responsive .dac-nav-head, .responsive .dac-nav-secondary, .responsive .dac-nav-dimmer { - display: block; - } - - .responsive .dac-nav-dimmer.dac-nav-open { - opacity: .8; - -webkit-transition-delay: 0s; - transition-delay: 0s; - visibility: visible; - } - - .responsive .dac-nav-list { - background: #fff; - left: auto; - padding: 0 0 20px 0; - position: static; - } - - .responsive .dac-nav-list { - bottom: 0; - max-width: 280px; - overflow-y: auto; - position: fixed; - right: 100%; - top: 0; - -webkit-transition: -webkit-transform .3s ease; - transition: transform .3s ease; - width: 85%; - z-index: 52; - } - - .responsive .dac-nav-list.dac-nav-open { - -webkit-transform: translate3d(100%, 0, 0); - transform: translate3d(100%, 0, 0); - } - - .responsive .dac-nav-secondary { - border: none; - position: static; - width: 100%; - } - - .responsive .dac-nav-item { - float: none; - } - - .responsive .dac-nav-link { - display: block; - font-size: 12px; - font-weight: 600; - color: #333; - padding: 0 20px; - } - - .responsive .dac-nav-link.selected { - color: #09f; - } - - .responsive .dac-nav-secondary .dac-nav-link { - font-weight: 400; - margin-left: 20px; - margin-right: 20px; - } - - .responsive .dac-nav-link.has-subnav, .responsive .dac-nav-link.selected { - border: none; - } - - .responsive .dac-logo-image { - margin-right: 5px; - vertical-align: top; - } - - .responsive .dac-nav-logo { - box-shadow: 0 2px 2px rgba(0, 0, 0, 0.04); - font-size: 20px; - font-weight: 300; - letter-spacing: .3px; - line-height: 36px; - padding: 14px 24px; - } - - .responsive .dac-nav-logo:link, .responsive .dac-nav-logo:visited, .responsive .dac-nav-logo:hover, .responsive .dac-nav-logo:active { - color: #444; - } -} - -.dac-light.dac-hero, .dac-light.dac-section { - background-color: #eceff1; -} - -.dac-gray.dac-hero, .dac-gray.dac-section { - background-color: #b0bec5; -} - -.dac-dark.dac-hero, .dac-dark.dac-section { - background-color: #37474f; -} - -.dac-red.dac-hero, .dac-red.dac-section { - background-color: #dc4d38; -} - -.dac-hero-cta:link, .dac-hero-cta:visited, .dac-section-title, .dac-section-links { - color: #212121; - color: rgba(0, 0, 0, 0.87); -} - -.dac-invert .dac-hero-cta:link, .dac-invert .dac-hero-cta:visited, .dac-invert .dac-section-title, .dac-invert .dac-section-links { - color: white; -} - -.dac-hero-tag, .dac-hero-description, .dac-section-subtitle { - color: #757575; - color: rgba(0, 0, 0, 0.54); -} - -.dac-invert .dac-hero-tag, .dac-invert .dac-hero-description, .dac-invert .dac-section-subtitle { - color: #b2b2b2; - color: rgba(255, 255, 255, 0.7); -} - -/* Hero carousel */ -.dac-hero { - background-color: #fff; - background-position: 50% 30%; - background-size: cover; - box-sizing: border-box; - font-size: 16px; - min-height: 550px; - padding-top: 120px; -} - -.dac-hero.dac-darken: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 .dac-hero-content { - position: relative; -} - -@media (max-width: 719px) { - .responsive .dac-hero { - padding-bottom: 20px; - padding-top: 20px; - } -} - -.dac-hero-tag { - font-size: 11px; - font-weight: 700; - letter-spacing: .07em; - margin-bottom: 2px; - text-transform: uppercase; -} - -.dac-hero-title { - margin: 0 0 14px; -} - -.dac-hero-description { - margin-bottom: 16px; -} - -.dac-hero-cta { - display: inline-block; - line-height: 40px; - margin-right: 20px; -} - -.dac-hero-cta:hover { - color: currentColor; -} - -.dac-hero-cta .dac-sprite { - margin-left: -8px; -} - -.dac-hero-figure { - text-align: center; -} - -.dac-hero-carousel { - height: 550px; - position: relative; -} - -.dac-hero-carousel > .dac-hero { - bottom: 0; - left: 0; - position: absolute; - right: 0; - top: 0; -} - -.dac-hero-carousel > .dac-hero, .dac-hero-carousel > .dac-hero .wrap { - opacity: 0; -} - -.dac-hero-carousel > .dac-hero.active { - opacity: 1; - -webkit-transition: opacity .5s; - transition: opacity .5s; - z-index: 1; -} - -.dac-hero-carousel > .dac-hero.active .wrap { - opacity: 1; - -webkit-transition: opacity .5s .5s; - transition: opacity .5s .5s; -} - -.dac-hero-carousel > .dac-hero.out, .dac-hero-carousel > .dac-hero.out .wrap { - -webkit-transition: opacity 0s .5s; - transition: opacity 0s .5s; - opacity: 0; -} - -.dac-hero-carousel-pagination { - bottom: 33px; - left: 0; - position: absolute; - right: 0; - z-index: 51; -} - -@media (max-width: 719px) { - .responsive .dac-hero-carousel-pagination { - text-align: right; - bottom: 20px; - } -} - -.dac-pagination { - list-style: none; - margin: 0 -3px; -} - -.dac-pagination-item { - background-color: rgba(153, 153, 153, 0.4); - border-radius: 50%; - cursor: pointer; - display: inline-block; - height: 14px; - margin: 0 3px; - overflow: hidden; - text-indent: 100%; - -webkit-transition: background-color .1s ease-in; - transition: background-color .1s ease-in; - white-space: nowrap; - width: 14px; -} - -.dac-pagination-item:hover { - background-color: rgba(153, 153, 153, 0.6); -} - -.dac-pagination-item.active, .dac-pagination-item.active:hover { - background-color: #6ab344; -} - -.dac-invert .dac-pagination-item { - background-color: rgba(204, 204, 204, 0.2); -} - -.dac-invert .dac-pagination-item:hover { - background-color: rgba(153, 153, 153, 0.4); -} - -/* Form component */ -.dac-form { - font-size: 16px; - /* Modal Responsive */ -} - -.dac-form a { - color: #000; -} - -.dac-form-aside { - display: inline-block; - font-size: 12px; - margin-top: 0; -} - -.dac-form-required { - color: #ef4300; -} - -.dac-form-fieldset { - padding: 0; -} - -.dac-form-legend { - display: block; - font-weight: 500; - margin: 20px 0; - padding: 0; - width: 100%; -} - -.dac-form-legend > .dac-form-required { - float: right; - margin-top: 3px; -} - -.dac-form-input { - border: 0 solid #e3e3e3; - border-bottom-width: 1px; - display: block; - outline: 0; - padding: 8px 0; - -webkit-transition: border-color .2s; - transition: border-color .2s; - width: 100%; -} - -.dac-form-input-group { - position: relative; -} - -.dac-form-input-group > .dac-form-required { - display: block; - bottom: 3px; - position: absolute; - right: 0; -} - -.dac-form-input:focus { - border-bottom-color: #09f; -} - -.dac-form-floatlabel { - display: block; - margin-top: 5px; - -webkit-transform-origin: 0 100%; - -ms-transform-origin: 0 100%; - transform-origin: 0 100%; - -webkit-transform: translate3d(0, 30px, 0) scale(1); - transform: translate3d(0, 30px, 0) scale(1); - -webkit-transition: -webkit-transform .2s; - transition: transform .2s; -} - -.dac-focused > .dac-form-floatlabel, .dac-has-value > .dac-form-floatlabel { - -webkit-transform: translate3d(0, 0, 0) scale(.75); - transform: translate3d(0, 0, 0) scale(.75); -} - -.dac-form-radio, .dac-form-checkbox { - display: none; -} - -.dac-form-radio-group, .dac-form-checkbox-group { - display: table; - margin-top: 10px; -} - -.dac-form-radio-button, .dac-form-checkbox-button { - box-sizing: border-box; - cursor: pointer; - display: table-cell; - float: left; - height: 18px; - margin: 2px 10px 0 0; - position: relative; - width: 18px; -} - -.dac-form-radio-button::after, .dac-form-radio-button::before, .dac-form-checkbox-button::after, .dac-form-checkbox-button::before { - box-sizing: border-box; - content: ''; - border-radius: 50%; - display: block; - height: 100%; - position: absolute; - width: 100%; -} - -.dac-form-radio-button::before, .dac-form-checkbox-button::before { - background: rgba(0, 0, 0, 0.7); - -webkit-transform: translateZ(0) scale(0); - transform: translateZ(0) scale(0); - -webkit-transition: -webkit-transform .3s; - transition: transform .3s; -} - -.dac-form-radio:checked + .dac-form-radio-button::before, .dac-form-checkbox:checked + .dac-form-checkbox-button::before { - -webkit-transform: translateZ(0) scale(.5); - transform: translateZ(0) scale(.5); -} - -.dac-form-radio-button::after, .dac-form-checkbox-button::after { - border: 2px solid rgba(0, 0, 0, 0.7); -} - -.dac-form-checkbox-button::after, .dac-form-checkbox-button::before { - border-radius: 0; -} - -@media (max-width: 719px) { - .responsive .dac-form-legend { - margin-bottom: 0; - } -} - -/* Media component */ -.dac-media { - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-flex-flow: row wrap; - -ms-flex-flow: row wrap; - flex-flow: row wrap; -} - -.dac-media-figure { - margin: 0; -} - -.dac-media-body { - -webkit-box-flex: 1; - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; -} - -.no-flexbox .dac-media { - display: table; - width: 100%; -} - -.no-flexbox .dac-media-body, .no-flexbox .dac-media-figure { - display: table-cell; -} - -.no-flexbox .dac-media-figure { - padding: 0; -} - -.no-flexbox .dac-media-body { - width: 100%; -} - -/* Modal component */ -.dac-modal { - /* Modal dimmer */ - /* Modal Header */ - /* Modal window */ - /* Modal Action button */ - /* Modal Footer */ - /* Modal Responsive */ -} - -.dac-modal-open { - overflow: hidden; -} - -.dac-modal-dimmer { - background: #000; - height: 100%; - left: 0; - opacity: 0; - position: fixed; - top: 0; - -webkit-transform: translateZ(0); - transform: translateZ(0); - -webkit-transition: visibility 0s linear .3s, opacity .3s linear; - transition: visibility 0s linear .3s, opacity .3s linear; - visibility: hidden; - width: 100%; - z-index: 51; -} - -.dac-modal-dimmer.dac-active { - opacity: .8; - -webkit-transition-delay: 0s; - transition-delay: 0s; - visibility: visible; -} - -.dac-modal-header { - background: #00695c; - margin: -35px -35px 0; - padding: 35px 35px 30px; - position: relative; -} - -.dac-modal-header-close { - background: none; - border: none; - cursor: pointer; - line-height: 0; - outline: 0; - opacity: .7; - padding: 8px; - position: absolute; - right: 5px; - -webkit-transition: background-color .3s; - transition: background-color .3s; - top: 5px; -} - -.dac-modal-header-close:active { - background: rgba(255, 255, 255, 0.2); -} - -.dac-modal-header-title { - color: #fff; - font-size: 24px; - font-weight: 300; - line-height: 32px; - margin: 0; - padding-right: 150px; -} - -.dac-modal-header-subtitle { - bottom: 23px; - color: #fff; - display: inline-block; - font: inherit; - font-size: 14px; - opacity: .8; - position: absolute; - right: 35px; -} - -.dac-modal-header hr { - display: none; -} - -.dac-modal-window { - background: #fff; - border-top-left-radius: 6px; - border-top-right-radius: 6px; - box-sizing: border-box; - left: 50%; - margin-left: -480px; - max-width: 960px; - opacity: 0; - padding: 35px 35px 17.5px; - position: fixed; - top: 50%; - -webkit-transition: visibility 0s linear .3s, opacity .3s linear; - transition: visibility 0s linear .3s, opacity .3s linear; - -webkit-transform: translate(0, -50%); - -ms-transform: translate(0, -50%); - transform: translate(0, -50%); - visibility: hidden; - width: 100%; - z-index: 51; -} - -.dac-modal-window.dac-active { - opacity: 1; - -webkit-transition-delay: 0s; - transition-delay: 0s; - visibility: visible; -} - -.dac-modal-action { - bottom: 0; - position: absolute; - right: 0; -} - -.dac-modal-iframe { - display: none; -} - -.dac-modal-footer { - margin-top: 35px; - position: relative; -} - -@media (max-width: 1010px) { - .responsive .dac-modal-window { - bottom: auto; - left: 10px; - margin: 10px; - right: 10px; - top: 50%; - -webkit-transform: translate3d(0, -50%, 0); - transform: translate3d(0, -50%, 0); - width: auto; - } -} - -@media (max-width: 719px) { - .responsive .dac-modal-header { - margin: -10px -10px 10px; - padding-bottom: 10px; - padding-left: 10px; - padding-right: 10px; - } - - .responsive .dac-modal-header-title { - font-size: 16px; - line-height: 26px; - padding: 0; - } - - .responsive .dac-modal-header-subtitle { - display: inline-block; - margin: 0; - position: static; - text-align: right; - width: 100%; - } - - .responsive .dac-modal-window { - border-radius: 0; - bottom: auto; - margin: 10px; - left: 0; - padding: 10px; - top: 0; - -webkit-transform: none; - -ms-transform: none; - transform: none; - width: auto; - } - - .responsive .dac-modal-footer { - border-top: 1px solid #e3e3e3; - margin: 20px -10px 0; - padding: 30px 10px; - } - - .responsive .dac-modal-action { - display: block; - margin: 40px auto 0; - position: static; - } -} - -.newsletter-checkboxes { - padding-top: 10px; -} - -.dac-expand, .dac-section { - margin-left: -20px; - margin-right: -20px; - padding-left: 20px; - padding-right: 20px; -} - -@media (max-width: 719px) { - .responsive .dac-expand, .responsive .dac-section { - margin-left: -10px; - margin-right: -10px; - padding-left: 10px; - padding-right: 10px; - } -} - -.dac-invert { - color: #b2b2b2; - color: rgba(255, 255, 255, 0.7); -} - -.dac-invert h1, .dac-invert h2, .dac-invert h3 { - color: #fff; -} - -.dac-light.dac-hero, .dac-light.dac-section { - background-color: #eceff1; -} - -.dac-gray.dac-hero, .dac-gray.dac-section { - background-color: #b0bec5; -} - -.dac-dark.dac-hero, .dac-dark.dac-section { - background-color: #37474f; -} - -.dac-red.dac-hero, .dac-red.dac-section { - background-color: #dc4d38; -} - -.dac-hero-cta:link, .dac-hero-cta:visited, .dac-section-title, .dac-section-links { - color: #212121; - color: rgba(0, 0, 0, 0.87); -} - -.dac-invert .dac-hero-cta:link, .dac-invert .dac-hero-cta:visited, .dac-invert .dac-section-title, .dac-invert .dac-section-links { - color: white; -} - -.dac-hero-tag, .dac-hero-description, .dac-section-subtitle { - color: #757575; - color: rgba(0, 0, 0, 0.54); -} - -.dac-invert .dac-hero-tag, .dac-invert .dac-hero-description, .dac-invert .dac-section-subtitle { - color: #b2b2b2; - color: rgba(255, 255, 255, 0.7); -} - -.dac-section { - background-position: 50% 50%; - background-size: cover; - padding-bottom: 84px; - padding-top: 84px; - position: relative; -} - -.dac-section.dac-small { - padding-bottom: 32px; - padding-top: 32px; -} - -.dac-section-title { - text-align: center; - margin-bottom: 40px; - margin-top: 0; -} - -.dac-section-subtitle { - font-size: 16px; - margin-bottom: 40px; - margin-top: -24px; - text-align: center; -} - -.dac-section-links { - font-size: 16px; - list-style: none; - line-height: 40px; - margin: 16px 0 0; - text-align: center; -} - -@media (max-width: 719px) { - .responsive .dac-section-links { - margin-left: -8px; - text-align: left; - } -} - -.dac-section-link { - display: inline-block; - margin: 0 32px; -} - -@media (max-width: 719px) { - .responsive .dac-section-link { - display: block; - margin: 0; - } -} - -.dac-section-link a:link, .dac-section-link a:visited { - color: inherit; -} - -/* -SCSS variables are information about icon's compiled state, stored under its original file name - -.icon-home { - width: $icon-home-width; -} - -The large array-like variables contain all information about a single icon -$icon-home: x y offset_x offset_y width height total_width total_height image_path; - -At the bottom of this section, we provide information about the spritesheet itself -$spritesheet: width height image $spritesheet-sprites; -*/ -.dac-sprite, #tb li:before, #qv li:before { - background-image: url(/assets/images/sprite.png); - display: inline-block; - vertical-align: middle; } - @media screen and (min-device-pixel-ratio: 1.5) { - .dac-sprite, #tb li:before, #qv li:before { - background-image: url(/assets/images/sprite-2x.png); - background-size: 50% 50%; } } - -.dac-sprite.dac-auto-chevron { - background-position: 0px -38px; - height: 24px; - width: 24px; - vertical-align: -6px; } - .dac-invert .dac-sprite.dac-auto-chevron { - background-position: -26px -38px; - height: 24px; - width: 24px; } -.dac-sprite.dac-auto-chevron-large { - background-position: -38px 0px; - height: 36px; - width: 36px; - vertical-align: -10px; } - .dac-invert .dac-sprite.dac-auto-chevron-large { - background-position: 0px 0px; - height: 36px; - width: 36px; } - -.dac-sprite.dac-arrow-right { - background-position: -76px -35px; - height: 18px; - width: 11px; } - -.dac-sprite.dac-chevron-large-right-black { - background-position: -38px 0px; - height: 36px; - width: 36px; } - -.dac-sprite.dac-chevron-large-right-white { - background-position: 0px 0px; - height: 36px; - width: 36px; } - -.dac-sprite.dac-chevron-right-black { - background-position: 0px -38px; - height: 24px; - width: 24px; } - -.dac-sprite.dac-chevron-right-white { - background-position: -26px -38px; - height: 24px; - width: 24px; } - -.dac-sprite.dac-close { - background-position: -54px -64px; - height: 12px; - width: 12px; } - -.dac-sprite.dac-google-play { - background-position: -52px -38px; - height: 18px; - width: 16px; } - -.dac-sprite.dac-gplus { - background-position: -76px 0px; - height: 17px; - width: 16px; } - -.dac-sprite.dac-mail { - background-position: -36px -64px; - height: 12px; - width: 16px; } - -.dac-sprite.dac-rss { - background-position: -20px -64px; - height: 14px; - width: 14px; } - -.dac-sprite.dac-twitter { - background-position: -76px -19px; - height: 14px; - width: 16px; } - -.dac-sprite.dac-youtube { - background-position: 0px -64px; - height: 14px; - width: 18px; } - -.dac-visible-mobile-block, .dac-mobile-only, .dac-visible-mobile-inline, .dac-visible-mobile-inline-block, .dac-visible-tablet-block, .dac-visible-tablet-inline, .dac-visible-tablet-inline-block, .dac-visible-desktop-block, .dac-visible-desktop-inline, .dac-visible-desktop-inline-block { - display: none !important; } - -@media (max-width: 719px) { - .responsive .dac-hidden-mobile { - display: none !important; } - .responsive .dac-visible-mobile-block, .responsive .dac-mobile-only { - display: block !important; } - .responsive .dac-visible-mobile-inline { - display: inline !important; } - .responsive .dac-visible-mobile-inline-block { - display: inline-block !important; } } - -@media (min-width: 720px) and (max-width: 979px) { - .responsive .dac-hidden-tablet { - display: none !important; } - .responsive .dac-visible-tablet-block { - display: block !important; } - .responsive .dac-visible-tablet-inline { - display: inline !important; } - .responsive .dac-visible-tablet-inline-block { - display: inline-block !important; } } - -@media (min-width: 980px) { - .responsive .dac-hidden-desktop { - display: none !important; } - .responsive .dac-visible-desktop-block { - display: block !important; } - .responsive .dac-visible-desktop-inline { - display: inline !important; } - .responsive .dac-visible-desktop-inline-block { - display: inline-block !important; } } - -#tb li:before, #qv li:before { - background-position: 0px -38px; - height: 24px; - width: 24px; - content: ''; - left: -8px; - opacity: .7; - position: absolute; } diff --git a/tools/droiddoc/templates-sdk-dev/assets/css/fullscreen.css b/tools/droiddoc/templates-sdk-dev/assets/css/fullscreen.css index 0f108e046..7912e3490 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/css/fullscreen.css +++ b/tools/droiddoc/templates-sdk-dev/assets/css/fullscreen.css @@ -14,7 +14,195 @@ */ @media screen, projection, print { - .wrap { - max-width: none; - } +.full { + padding: 2.5em 0; + border-top: solid 1px #ddd; + border-bottom: solid 1px #ddd; + background: #f7f7f7; } +.wrap { + margin: 0 auto; + width: 100%; + min-width:600px; + clear: both; +} +.cols { + height: 1%; + margin: 0 -1.533742331288343558282%; + width: 103.06748466257669%} +*+html .cols { + margin-bottom: 20px; +} +.cols:after { + clear: both; + content: ' '; + display: block; + height: 0; + visibility: hidden; +} +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, +.col-13, .col-14, .col-15, .col-16 { + float: left; + margin: 0 1.063829787234% 20px 1.063829787234%; +} +* html .col-1, * html .col-2, * html .col-3, * html .col-4, * html .col-5, * html .col-6, * html +.col-7, * html .col-8, * html .col-9, * html .col-10, * html .col-11, * html .col-12, * html +.col-13, * html .col-14, * html .col-15, * html .col-16 { + margin: 0; + margin: 0 1.063829787234% 20px 1.063829787234%; +} +[dir='rtl'] .col-1, [dir='rtl'] .col-2, [dir='rtl'] .col-3, [dir='rtl'] .col-4, [dir='rtl'] .col-5, +[dir='rtl'] .col-6, [dir='rtl'] .col-7, [dir='rtl'] .col-8, [dir='rtl'] .col-9, [dir='rtl'] .col-10, +[dir='rtl'] .col-11, [dir='rtl'] .col-12 { + float: right; +} +.col-1 { + width: 4.16666666666667%; +} +.col-2 { + width: 10.4166666666667%; +} +.col-3 { + width: 16.6666666666667%; +} +.col-4 { + width: 22.9166666666667%; +} +.col-5 { + width: 29.1666666666667%; +} +.col-6 { + width: 35.4166666666667%; +} +.col-7 { + width: 41.6666666666667%; +} +.col-8 { + width: 47.9166666666667%; +} +.col-9 { + width: 55.3333333333333%; +} +.col-10 { + width: 60.4166666666667%; +} +.col-11 { + width: 66.6666666666667%; +} +.col-12 { + width: 72.9166666666667%; +} +.col-13 { + width: 79.1666666666667%; +} +.col-14 { + width: 85.4166666666667%; +} +.col-15 { + width: 91.6666666666667%; +} +.col-16 { + width: 97.9166666666667%; +} + + + + + + + +#header .col-1, +#nav-x .col-1 { width: 40px } +#header .col-2, +#nav-x .col-2 { width: 100px } +#header .col-3, +#nav-x .col-3 { width: 160px } +#header .col-4, +#nav-x .col-4 { width: 220px } +#header .col-5, +#nav-x .col-5 { width: 280px } +#header .col-6, +#nav-x .col-6 { width: 340px } +#header .col-7, +#nav-x .col-7 { width: 400px } +#header .col-8, +#nav-x .col-8 { width: 460px } +#header .col-9, +#nav-x .col-9 { width: 520px } +#header .col-10, +#nav-x .col-10 { width: 580px } +#header .col-11, +#nav-x .col-11 { width: 640px } +#header .col-12, +#nav-x .col-12 { width: 700px } +#header .col-13, +#nav-x .col-13 { width: 760px } +#header .col-14, +#nav-x .col-14 { width: 820px } +#header .col-15, +#nav-x .col-15 { width: 880px } +#header .col-16, +#nav-x .col-16 { width: 940px } + + + +body { + padding:0 20px; +} +#header, +#searchResults, +#nav-x { + margin:0; +} +#body-content { + margin:0; +} +#body-content > .col-12 { + width:77.9804965%; + margin:0 0 0 0.97%; /* this percentage chosen to make IE9 happy */ +} +#side-nav { + width: 19.9804965%; + margin:0 1.063829787234% 0 0; +} + +#header .wrap { + max-width: 100%; +} + +#header-wrapper #nav-x div.wrap, +#searchResults.wrap { + max-width:100%; +} + +.nav-x { + margin:-2px 0 0 0; +} + +#devdoc-nav.fixed, +#devdoc-nav.fixed a.totop { + left:20px; /* !important ... for IE i think */ +} + +#sticky-header { + padding: 0 20px; +} + +#sticky-header > div { + width: 100%; +} + +.sticky-menu { + width:100%; + left:-20px; +} + +.col-right { + margin-right:0px; +} + +@media screen and (max-width:772px) { +.col-5, .col-6, .col-7 { + clear: both; + width: 97.0238096%} +}
\ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/assets/images/resource-card-default-android.jpg b/tools/droiddoc/templates-sdk-dev/assets/images/resource-card-default-android.jpg Binary files differindex 398030f13..80507444a 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/images/resource-card-default-android.jpg +++ b/tools/droiddoc/templates-sdk-dev/assets/images/resource-card-default-android.jpg diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material.png b/tools/droiddoc/templates-sdk-dev/assets/images/styles/notice-designers-material.png Binary files differindex 1fb22a2ac..1fb22a2ac 100644 --- a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material.png +++ b/tools/droiddoc/templates-sdk-dev/assets/images/styles/notice-designers-material.png diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material@2x.png b/tools/droiddoc/templates-sdk-dev/assets/images/styles/notice-designers-material@2x.png Binary files differindex bc2f74b24..bc2f74b24 100644 --- a/tools/droiddoc/templates-sdk/assets/images/styles/notice-designers-material@2x.png +++ b/tools/droiddoc/templates-sdk-dev/assets/images/styles/notice-designers-material@2x.png diff --git a/tools/droiddoc/templates-sdk-dev/assets/js/docs.js b/tools/droiddoc/templates-sdk-dev/assets/js/docs.js index ca642171f..7f4be4e16 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk-dev/assets/js/docs.js @@ -82,7 +82,7 @@ $(document).ready(function() { .after('<hr/>'); // set up the search close button - $('#search-close').click(function() { + $('.search .close').click(function() { $searchInput = $('#search_autocomplete'); $searchInput.attr('value', ''); $(this).addClass("hide"); @@ -92,6 +92,32 @@ $(document).ready(function() { hideResults(); }); + // Set up quicknav + var quicknav_open = false; + $("#btn-quicknav").click(function() { + if (quicknav_open) { + $(this).removeClass('active'); + quicknav_open = false; + collapse(); + } else { + $(this).addClass('active'); + quicknav_open = true; + expand(); + } + }) + + var expand = function() { + $('#header-wrap').addClass('quicknav'); + $('#quicknav').stop().show().animate({opacity:'1'}); + } + + var collapse = function() { + $('#quicknav').stop().animate({opacity:'0'}, 100, function() { + $(this).hide(); + $('#header-wrap').removeClass('quicknav'); + }); + } + //Set up search $("#search_autocomplete").focus(function() { @@ -154,71 +180,73 @@ $(document).ready(function() { // Highlight the header tabs... // highlight Design tab - var urlSegments = pagePathOriginal.split('/'); - var navEl = $(".dac-nav-list"); - var subNavEl = navEl.find(".dac-nav-secondary"); - var parentNavEl; - if ($("body").hasClass("design")) { - navEl.find("> li.design > a").addClass("selected"); + $("#header li.design a").addClass("selected"); + $("#sticky-header").addClass("design"); + // highlight About tabs } else if ($("body").hasClass("about")) { - if (urlSegments[1] == "about" || urlSegments[1] == "wear" || urlSegments[1] == "tv" || urlSegments[1] == "auto") { - navEl.find("> li.home > a").addClass('has-subnav'); - subNavEl.find("li." + urlSegments[1] + " > a").addClass("selected"); - } else { - navEl.find("> li.home > a").addClass('selected'); + var rootDir = pagePathOriginal.substring(1,pagePathOriginal.indexOf('/', 1)); + if (rootDir == "about") { + $("#nav-x li.about a").addClass("selected"); + } else if (rootDir == "wear") { + $("#nav-x li.wear a").addClass("selected"); + } else if (rootDir == "tv") { + $("#nav-x li.tv a").addClass("selected"); + } else if (rootDir == "auto") { + $("#nav-x li.auto a").addClass("selected"); } // highlight Develop tab } else if ($("body").hasClass("develop") || $("body").hasClass("google")) { - parentNavEl = navEl.find("> li.develop > a"); - parentNavEl.addClass('has-subnav'); - + $("#header li.develop a").addClass("selected"); + $("#sticky-header").addClass("develop"); // In Develop docs, also highlight appropriate sub-tab - if (urlSegments[1] == "training") { - subNavEl.find("li.training > a").addClass("selected"); - } else if (urlSegments[1] == "guide") { - subNavEl.find("li.guide > a").addClass("selected"); - } else if (urlSegments[1] == "reference") { + var rootDir = pagePathOriginal.substring(1,pagePathOriginal.indexOf('/', 1)); + if (rootDir == "training") { + $("#nav-x li.training a").addClass("selected"); + } else if (rootDir == "guide") { + $("#nav-x li.guide a").addClass("selected"); + } else if (rootDir == "reference") { // If the root is reference, but page is also part of Google Services, select Google if ($("body").hasClass("google")) { - subNavEl.find("li.google > a").addClass("selected"); + $("#nav-x li.google a").addClass("selected"); } else { - subNavEl.find("li.reference > a").addClass("selected"); + $("#nav-x li.reference a").addClass("selected"); } - } else if ((urlSegments[1] == "tools") || (urlSegments[1] == "sdk")) { - subNavEl.find("li.tools > a").addClass("selected"); + } else if ((rootDir == "tools") || (rootDir == "sdk")) { + $("#nav-x li.tools a").addClass("selected"); } else if ($("body").hasClass("google")) { - subNavEl.find("li.google > a").addClass("selected"); + $("#nav-x li.google a").addClass("selected"); } else if ($("body").hasClass("samples")) { - subNavEl.find("li.samples > a").addClass("selected"); - } else { - parentNavEl.removeClass('has-subnav').addClass("selected"); + $("#nav-x li.samples a").addClass("selected"); } + // highlight Distribute tab } else if ($("body").hasClass("distribute")) { - parentNavEl = navEl.find("> li.distribute > a"); - parentNavEl.addClass('has-subnav'); - - if (urlSegments[2] == "users") { - subNavEl.find("li.users > a").addClass("selected"); - } else if (urlSegments[2] == "engage") { - subNavEl.find("li.engage > a").addClass("selected"); - } else if (urlSegments[2] == "monetize") { - subNavEl.find("li.monetize > a").addClass("selected"); - } else if (urlSegments[2] == "analyze") { - subNavEl.find("li.analyze > a").addClass("selected"); - } else if (urlSegments[2] == "tools") { - subNavEl.find("li.disttools > a").addClass("selected"); - } else if (urlSegments[2] == "stories") { - subNavEl.find("li.stories > a").addClass("selected"); - } else if (urlSegments[2] == "essentials") { - subNavEl.find("li.essentials > a").addClass("selected"); - } else if (urlSegments[2] == "googleplay") { - subNavEl.find("li.googleplay > a").addClass("selected"); - } else { - parentNavEl.removeClass('has-subnav').addClass("selected"); + $("#header li.distribute a").addClass("selected"); + $("#sticky-header").addClass("distribute"); + + var baseFrag = pagePathOriginal.indexOf('/', 1) + 1; + var secondFrag = pagePathOriginal.substring(baseFrag, pagePathOriginal.indexOf('/', baseFrag)); + if (secondFrag == "users") { + $("#nav-x li.users a").addClass("selected"); + } else if (secondFrag == "engage") { + $("#nav-x li.engage a").addClass("selected"); + } else if (secondFrag == "monetize") { + $("#nav-x li.monetize a").addClass("selected"); + } else if (secondFrag == "analyze") { + $("#nav-x li.analyze a").addClass("selected"); + } else if (secondFrag == "tools") { + $("#nav-x li.disttools a").addClass("selected"); + } else if (secondFrag == "stories") { + $("#nav-x li.stories a").addClass("selected"); + } else if (secondFrag == "essentials") { + $("#nav-x li.essentials a").addClass("selected"); + } else if (secondFrag == "googleplay") { + $("#nav-x li.googleplay a").addClass("selected"); } + } else if ($("body").hasClass("about")) { + $("#sticky-header").addClass("about"); } // set global variable so we can highlight the sidenav a bit later (such as for google reference) @@ -364,12 +392,13 @@ false; // navigate across topic boundaries only in design docs var $olClasses = $('<ol class="class-list"></ol>'); var $liClass; + var $imgIcon; var $h2Title; var $pSummary; var $olLessons; var $liLesson; $classLinks.each(function(index) { - $liClass = $('<li class="clearfix"></li>'); + $liClass = $('<li></li>'); $h2Title = $('<a class="title" href="'+$(this).attr('href')+'"><h2>' + $(this).html()+'</h2><span></span></a>'); $pSummary = $('<p class="description">' + $classDescriptions[index] + '</p>'); @@ -378,14 +407,18 @@ false; // navigate across topic boundaries only in design docs $lessons = $(this).closest('li').find('ul li a'); if ($lessons.length) { + $imgIcon = $('<img src="'+toRoot+'assets/images/resource-tutorial.png" ' + + ' width="64" height="64" alt=""/>'); $lessons.each(function(index) { $olLessons.append('<li><a href="'+$(this).attr('href')+'">' + $(this).html()+'</a></li>'); }); } else { + $imgIcon = $('<img src="'+toRoot+'assets/images/resource-article.png" ' + + ' width="64" height="64" alt=""/>'); $pSummary.addClass('article'); } - $liClass.append($h2Title).append($pSummary).append($olLessons); + $liClass.append($h2Title).append($imgIcon).append($pSummary).append($olLessons); $olClasses.append($liClass); }); $('.jd-descr').append($olClasses); @@ -471,6 +504,15 @@ false; // navigate across topic boundaries only in design docs po.src = 'https://apis.google.com/js/plusone.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); + + // Revise the sidenav widths to make room for the scrollbar + // which avoids the visible width from changing each time the bar appears + var $sidenav = $("#side-nav"); + var sidenav_width = parseInt($sidenav.innerWidth()); + + $("#devdoc-nav #nav").css("width", sidenav_width - 4 + "px"); // 4px is scrollbar width + + $(".scroll-pane").removeAttr("tabindex"); // get rid of tabindex added by jscroller if ($(".scroll-pane").length > 1) { @@ -544,15 +586,6 @@ false; // navigate across topic boundaries only in design docs }); }); } - - // Responsive testing - var responsiveParam = location.href.match(/[?&]responsive=?(|true|false)/); - if (responsiveParam) { - localStorage['test-responsive'] = ['', 'true'].indexOf(responsiveParam) > -1; - } - if (localStorage['test-responsive']) { - $(document.body).addClass('responsive'); - } }); // END of the onload event @@ -705,28 +738,21 @@ function initExpandableNavItems(rootTag) { /** Create the list of breadcrumb links in the sticky header */ function buildBreadcrumbs() { - var $breadcrumbUl = $(".dac-header-crumbs"); - var primaryNavLink = ".dac-nav-list > .dac-nav-item > .dac-nav-link"; - + var $breadcrumbUl = $("#sticky-header ul.breadcrumb"); // Add the secondary horizontal nav item, if provided - var $selectedSecondNav = $(".dac-nav-secondary .dac-nav-link.selected").clone() - .attr('class', 'dac-header-crumbs-link'); - + var $selectedSecondNav = $("div#nav-x ul.nav-x a.selected").clone().removeClass("selected"); if ($selectedSecondNav.length) { - $breadcrumbUl.prepend($('<li class="dac-header-crumbs-item">').append($selectedSecondNav)); + $breadcrumbUl.prepend($("<li>").append($selectedSecondNav)) } - // Add the primary horizontal nav - var $selectedFirstNav = $(primaryNavLink + ".selected, " + primaryNavLink + ".has-subnav").clone() - .attr('class', 'dac-header-crumbs-link'); - + var $selectedFirstNav = $("div#header-wrap ul.nav-x a.selected").clone().removeClass("selected"); // If there's no header nav item, use the logo link and title from alt text if ($selectedFirstNav.length < 1) { - $selectedFirstNav = $('<a class="dac-header-crumbs-link">') + $selectedFirstNav = $("<a>") .attr('href', $("div#header .logo a").attr('href')) .text($("div#header .logo img").attr('alt')); } - $breadcrumbUl.prepend($('<li class="dac-header-crumbs-item">').append($selectedFirstNav)); + $breadcrumbUl.prepend($("<li>").append($selectedFirstNav)); } @@ -798,7 +824,7 @@ function setNavBarLeftPos() { function updateSideNavPosition() { var newLeft = $(window).scrollLeft() - navBarLeftPos; $('#devdoc-nav').css({left: -newLeft}); - $('#devdoc-nav .totop').css({left: -(newLeft - parseInt($('#side-nav').css('padding-left')))}); + $('#devdoc-nav .totop').css({left: -(newLeft - parseInt($('#side-nav').css('margin-left')))}); } // TODO: use $(document).ready instead @@ -1042,7 +1068,7 @@ var prevScrollLeft = 0; // used to compare current position to previous position /* Sets the vertical scoll position at which the sticky bar should appear. This method is called to reset the position when search results appear or hide */ function setStickyTop() { - stickyTop = $('#header-wrapper').outerHeight() - $('#header > .dac-header-inner').outerHeight(); + stickyTop = $('#header-wrapper').outerHeight() - $('#sticky-header').outerHeight(); } /* @@ -1052,7 +1078,8 @@ $(window).scroll(function(event) { setStickyTop(); var hiding = false; - var $headerEl = $('#header'); + var $stickyEl = $('#sticky-header'); + var $menuEl = $('.menu-container'); // Exit if there's no sidenav if ($('#side-nav').length == 0) return; // Exit if the mouse target is a DIV, because that means the event is coming @@ -1093,14 +1120,16 @@ $(window).scroll(function(event) { .css({'width':'auto','margin':''}) .prependTo('#side-nav'); // delay hide the sticky - $headerEl.removeClass('is-sticky'); + $menuEl.removeClass('sticky-menu'); + $stickyEl.fadeOut(250); hiding = false; // update the sidenaav position for side scrolling updateSideNavPosition(); } else if (!sticky && shouldBeSticky) { sticky = true; - $headerEl.addClass('is-sticky'); + $stickyEl.fadeIn(10); + $menuEl.addClass('sticky-menu'); // make the sidenav fixed var width = $('#devdoc-nav').width(); @@ -1113,7 +1142,8 @@ $(window).scroll(function(event) { updateSideNavPosition(); } else if (hiding && top < 15) { - $headerEl.removeClass('is-sticky'); + $menuEl.removeClass('sticky-menu'); + $stickyEl.hide(); hiding = false; } resizeNav(250); // pass true in order to delay the scrollbar re-initialization for performance @@ -1811,11 +1841,12 @@ function sync_selection_table(toroot) // if there are api results if ((gMatches.length > 0) || (gGoogleMatches.length > 0)) { // reveal suggestion list + $('.suggest-card.dummy').show(); $('.suggest-card.reference').show(); var listIndex = 0; // list index position // reset the lists - $(".suggest-card.reference li").remove(); + $(".search_filtered_wrapper.reference li").remove(); // ########### ANDROID RESULTS ############# if (gMatches.length > 0) { @@ -1845,12 +1876,13 @@ function sync_selection_table(toroot) } } else { $('.suggest-card.reference').hide(); + $('.suggest-card.dummy').hide(); } // ########### JD DOC RESULTS ############# if (gDocsMatches.length > 0) { // reset the lists - $(".suggest-card:not(.reference) li").remove(); + $(".search_filtered_wrapper.docs li").remove(); // determine google results to show // NOTE: The order of the conditions below for the sugg.type MUST BE SPECIFIC: @@ -1915,7 +1947,7 @@ function sync_selection_table(toroot) } } else { - $('.suggest-card:not(.reference)').hide(300); + $('.search_filtered_wrapper.docs .suggest-card:not(.dummy)').hide(300); } } @@ -1939,14 +1971,14 @@ function search_changed(e, kd, toroot) // show/hide the close button if (text != '') { - $("#search-close").removeClass("hide"); + $(".search .close").removeClass("hide"); } else { - $("#search-close").addClass("hide"); + $(".search .close").addClass("hide"); } // 27 = esc if (e.keyCode == 27) { // close all search results - if (kd) $('#search-close').trigger('click'); + if (kd) $('.search .close').trigger('click'); return true; } // 13 = enter @@ -2504,7 +2536,7 @@ function search_focus_changed(obj, focused) { if (!focused) { if(obj.value == ""){ - $("#search-close").addClass("hide"); + $(".search .close").addClass("hide"); } $(".suggest-card").hide(); } @@ -2521,7 +2553,7 @@ function submit_search() { function hideResults() { $("#searchResults").slideUp('fast', setStickyTop); - $("#search-close").addClass("hide"); + $(".search .close").addClass("hide"); location.hash = ''; $("#search_autocomplete").val("").blur(); @@ -2638,7 +2670,7 @@ google.setOnLoadCallback(function(){ } else { // first time loading search results for this page $('#searchResults').slideDown('slow', setStickyTop); - $("#search-close").removeClass("hide"); + $(".search .close").removeClass("hide"); loadSearchResults(); } }, true); @@ -2682,7 +2714,7 @@ $(window).hashchange( function(){ searchControl.execute(query); $('#searchResults').slideDown('slow', setStickyTop); $("#search_autocomplete").focus(); - $("#search-close").removeClass("hide"); + $(".search .close").removeClass("hide"); updateResultTitle(query); }); @@ -3504,10 +3536,6 @@ function showSamples() { var addedPageResources = {}; $(document).ready(function() { - // Need to initialize hero carousel before other sections for dedupe - // to work correctly. - $('[data-carousel-query]').dacCarouselQuery(); - $('.resource-widget').each(function() { initResourceWidget(this); }); @@ -3517,8 +3545,8 @@ function showSamples() { showing lines that are cut off. This works with the css ellipsis classes to fade last text line and apply an ellipsis char. */ - //card text currently uses 20px line height. - var lineHeight = 20; + //card text currently uses 15px line height. + var lineHeight = 15; $('.card-info .text').ellipsisfade(lineHeight); }); @@ -3534,10 +3562,11 @@ function showSamples() { isCarousel = $widget.hasClass('resource-carousel-layout'), isStack = $widget.hasClass('resource-stack-layout'); - // remove illegal col-x class which is not relevant anymore thanks to responsive styles. + // find size of widget by pulling out its class name + var sizeCols = 1; var m = $widget.get(0).className.match(/\bcol-(\d+)\b/); - if (m && !$widget.is('.cols > *')) { - $widget.removeClass('col-' + m[1]); + if (m) { + sizeCols = parseInt(m[1], 10); } var opts = { @@ -3547,6 +3576,7 @@ function showSamples() { sortOrder: $widget.data('sortorder'), query: $widget.data('query'), section: $widget.data('section'), + sizeCols: sizeCols, /* Added by LFL 6/6/14 */ resourceStyle: $widget.data('resourcestyle') || 'card', stackSort: $widget.data('stacksort') || 'true' @@ -3574,7 +3604,7 @@ function showSamples() { /* Initializes a Resource Carousel Widget */ function drawResourcesCarouselWidget($widget, opts, resources) { $widget.empty(); - var plusone = false; // stop showing plusone buttons on cards + var plusone = true; //always show plusone on carousel $widget.addClass('resource-card slideshow-container') .append($('<a>').addClass('slideshow-prev').text('Prev')) @@ -3612,7 +3642,7 @@ function showSamples() { function drawResourcesStackWidget($widget, opts, resources, sections) { // Don't empty widget, grab all items inside since they will be the first // items stacked, followed by the resource query - var plusone = false; // stop showing plusone buttons on cards + var plusone = true; //by default show plusone on section cards var cards = $widget.find('.resource-card').detach().toArray(); var numStacks = opts.numStacks || 1; var $stacks = []; @@ -3707,33 +3737,22 @@ function showSamples() { return $el; } - - function createResponsiveFlowColumn(cardSize) { - var cardWidth = parseInt(cardSize.match(/(\d+)/)[1], 10); - var column = $('<div>').addClass('col-' + (cardWidth / 3) + 'of6'); - if (cardWidth < 9) { - column.addClass('col-tablet-1of2'); - } else if (cardWidth > 9 && cardWidth < 18) { - column.addClass('col-tablet-1of1'); - } - if (cardWidth < 18) { - column.addClass('col-mobile-1of1') - } - return column; - } /* Initializes a flow widget, see distribute.scss for generating accompanying css */ function drawResourcesFlowWidget($widget, opts, resources) { - $widget.empty().addClass('cols'); + $widget.empty(); var cardSizes = opts.cardSizes || ['6x6']; var i = 0, j = 0; - var plusone = false; // stop showing plusone buttons on cards + var plusone = true; // by default show plusone on resource cards while (i < resources.length) { var cardSize = cardSizes[j++ % cardSizes.length]; cardSize = cardSize.replace(/^\s+|\s+$/,''); - - var column = createResponsiveFlowColumn(cardSize).appendTo($widget); + // Some card sizes do not get a plusone button, such as where space is constrained + // or for cards commonly embedded in docs (to improve overall page speed). + plusone = !((cardSize == "6x2") || (cardSize == "6x3") || + (cardSize == "9x2") || (cardSize == "9x3") || + (cardSize == "12x2") || (cardSize == "12x3")); // A stack has a third dimension which is the number of stacked items var isStack = cardSize.match(/(\d+)x(\d+)x(\d+)/); @@ -3744,7 +3763,7 @@ function showSamples() { // Create a stack container which should have the dimensions defined // by the product of the items inside. $stackDiv = $('<div>').addClass('resource-card-stack resource-card-' + isStack[1] - + 'x' + isStack[2] * isStack[3]) .appendTo(column); + + 'x' + isStack[2] * isStack[3]) .appendTo($widget); } // Build each stack item or just a single item @@ -3766,7 +3785,7 @@ function showSamples() { stackCount = 0; } - $card.appendTo($stackDiv || column); + $card.appendTo($stackDiv || $widget); } while (++i < resources.length && stackCount > 0); } @@ -3781,10 +3800,6 @@ function showSamples() { } function buildResourceList(opts) { - return $.queryResources(opts); - } - - $.queryResources = function(opts) { var maxResults = opts.maxResults || 100; var query = opts.query || ''; @@ -3833,9 +3848,8 @@ function showSamples() { // add to list of already added indices for (var j = 0; j < resources.length; j++) { - if (resources[j]) { - addedResourceIndices[resources[j].index] = 1; - } + // console.log(resources[j].title); + addedResourceIndices[resources[j].index] = 1; } // concat to final results list @@ -3877,7 +3891,7 @@ function showSamples() { function getResourceNotAlreadyAddedFilter(addedResourceIndices) { return function(resource) { - return resource && !addedResourceIndices[resource.index]; + return !addedResourceIndices[resource.index]; }; } @@ -4141,7 +4155,7 @@ function showSamples() { $this.parent().siblings().each(function () { if ($(this).is(":visible")) { - var h = $(this).outerHeight(true); + var h = $(this).height(); remainingHeight = remainingHeight - h; } }); @@ -4340,467 +4354,3 @@ function showSamples() { } } })(); - -(function($) { - 'use strict'; - - /** - * Toggle Floating Label state. - * @param {HTMLElement} el - The DOM element. - * @param options - * @constructor - */ - function FloatingLabel(el, options) { - this.el = $(el); - this.options = $.extend({}, FloatingLabel.DEFAULTS_, options); - this.group = this.el.closest('.dac-form-input-group'); - this.input = this.group.find('.dac-form-input'); - - this.checkValue_ = this.checkValue_.bind(this); - this.checkValue_(); - - this.input.on('focus', function() { - this.group.addClass('dac-focused'); - }.bind(this)); - this.input.on('blur', function() { - this.group.removeClass('dac-focused'); - this.checkValue_(); - }.bind(this)); - this.input.on('keyup', this.checkValue_); - } - - /** - * The label is moved out of the textbox when it has a value. - */ - FloatingLabel.prototype.checkValue_ = function() { - if (this.input.val().length) { - this.group.addClass('dac-has-value'); - } else { - this.group.removeClass('dac-has-value'); - } - }; - - /** - * jQuery plugin - * @param {object} options - Override default options. - */ - $.fn.dacFloatingLabel = function(options) { - return this.each(function() { - new FloatingLabel(this, options); - }); - }; - - $(document).on('ready.aranja', function() { - $('.dac-form-floatlabel').each(function() { - $(this).dacFloatingLabel($(this).data()); - }); - }); -})(jQuery); - -/* global toRoot, CAROUSEL_OVERRIDE */ -(function($) { - // Ordering matters - var TAG_MAP = [ - {from: 'developerstory', to: 'Android Developer Story'}, - {from: 'googleplay', to: 'Google Play'} - ]; - - function DacCarouselQuery(el) { - this.el = $(el); - - var opts = this.el.data(); - opts.maxResults = parseInt(opts.maxResults || '100', 10); - opts.query = opts.carouselQuery; - var resources = $.queryResources(opts); - - this.el.empty(); - $(resources).map(function() { - var resource = $.extend({}, this, CAROUSEL_OVERRIDE[this.url]); - var slide = $('<article class="dac-expand dac-hero">'); - var image = cleanUrl(resource.heroImage || resource.image); - var fullBleed = image && !resource.heroColor; - - // Configure background - slide.css({ - backgroundImage: fullBleed ? 'url(' + image + ')' : '', - backgroundColor: resource.heroColor || '' - }); - - // Should copy be inverted - slide.toggleClass('dac-invert', resource.heroInvert || fullBleed); - slide.toggleClass('dac-darken', fullBleed); - - var cols = $('<div class="cols dac-hero-content">'); - - // inline image column - var rightCol = $('<div class="col-1of2 col-push-1of2 dac-hero-figure">') - .appendTo(cols); - - if (!fullBleed && image) { - rightCol.append($('<img>').attr('src', image)); - } - - // info column - $('<div class="col-1of2 col-pull-1of2">') - .append($('<div class="dac-hero-tag">').text(formatTag(resource))) - .append($('<h1 class="dac-hero-title">').text(formatTitle(resource))) - .append($('<p class="dac-hero-description">').text(resource.summary)) - .append($('<a class="dac-hero-cta">') - .text(formatCTA(resource)) - .attr('href', cleanUrl(resource.url)) - .prepend($('<span class="dac-sprite dac-auto-chevron">')) - ) - .appendTo(cols); - - slide.append(cols.wrap('<div class="wrap">').parent()); - return slide[0]; - }).prependTo(this.el); - - // Pagination element. - this.el.append('<div class="dac-hero-carousel-pagination"><div class="wrap" data-carousel-pagination>'); - - this.el.dacCarousel(); - } - - function cleanUrl(url) { - if (url && url.indexOf('//') === -1) { - url = toRoot + url; - } - return url; - } - - function formatTag(resource) { - // Hmm, need a better more scalable solution for this. - for (var i = 0, mapping; mapping = TAG_MAP[i]; i++) { - if (resource.tags.indexOf(mapping.from) > -1) { - return mapping.to; - } - } - return resource.type; - } - - function formatTitle(resource) { - return resource.title.replace(/android developer story: /i, ''); - } - - function formatCTA(resource) { - return resource.type === 'youtube' ? 'Watch the video' : 'Learn more'; - } - - // jQuery plugin - $.fn.dacCarouselQuery = function() { - return this.each(function() { - var el = $(this); - var data = el.data('dac.carouselQuery'); - - if (!data) { el.data('dac.carouselQuery', (data = new DacCarouselQuery(el))); } - }); - }; - - // Data API - $(function() { - $('[data-carousel-query]').dacCarouselQuery(); - }); -})(jQuery); - -(function($) { - /** - * A CSS based carousel, inspired by SequenceJS. - * @param {jQuery} el - * @param {object} options - * @constructor - */ - function DacCarousel(el, options) { - this.el = $(el); - this.options = options = $.extend({}, DacCarousel.OPTIONS, this.el.data(), options || {}); - this.frames = this.el.find(options.frameSelector); - this.count = this.frames.size(); - this.current = options.start; - - this.initPagination(); - this.initEvents(); - this.initFrame(); - } - - DacCarousel.OPTIONS = { - auto: true, - autoTime: 10000, - autoMinTime: 5000, - btnPrev: '[data-carousel-prev]', - btnNext: '[data-carousel-next]', - frameSelector: 'article', - loop: true, - start: 0, - pagination: '[data-carousel-pagination]' - }; - - DacCarousel.prototype.initPagination = function() { - this.pagination = $([]); - if (!this.options.pagination) { return; } - - var pagination = $('<ul class="dac-pagination">'); - var parent = this.el; - if (typeof this.options.pagination === 'string') { parent = this.el.find(this.options.pagination); } - - if (this.count > 1) { - for (var i = 0; i < this.count; i++) { - var li = $('<li class="dac-pagination-item">').text(i); - if (i === this.options.start) { li.addClass('active'); } - li.click(this.go.bind(this, i)); - - pagination.append(li); - } - this.pagination = pagination.children(); - parent.append(pagination); - } - }; - - DacCarousel.prototype.initEvents = function() { - var that = this; - - this.el.hover(function() { - that.pauseRotateTimer(); - }, function() { - that.startRotateTimer(); - }); - - $(this.options.btnPrev).click(function(e) { - e.preventDefault(); - that.prev(); - }); - - $(this.options.btnNext).click(function(e) { - e.preventDefault(); - that.next(); - }); - }; - - DacCarousel.prototype.initFrame = function() { - this.frames.removeClass('active').eq(this.options.start).addClass('active'); - }; - - DacCarousel.prototype.startRotateTimer = function() { - if (!this.options.auto || this.rotateTimer) { return; } - this.rotateTimer = setTimeout(this.next.bind(this), this.options.autoTime); - }; - - DacCarousel.prototype.pauseRotateTimer = function() { - clearTimeout(this.rotateTimer); - this.rotateTimer = null; - }; - - DacCarousel.prototype.prev = function() { - this.go(this.current - 1); - }; - - DacCarousel.prototype.next = function() { - this.go(this.current + 1); - }; - - DacCarousel.prototype.go = function(next) { - // Figure out what the next slide is. - while (this.count > 0 && next >= this.count) { next -= this.count; } - while (next < 0) { next += this.count; } - - // Cancel if we're already on that slide. - if (next === this.current) { return; } - - // Prepare next slide. - this.frames.eq(next).removeClass('out'); - - // Recalculate styles before starting slide transition. - var that = this; - resolveStyles(this.el[0], function() { - // Update pagination - that.pagination.removeClass('active').eq(next).addClass('active'); - - // Transition out current frame - that.frames.eq(that.current).toggleClass('active out'); - - // Transition in a new frame - that.frames.eq(next).toggleClass('active'); - - that.current = next; - }); - }; - - // Helper - function resolveStyles(el, callback) { - /*jshint expr:true*/ - el.offsetTop; - callback(); - } - - // jQuery plugin - $.fn.dacCarousel = function() { - this.each(function() { - var $el = $(this); - $el.data('dac-carousel', new DacCarousel(this)); - }); - return this; - }; - - // Data API - $(function() { - $('[data-carousel]').dacCarousel(); - }); -})(jQuery); - -(function($) { - 'use strict'; - - /** - * Toggle the visabilty of the mobile navigation. - * @param {HTMLElement} el - The DOM element. - * @param options - * @constructor - */ - function ToggleModal(el, options) { - this.el = $(el); - this.options = $.extend({}, ToggleModal.DEFAULTS_, options); - this.el.on('click', this.clickHandler_.bind(this)); - } - - ToggleModal.DEFAULTS_ = { - toggleClass: 'dac-modal-open' - }; - - /** - * The actual toggle logic. - * @param event - * @private - */ - ToggleModal.prototype.clickHandler_ = function(event) { - event.preventDefault(); - //TODO: Toggle a class on the modal itself - $('body').toggleClass(this.options.toggleClass); - $('.dac-modal-dimmer').toggleClass('dac-active'); - $('.dac-modal-window').toggleClass('dac-active'); - }; - - /** - * jQuery plugin - * @param {object} options - Override default options. - */ - $.fn.dacToggleModal = function(options) { - return this.each(function() { - new ToggleModal(this, options); - }); - }; - - /** - * Data Attribute API - */ - $(document).on('ready.aranja', function() { - $('[data-modal-toogle]').each(function() { - $(this).dacToggleModal($(this).data()); - }); - }); -})(jQuery); - -(function($) { - 'use strict'; - - /** - * Toggle the visabilty of the mobile navigation. - * @param {HTMLElement} el - The DOM element. - * @param options - * @constructor - */ - function ToggleNav(el, options) { - this.el = $(el); - this.options = $.extend({}, ToggleNav.DEFAULTS_, options); - this.options.target = [this.options.navigation]; - - if (this.options.body) {this.options.target.push('body')} - if (this.options.dimmer) {this.options.target.push(this.options.dimmer)} - - this.el.on('click', this.clickHandler_.bind(this)); - } - - /** - * ToggleNav Default Settings - * @type {{body: boolean, dimmer: string, navigation: string, toggleClass: string}} - * @private - */ - ToggleNav.DEFAULTS_ = { - body: true, - dimmer: '.dac-nav-dimmer', - navigation: '[data-dac-nav]', - toggleClass: 'dac-nav-open' - }; - - /** - * The actual toggle logic. - * @param event - * @private - */ - ToggleNav.prototype.clickHandler_ = function(event) { - event.preventDefault(); - $(this.options.target.join(', ')).toggleClass(this.options.toggleClass); - }; - - /** - * jQuery plugin - * @param {object} options - Override default options. - */ - $.fn.dacToggleMobileNav = function(options) { - return this.each(function() { - new ToggleNav(this, options); - }); - }; - - /** - * Data Attribute API - */ - $(window).on('load.aranja', function() { - $('[data-dac-toggle-nav]').each(function() { - $(this).dacToggleMobileNav($(this).data()); - }); - }); -})(jQuery); - -(function($) { - 'use strict'; - - /** - * Submit the newsletter form to a Google Form. - * @param {HTMLElement} el - The Form DOM element. - * @constructor - */ - function NewsletterForm(el) { - this.el = $(el); - this.url = this.el.attr('action'); - this.el.on('submit', this.submitHandler_.bind(this)); - } - - /** - * Close the modal when the form is sent. - * @private - */ - NewsletterForm.prototype.submitHandler_ = function() { - //TODO: Close the modal with an event and let modal.js handle this - $('body').removeClass('dac-modal-open'); - $('.dac-modal-dimmer').removeClass('dac-active'); - $('.dac-modal-window').removeClass('dac-active'); - }; - - /** - * jQuery plugin - * @param {object} options - Override default options. - */ - $.fn.dacNewsletterForm = function(options) { - return this.each(function() { - new NewsletterForm(this, options); - }); - }; - - /** - * Data Attribute API - */ - $(document).on('ready.aranja', function() { - $('[data-newsletter-form]').each(function() { - $(this).dacNewsletterForm(); - }); - }); -})(jQuery); diff --git a/tools/droiddoc/templates-sdk-dev/class.cs b/tools/droiddoc/templates-sdk-dev/class.cs index 7aa99f968..693eaedc9 100644 --- a/tools/droiddoc/templates-sdk-dev/class.cs +++ b/tools/droiddoc/templates-sdk-dev/class.cs @@ -169,13 +169,15 @@ Summary: <div class="jd-descr"> <?cs call:deprecated_warning(class) ?> -<?cs if:subcount(class.descr) ?> +<?cs if:subcount(class.descr) || subcount(class.annotationdocumentation) ?> <h2>Class Overview</h2> -<p itemprop="articleBody"><?cs call:tag_list(class.descr) ?></p> +<?cs if:subcount(class.descr) ?><p itemprop="articleBody"><?cs call:tag_list(class.descr) ?></p><?cs /if ?> +<?cs if:subcount(class.annotationdocumentation) ?><?cs each:annodoc = class.annotationdocumentation?> +<p><?cs var:annodoc.text ?></p> +<?cs /each?><?cs /if?> <?cs /if ?> <?cs call:see_also_tags(class.seeAlso) ?> - </div><!-- jd-descr --> @@ -196,12 +198,12 @@ Summary: </td> <td class="jd-linkcol" width="100%"><nobr> <span class="sympad"><?cs call:cond_link(method.name, toroot, method.href, included) ?></span>(<?cs call:parameter_list(method.params) ?>)</nobr> - <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) ?> - <div class="jd-descrdiv"> - <?cs call:short_descr(method) ?> - <?cs call:show_annotations_list(method) ?> - </div> - <?cs /if ?> + <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) || subcount(method.showAnnotations) ?> + <div class="jd-descrdiv"> + <?cs if:subcount(method.shortDescr) || subcount(method.annotationdocumentation) ?><?cs call:short_descr(method)?><?cs /if?> + <?cs call:show_annotations_list(method) ?> + </div> + <?cs /if ?> </td></tr> <?cs set:count = count + #1 ?> <?cs /each ?> diff --git a/tools/droiddoc/templates-sdk-dev/components/masthead.cs b/tools/droiddoc/templates-sdk-dev/components/masthead.cs index a02774944..d48ea2974 100644 --- a/tools/droiddoc/templates-sdk-dev/components/masthead.cs +++ b/tools/droiddoc/templates-sdk-dev/components/masthead.cs @@ -4,7 +4,7 @@ <?cs else ?> <a name="top"></a> -<!-- dialog to prompt lang pref change when loaded from hardcoded URL +<!-- dialog to prompt lang pref change when loaded from hardcoded URL <div id="langMessage" style="display:none"> <div> <div class="lang en"> @@ -52,170 +52,260 @@ <?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?> <!-- Header --> <div id="header-wrapper"> - <div class="dac-header" id="header"><?cs call:butter_bar() ?> - <div class="dac-header-inner"> - <a class="dac-nav-toggle" data-dac-toggle-nav href="javascript:;" title="Open navigation"> - <span class="dac-nav-hamburger"> - <span class="dac-nav-hamburger-top"></span> - <span class="dac-nav-hamburger-mid"></span> - <span class="dac-nav-hamburger-bot"></span> - </span> - </a> - <a class="dac-header-logo" href="<?cs var:toroot ?>index.html"> - <img class="dac-header-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png" - srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x" - width="32" height="36" alt="Android" /> Developers - </a> - - <ul class="dac-header-crumbs"> - <?cs # More <li> elements added here with javascript ?> - <?cs if:!section.landing ?><li class="dac-header-crumbs-item"><span class="dac-header-crumbs-link current"><?cs var:page.title ?></a></li><?cs - /if ?> + <div id="header"><?cs call:butter_bar() ?> + <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" + 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> + <a href="#" class="arrow-active">Quicknav</a> + </div> + </div> + <ul class="nav-x col-9"> + <li class="design"> + <a href="<?cs var:toroot ?>design/index.html" + zh-tw-lang="設計" + zh-cn-lang="设计" + ru-lang="Проектирование" + ko-lang="디자인" + ja-lang="設計" + es-lang="Diseñar" + >Design</a></li> + <li class="develop"><a href="<?cs var:toroot ?>develop/index.html" + zh-tw-lang="開發" + zh-cn-lang="开发" + ru-lang="Разработка" + ko-lang="개발" + ja-lang="開発" + es-lang="Desarrollar" + >Develop</a></li> + <li class="distribute last"><a href="<?cs var:toroot ?>distribute/<?cs + if:android.whichdoc == "offline" ?>googleplay/<?cs /if ?>index.html" + zh-tw-lang="發佈" + zh-cn-lang="分发" + ru-lang="Распространение" + ko-lang="배포" + ja-lang="配布" + es-lang="Distribuir" + >Distribute</a></li> </ul> + <?cs # ADD SEARCH AND MENU ?> <?cs call:header_search_widget() ?> - <a class="dac-header-consoleBtn" href="https://play.google.com/apps/publish/"> - <span class="dac-sprite dac-google-play"></span> - <span class="dac-visible-desktop-inline">Developer</span> - Console - </a> + + <!-- Expanded quicknav --> + <div id="quicknav" class="col-13"> + <ul> + <li class="about"> + <ul> + <li><a href="<?cs var:toroot ?>about/index.html">About</a></li> + <li><a href="<?cs var:toroot ?>wear/index.html">Wear</a></li> + <li><a href="<?cs var:toroot ?>tv/index.html">TV</a></li> + <li><a href="<?cs var:toroot ?>auto/index.html">Auto</a></li> + </ul> + </li> + <li class="design"> + <ul> + <li><a href="<?cs var:toroot ?>design/index.html">Get Started</a></li> + <li><a href="<?cs var:toroot ?>design/devices.html">Devices</a></li> + <li><a href="<?cs var:toroot ?>design/style/index.html">Style</a></li> + <li><a href="<?cs var:toroot ?>design/patterns/index.html">Patterns</a></li> + <li><a href="<?cs var:toroot ?>design/building-blocks/index.html">Building Blocks</a></li> + <li><a href="<?cs var:toroot ?>design/downloads/index.html">Downloads</a></li> + <li><a href="<?cs var:toroot ?>design/videos/index.html">Videos</a></li> + </ul> + </li> + <li class="develop"> + <ul> + <li><a href="<?cs var:toroot ?>training/index.html" + zh-tw-lang="訓練課程" + zh-cn-lang="培训" + ru-lang="Курсы" + ko-lang="교육" + ja-lang="トレーニング" + es-lang="Capacitación" + >Training</a></li> + <li><a href="<?cs var:toroot ?>guide/index.html" + zh-tw-lang="API 指南" + zh-cn-lang="API 指南" + ru-lang="Руководства по API" + ko-lang="API 가이드" + ja-lang="API ガイド" + es-lang="Guías de la API" + >API Guides</a></li> + <li><a href="<?cs var:toroot ?>reference/packages.html" + zh-tw-lang="參考資源" + zh-cn-lang="参考" + ru-lang="Справочник" + ko-lang="참조문서" + ja-lang="リファレンス" + es-lang="Referencia" + >Reference</a></li> + <li><a href="<?cs var:toroot ?>sdk/index.html" + zh-tw-lang="相關工具" + zh-cn-lang="工具" + ru-lang="Инструменты" + ko-lang="도구" + ja-lang="ツール" + es-lang="Herramientas" + >Tools</a> + </li> + <li><a href="<?cs var:toroot ?>google/index.html">Google Services</a> + </li> + <?cs if:android.hasSamples ?> + <li><a href="<?cs var:toroot ?>samples/index.html">Samples</a> + </li> + <?cs /if ?> + </ul> + </li> + <li class="distribute last"> + <ul> + <li><a href="<?cs var:toroot ?>distribute/googleplay/index.html">Google Play</a></li> + <li><a href="<?cs var:toroot ?>distribute/essentials/index.html">Essentials</a></li> + <li><a href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li> + <li><a href="<?cs var:toroot ?>distribute/engage/index.html">Engage & Retain</a></li> + <li><a href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a></li> + <li><a href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a></li> + <li><a href="<?cs var:toroot ?>distribute/tools/index.html">Tools & Reference</a></li> + <li><a href="<?cs var:toroot ?>distribute/stories/index.html">Developer Stories</a></li> + </ul> + </li> + </ul> + </div><!-- /Expanded quicknav --> </div><!-- end header-wrap.wrap --> </div><!-- end header --> + <?cs if:about || wear || tv || auto ?> + <!-- Secondary x-nav --> + <div id="nav-x"> + <div class="wrap"> + <ul class="nav-x col-9 about" style="width:100%"> + <li class="about"><a href="<?cs var:toroot ?>about/index.html" + >About</a></li> + <li class="wear"><a href="<?cs var:toroot ?>wear/index.html" + >Wear</a></li> + <li class="tv"><a href="<?cs var:toroot ?>tv/index.html" + >TV</a></li> + <li class="auto"><a href="<?cs var:toroot ?>auto/index.html" + >Auto</a></li> + </ul> + </div> + </div> + <!-- /Sendondary x-nav ABOUT --> + + + + <?cs elif:training || guide || reference || tools || develop || google || samples ?> + <!-- Secondary x-nav --> + <div id="nav-x"> + <div class="wrap" style="position:relative;z-index:1"> + + <?cs if:reference ?> + + <?cs /if ?> + + <ul class="nav-x col-9 develop" style="width:100%"> + <li class="training"><a href="<?cs var:toroot ?>training/index.html" + zh-tw-lang="訓練課程" + zh-cn-lang="培训" + ru-lang="Курсы" + ko-lang="교육" + ja-lang="トレーニング" + es-lang="Capacitación" + >Training</a></li> + <li class="guide"><a href="<?cs var:toroot ?>guide/index.html" + zh-tw-lang="API 指南" + zh-cn-lang="API 指南" + ru-lang="Руководства по API" + ko-lang="API 가이드" + ja-lang="API ガイド" + es-lang="Guías de la API" + >API Guides</a></li> + <li class="reference"><a href="<?cs var:toroot ?>reference/packages.html" + zh-tw-lang="參考資源" + zh-cn-lang="参考" + ru-lang="Справочник" + ko-lang="참조문서" + ja-lang="リファレンス" + es-lang="Referencia" + >Reference</a></li> + <li class="tools"><a href="<?cs var:toroot ?>sdk/index.html" + zh-tw-lang="相關工具" + zh-cn-lang="工具" + ru-lang="Инструменты" + ko-lang="도구" + ja-lang="ツール" + es-lang="Herramientas" + >Tools</a></li> + <li class="google"><a href="<?cs var:toroot ?>google/index.html" + >Google Services</a> + </li> + <?cs if:android.hasSamples ?> + <li class="samples"><a href="<?cs var:toroot ?>samples/index.html" + >Samples</a> + </li> + <?cs /if ?> + </ul> + </div> + </div> + <!-- /Sendondary x-nav DEVELOP --> + + <?cs elif:distribute || googleplay || essentials || users || engage || monetize || analyze || disttools || stories ?> + <!-- Secondary distribute x-nav --> + <div id="nav-x"> + <div class="wrap"> + <ul class="nav-x distribute"> + <li class="googleplay"><a href="<?cs var:toroot ?>distribute/googleplay/index.html" + >Google Play</a></li> + <li class="essentials"><a href="<?cs var:toroot ?>distribute/essentials/index.html" + >Essentials</a></li> + <li class="users"><a href="<?cs var:toroot ?>distribute/users/index.html" + >Get Users</a></li> + <li class="engage"><a href="<?cs var:toroot ?>distribute/engage/index.html" + >Engage & Retain</a></li> + <li class="monetize"><a href="<?cs var:toroot ?>distribute/monetize/index.html" + >Monetize</a> + </li> + <li class="analyze"><a href="<?cs var:toroot ?>distribute/analyze/index.html" + >Analyze</a> + </li> + <li class="disttools"><a href="<?cs var:toroot ?>distribute/tools/index.html" + >Tools</a> + </li> + <li class="stories"><a href="<?cs var:toroot ?>distribute/stories/index.html" + >Stories</a> + </li> + </ul> + <a href="https://play.google.com/apps/publish/" class="developer-console-btn">Developer Console</a> + </div> <!-- /Secondary distribute x-nav --> + </div> + <!-- /Sendondary x-nav DISTRIBUTE --> + <?cs /if ?> + <div id="searchResults" class="wrap" style="display:none;"> <h2 id="searchTitle">Results</h2> <div id="leftSearchControl" class="search-control">Loading...</div> </div> </div> <!--end header-wrapper --> - <!-- Navigation--> - <nav class="dac-nav"> - <div class="dac-nav-dimmer" data-dac-toggle-nav></div> + <div id="sticky-header"> + <div> + <a class="logo" href="#top"></a> + <a class="top" href="#top"></a> + <ul class="breadcrumb"> + <?cs # More <li> elements added here with javascript ?> + <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs + /if ?> + </ul> + </div> + </div> - <ul class="dac-nav-list" data-dac-nav> - <li class="dac-nav-item dac-nav-head"> - <a class="dac-nav-link dac-nav-logo" data-dac-toggle-nav href="javascript:;" title="Close navigation"> - <img class="dac-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png" - srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x" - width="32" height="36" alt="Android" /> Developers - </a> - </li> - <li class="dac-nav-item home"> - <a class="dac-nav-link dac-visible-mobile-block" href="<?cs var:toroot ?>index.html">Home</a> - <ul class="dac-nav-secondary about"> - <li class="dac-nav-item about"> - <a class="dac-nav-link" href="<?cs var:toroot ?>about/index.html">About</a> - </li> - <li class="dac-nav-item wear"> - <a class="dac-nav-link" href="<?cs var:toroot ?>wear/index.html">Wear</a> - </li> - <li class="dac-nav-item tv"> - <a class="dac-nav-link" href="<?cs var:toroot ?>tv/index.html">TV</a> - </li> - <li class="dac-nav-item auto"> - <a class="dac-nav-link" href="<?cs var:toroot ?>auto/index.html">Auto</a> - </li> - </ul> - </li> - <li class="dac-nav-item design"> - <a class="dac-nav-link" href="<?cs var:toroot ?>design/index.html" - zh-tw-lang="設計" - zh-cn-lang="设计" - ru-lang="Проектирование" - ko-lang="디자인" - ja-lang="設計" - es-lang="Diseñar">Design</a> - </li> - <li class="dac-nav-item develop"> - <a class="dac-nav-link" href="<?cs var:toroot ?>develop/index.html" - zh-tw-lang="開發" - zh-cn-lang="开发" - ru-lang="Разработка" - ko-lang="개발" - ja-lang="開発" - es-lang="Desarrollar">Develop</a> - <ul class="dac-nav-secondary develop"> - <li class="dac-nav-item training"> - <a class="dac-nav-link" href="<?cs var:toroot ?>training/index.html" - zh-tw-lang="訓練課程" - zh-cn-lang="培训" - ru-lang="Курсы" - ko-lang="교육" - ja-lang="トレーニング" - es-lang="Capacitación">Training</a> - </li> - <li class="dac-nav-item guide"> - <a class="dac-nav-link" href="<?cs var:toroot ?>guide/index.html" - zh-tw-lang="API 指南" - zh-cn-lang="API 指南" - ru-lang="Руководства по API" - ko-lang="API 가이드" - ja-lang="API ガイド" - es-lang="Guías de la API">API Guides</a> - </li> - <li class="dac-nav-item reference"> - <a class="dac-nav-link" href="<?cs var:toroot ?>reference/packages.html" - zh-tw-lang="參考資源" - zh-cn-lang="参考" - ru-lang="Справочник" - ko-lang="참조문서" - ja-lang="リファレンス" - es-lang="Referencia">Reference</a> - </li> - <li class="dac-nav-item tools"> - <a class="dac-nav-link" href="<?cs var:toroot ?>sdk/index.html" - zh-tw-lang="相關工具" - zh-cn-lang="工具" - ru-lang="Инструменты" - ko-lang="도구" - ja-lang="ツール" - es-lang="Herramientas">Tools</a></li> - <li class="dac-nav-item google"> - <a class="dac-nav-link" href="<?cs var:toroot ?>google/index.html">Google Services</a> - </li> - <?cs if:android.hasSamples ?> - <li class="dac-nav-item samples"> - <a class="dac-nav-link" href="<?cs var:toroot ?>samples/index.html">Samples</a> - </li> - <?cs /if ?> - </ul> - </li> - <li class="dac-nav-item distribute"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/<?cs if:android.whichdoc == 'offline' ?>googleplay/<?cs /if ?>index.html" - zh-tw-lang="發佈" - zh-cn-lang="分发" - ru-lang="Распространение" - ko-lang="배포" - ja-lang="配布" - es-lang="Distribuir">Distribute</a> - <ul class="dac-nav-secondary distribute"> - <li class="dac-nav-item googleplay"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/googleplay/index.html">Google Play</a></li> - <li class="dac-nav-item essentials"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/essentials/index.html">Essentials</a></li> - <li class="dac-nav-item users"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li> - <li class="dac-nav-item engage"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/engage/index.html">Engage & Retain</a></li> - <li class="dac-nav-item monetize"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a> - </li> - <li class="dac-nav-item analyze"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a> - </li> - <li class="dac-nav-item disttools"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/tools/index.html">Tools</a> - </li> - <li class="dac-nav-item stories"> - <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/stories/index.html">Stories</a> - </li> - </ul> - </li> - </ul> - </nav> - <!-- end navigation--> <?cs /if ?><?cs # end if/else !devsite ?> <?cs /if ?><?cs # end if/else preview ?><?cs /def ?> @@ -235,7 +325,7 @@ </a> </div> <div class="col-8" style="margin:0"><h1 style="margin: 4px 0 0 0px;padding:0;line-height:16px; -color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div> +color:#666;font-weight:100;font-size:27px;">M Developer Preview</h1></div> <?cs # ADD SEARCH AND MENU ?> <?cs call:header_search_widget() ?> @@ -250,6 +340,18 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div> </div> </div> <!--end header-wrapper --> +<div id="sticky-header"> + <div> + <a class="logo" href="#top"></a> + <a class="top" href="#top"></a> + <ul class="breadcrumb"> + <?cs # More <li> elements added here with javascript ?> + <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs + /if ?> + </ul> + </div> +</div> + <?cs /def ?> @@ -263,11 +365,11 @@ color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div> <div id="butterbar-wrapper"> <div id="butterbar"> <a href="http://googleblog.blogspot.com/" id="butterbar-message"> - The Android 5.0 SDK will be available on October 17th! + The Android {version_number} SDK will be available on {Month} {Day}! </a> </div> </div> -?> +?> <?cs /def ?> diff --git a/tools/droiddoc/templates-sdk-dev/customizations.cs b/tools/droiddoc/templates-sdk-dev/customizations.cs index 15dc3af72..c8c88cc46 100644 --- a/tools/droiddoc/templates-sdk-dev/customizations.cs +++ b/tools/droiddoc/templates-sdk-dev/customizations.cs @@ -1,11 +1,10 @@ <?cs def:fullpage() ?> <div id="body-content"> - <div> <?cs /def ?> <?cs def:sdk_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -19,11 +18,10 @@ def:sdk_nav() ?> def:no_nav() ?> <div class="wrap clearfix" id="body-content"> - <div> <?cs /def ?><?cs def:tools_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs @@ -40,7 +38,7 @@ def:tools_nav() ?> <?cs /def ?> <?cs def:training_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -59,7 +57,7 @@ def:training_nav() ?> <?cs /def ?><?cs def:googleplay_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?> @@ -73,7 +71,7 @@ def:googleplay_nav() ?> <?cs /def ?><?cs def:essentials_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?> @@ -87,7 +85,7 @@ def:essentials_nav() ?> <?cs /def ?><?cs def:users_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?> @@ -101,7 +99,7 @@ def:users_nav() ?> <?cs /def ?><?cs def:engage_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?> @@ -115,7 +113,7 @@ def:engage_nav() ?> <?cs /def ?><?cs def:analyze_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?> @@ -129,7 +127,7 @@ def:analyze_nav() ?> <?cs /def ?><?cs def:monetize_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?> @@ -143,7 +141,7 @@ def:monetize_nav() ?> <?cs /def ?><?cs def:disttools_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?> @@ -157,7 +155,7 @@ def:disttools_nav() ?> <?cs /def ?><?cs def:stories_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?> @@ -171,7 +169,7 @@ def:stories_nav() ?> <?cs /def ?><?cs def:guide_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -189,7 +187,7 @@ def:guide_nav() ?> <?cs /def ?> <?cs def:design_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -208,7 +206,7 @@ def:design_nav() ?> <?cs /def ?> <?cs def:distribute_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -227,7 +225,7 @@ def:distribute_nav() ?> <?cs def:samples_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -246,7 +244,7 @@ def:samples_nav() ?> <?cs def:google_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -269,7 +267,7 @@ def:google_nav() ?> <?cs def:about_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -289,7 +287,7 @@ def:about_nav() ?> <?cs def:wear_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -308,7 +306,7 @@ def:wear_nav() ?> <?cs def:preview_nav() ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs @@ -327,7 +325,7 @@ def:default_left_nav() ?> <?cs if:reference.gcm || reference.gms ?> <?cs call:google_nav() ?> <?cs else ?> - <div class="wrap clearfix" id="body-content"><div class="cols"> + <div class="wrap clearfix" id="body-content"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav"> <div id="api-nav-header"> @@ -435,25 +433,78 @@ def:default_left_nav() ?> <?cs def:header_search_widget() ?> - <div class="dac-header-search" id="search-container"> - <div class="dac-header-search-inner"> - <div class="dac-header-search-btn" id="search-btn"></div> - <form class="dac-header-search-form" onsubmit="return submit_search()"> +<div class="menu-container"> + <div class="moremenu"> + <div id="more-btn"></div> + </div> + <div class="morehover" id="moremenu"> + <div class="top"></div> + <div class="mid"> + <div class="header">Links</div> + <ul> + <li><a href="https://play.google.com/apps/publish/" target="_googleplay">Google Play Developer Console</a></li> + <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li> + <li><a href="<?cs var:toroot ?>about/index.html">About Android</a></li> + </ul> + <div class="header">Android Sites</div> + <ul> + <li><a href="http://www.android.com">Android.com</a></li> + <li class="active"><a>Android Developers</a></li> + <li><a href="http://source.android.com">Android Open Source Project</a></li> + </ul> + + <?cs # Include language switcher only in online docs ?> + <?cs if:android.whichdoc == "online" ?> + <div class="header">Language</div> + <div id="language" class="locales"> + <select name="language" onChange="changeLangPref(this.value, true)"> + <option value="en">English</option> + <option value="es">Español</option> + <option value="ja">日本語</option> + <option value="ko">한국어</option> + <option value="ru">Русский</option> + <option value="zh-cn">中文(简体)</option> + <option value="zh-tw">中文(繁體)</option> + </select> + </div> + <script type="text/javascript"> + <!-- + loadLangPref(); + //--> + </script> + <?cs /if ?> + <?cs # End of lang switcher ?> + <br class="clearfix" /> + </div><!-- end 'mid' --> + <div class="bottom"></div> + </div><!-- end 'moremenu' --> + + <div class="search" id="search-container"> + <div class="search-inner"> + <div id="search-btn"></div> + <div class="left"></div> + <form onsubmit="return submit_search()"> <input id="search_autocomplete" type="text" value="" autocomplete="off" name="q" onfocus="search_focus_changed(this, true)" onblur="search_focus_changed(this, false)" onkeydown="return search_changed(event, true, '<?cs var:toroot ?>')" - onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" - class="dac-header-search-input" placeholder="Search" /> - <a class="dac-header-search-close hide" id="search-close">close</a> + onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> </form> - </div><!-- end dac-header-search-inner --> - </div><!-- end dac-header-search --> - - <div class="search_filtered_wrapper"> + <div class="right"></div> + <a class="close hide">close</a> + <div class="left"></div> + <div class="right"></div> + </div><!-- end search-inner --> + </div><!-- end search-container --> + + <div class="search_filtered_wrapper reference"> <div class="suggest-card reference no-display"> <ul class="search_filtered"> </ul> </div> + </div> + + <div class="search_filtered_wrapper docs"> + <div class="suggest-card dummy no-display"> </div> <div class="suggest-card develop no-display"> <ul class="search_filtered"> </ul> @@ -473,6 +524,7 @@ def:header_search_widget() ?> </ul> </div> </div> +</div><!-- end menu-container (search and menu widget) --> <?cs /def ?> @@ -545,12 +597,11 @@ def:custom_copyright() ?> <?cs def:custom_footerlinks() ?> - <a href="<?cs var:toroot ?>about/index.html">About Android</a> - <a href="<?cs var:toroot ?>auto/index.html">Auto</a> - <a href="<?cs var:toroot ?>tv/index.html">TV</a> - <a href="<?cs var:toroot ?>wear/index.html">Wear</a> - <a href="<?cs var:toroot ?>legal.html">Legal</a> - <?cs + <p> + <a href="<?cs var:toroot ?>about/index.html">About Android</a> | + <a href="<?cs var:toroot ?>legal.html">Legal</a> | + <a href="<?cs var:toroot ?>support.html">Support</a> + </p><?cs /def ?> <?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs diff --git a/tools/droiddoc/templates-sdk-dev/designpage.cs b/tools/droiddoc/templates-sdk-dev/designpage.cs index b945a1ce7..2be179d4f 100644 --- a/tools/droiddoc/templates-sdk-dev/designpage.cs +++ b/tools/droiddoc/templates-sdk-dev/designpage.cs @@ -37,12 +37,14 @@ <?cs if:header.hide ?> <?cs else ?> -<div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> +<div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> + <div class="layout-content-col span-9"> <?cs if:header.justLinks ?> <?cs elif:header.title ?><h2><?cs var:header.title ?></h2> <?cs else ?><h2><?cs var:page.title ?></h2> <?cs /if ?> - <div class="paging-links" itemscope itemtype="http://schema.org/SiteNavigationElement"> + </div> + <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="prev-page-link">Previous</a> <a href="#" class="next-page-link">Next</a> </div> @@ -53,9 +55,9 @@ <?cs if:footer.hide ?> <?cs else ?> -<div class="cols content-footer" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="paging-links col-9"> </div> - <div class="paging-links col-4"> +<div class="layout-content-row content-footer" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="paging-links layout-content-col span-9"> </div> + <div class="paging-links layout-content-col span-4"> <a href="#" class="prev-page-link">Previous</a> <a href="#" class="next-page-link">Next</a> </div> diff --git a/tools/droiddoc/templates-sdk-dev/docpage.cs b/tools/droiddoc/templates-sdk-dev/docpage.cs index fe8836b8e..83b119935 100644 --- a/tools/droiddoc/templates-sdk-dev/docpage.cs +++ b/tools/droiddoc/templates-sdk-dev/docpage.cs @@ -6,7 +6,7 @@ <?cs if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs - if:(guide||develop||training||reference||tools||google||sdk||samples) ?>develop<?cs + if:(guide||develop||training||reference||tools||sdk||samples) ?>develop<?cs if:guide ?> guide<?cs /if ?><?cs if:samples ?> samples<?cs /if ?><?cs elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories) @@ -28,7 +28,7 @@ include:"header.cs" ?> <div <?cs if:fullpage ?>class="fullpage"<?cs - elif:(design||tools||about||sdk||googleplay||essentials||users||engage||monetize||disttools||stories) && !nonavpage + elif:(design||tools||about||sdk||googleplay||essentials||users||monetize||disttools) && !nonavpage ?>class="col-13" id="doc-col"<?cs elif:!nonavpage ?>class="col-12" id="doc-col"<?cs /if ?> > @@ -36,12 +36,14 @@ include:"header.cs" ?> <?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs # header logic for docs that provide previous/next buttons ?> <?cs if:header.hide ?> <?cs else ?> - <div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> + <div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> + <div class="layout-content-col <?cs if:training ?>span-7<?cs else ?>span-9<?cs /if ?>"> <?cs if:header.justLinks ?> <?cs else ?><h1 itemprop="name"><?cs var:page.title ?></h1> <?cs /if ?> + </div> <?cs if:training ?> - <div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="training-nav-top layout-content-col span-5" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" zh-cn-lang="上一课" @@ -68,7 +70,7 @@ include:"header.cs" ?> >Get started</a> </div> <?cs elif:!page.trainingcourse ?> - <div class="paging-links" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" zh-cn-lang="上一课" @@ -114,18 +116,16 @@ include:"header.cs" ?> <?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?> <div class="landing-banner"> <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?> - <div class="cols"> - <div class="col-6"> - <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" /> - </div> - <div class="col-6"> + <div class="col-6"> + <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" /> + </div> + <div class="col-6"> <?cs /if ?> <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1> <p itemprop="description"><?cs var:page.landing.intro ?></p> <p><a class="next-page-link topic-start-link"></a></p> <?cs if:page.landing.image ?> - </div> </div> <?cs /if ?> </div> @@ -153,11 +153,13 @@ include:"header.cs" ?> <?cs call:tag_list(root.descr) ?> </div> - <?cs if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <div class="content-footer <?cs - if:fullpage ?>wrap<?cs /if ?>" + if:fullpage ?>wrap<?cs + else ?>layout-content-row<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="paging-links"> + <?cs if:!fullscreen ?> + <div class="paging-links layout-content-col col-10"> + <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <a href="#" class="next-page-link hide" zh-tw-lang="下一堂課" zh-cn-lang="下一课" @@ -175,9 +177,15 @@ include:"header.cs" ?> es-lang="Empezar" >Get started</a> <a href="#" class="next-class-link hide">Next class</a> - </div> + <?cs /if ?> + </div> + <div class="layout-content-col plus-container col-2" > + <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?> + <div class="g-plusone" data-size="medium"></div> + <?cs /if ?> + </div> + <?cs /if ?> </div> - <?cs /if ?> </div> <!-- end jd-content --> @@ -186,9 +194,9 @@ include:"header.cs" ?> <?cs include:"trailer.cs" ?> <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script> - <script src="<?cs var:toroot ?>jd_lists_unified.js?v=8" type="text/javascript"></script> - <script src="<?cs var:toroot ?>jd_extras.js?v=10" type="text/javascript"></script> - <script src="<?cs var:toroot ?>jd_collections.js?v=10" type="text/javascript"></script> + <script src="<?cs var:toroot ?>jd_lists_unified.js?v=9" type="text/javascript"></script> + <script src="<?cs var:toroot ?>jd_extras.js?v=11" type="text/javascript"></script> + <script src="<?cs var:toroot ?>jd_collections.js?v=12" type="text/javascript"></script> <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script> </body> diff --git a/tools/droiddoc/templates-sdk-dev/footer.cs b/tools/droiddoc/templates-sdk-dev/footer.cs index 230930685..b609d3b8c 100644 --- a/tools/droiddoc/templates-sdk-dev/footer.cs +++ b/tools/droiddoc/templates-sdk-dev/footer.cs @@ -1,152 +1,20 @@ -<div class="dac-modal"> - <div class="dac-modal-dimmer" data-modal-toogle></div> - - <div class="dac-modal-container"> - <div class="dac-modal-window"> - <header class="dac-modal-header"> - <button class="dac-modal-header-close" data-modal-toogle><i class="dac-sprite dac-close"></i></button> - <h2 class="dac-modal-header-title">Sign-up for the newsletter to get the latest Android developer news and tips that will help you find success on Google Play.</h2> - <p class="dac-modal-header-subtitle">* Required Fields</p> - </header> - <iframe src="" class="dac-modal-iframe" name="dac-modal-iframe"></iframe> - <form action="https://docs.google.com/forms/d/1QgnkzbEJIDu9lMEea0mxqWrXUJu0oBCLD7ar23V0Yys/formResponse" class="dac-form" method="post" target="dac-modal-iframe" data-newsletter-form> - <section class="dac-modal-content"> - <fieldset class="dac-form-fieldset"> - <div class="cols"> - <div class="col-4of8"> - <div class="dac-form-input-group"> - <label for="newsletter-full-name" class="dac-form-floatlabel">Full name</label> - <input type="text" class="dac-form-input" name="entry.1357890476" id="newsletter-full-name" required> - <span class="dac-form-required">*</span> - </div> - <div class="dac-form-input-group"> - <label for="newsletter-email" class="dac-form-floatlabel">Email address</label> - <input type="email" class="dac-form-input" name="entry.472100832" id="newsletter-email" required> - <span class="dac-form-required">*</span> - </div> - </div> - <div class="col-4of8"> - <div class="dac-form-input-group"> - <label for="newsletter-company" class="dac-form-floatlabel">Company / developer name</label> - <input type="text" class="dac-form-input" name="entry.1664780309" id="newsletter-company"> - </div> - <div class="dac-form-input-group"> - <label for="newsletter-play-store" class="dac-form-floatlabel">One of your Play Store app URLs</label> - <input type="url" class="dac-form-input" name="entry.47013838" id="newsletter-play-store" required> - <span class="dac-form-required">*</span> - </div> - </div> - </div> - </fieldset> - <fieldset class="dac-form-fieldset"> - <div class="cols"> - <div class="col-4of8"> - <legend class="dac-form-legend">Which best describes your business:<span class="dac-form-required">*</span> - </legend> - <div class="dac-form-radio-group"> - <input type="radio" value="Apps" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-app" required> - <label for="newsletter-business-type-app" class="dac-form-radio-button"></label> - <label for="newsletter-business-type-app" class="dac-form-label">Apps</label> - </div> - <div class="dac-form-radio-group"> - <input type="radio" value="Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-games" required> - <label for="newsletter-business-type-games" class="dac-form-radio-button"></label> - <label for="newsletter-business-type-games" class="dac-form-label">Games</label> - </div> - <div class="dac-form-radio-group"> - <input type="radio" value="Apps and Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-appsgames" required> - <label for="newsletter-business-type-appsgames" class="dac-form-radio-button"></label> - <label for="newsletter-business-type-appsgames" class="dac-form-label">Apps & Games</label> - </div> - </div> - <div class="col-4of8 newsletter-checkboxes"> - <div class="dac-form-radio-group"> - <div class="dac-media"> - <div class="dac-media-figure"> - <input type="checkbox" class="dac-form-checkbox" name="entry.732309842" id="newsletter-add" required value="Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities."> - <label for="newsletter-add" class="dac-form-checkbox-button"></label> - </div> - <div class="dac-media-body"> - <label for="newsletter-add" class="dac-form-label dac-form-aside">Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities.<span class="dac-form-required">*</span></label> - </div> - </div> - </div> - <div class="dac-form-radio-group"> - <div class="dac-media"> - <div class="dac-media-figure"> - <input type="checkbox" class="dac-form-checkbox" name="entry.2045036090" id="newsletter-terms" required value="I acknowledge that the information provided in this form will be subject to Google's privacy policy (https://www.google.com/policies/privacy/)."> - <label for="newsletter-terms" class="dac-form-checkbox-button"></label> - </div> - <div class="dac-media-body"> - <label for="newsletter-terms" class="dac-form-label dac-form-aside">I acknowledge that the information provided in this form will be subject to <a href="https://www.google.com/policies/privacy/">Google's privacy policy</a>.<span class="dac-form-required">*</span></label> - </div> - </div> - </div> - </div> - </div> - </fieldset> - </section> - <footer class="dac-modal-footer"> - <div class="cols"> - <div class="col-2of5"> - </div> - </div> - <button type="submit" value="Submit" class="dac-fab dac-primary dac-large dac-modal-action"><i class="dac-sprite dac-arrow-right"></i></button> - </footer> - </form> - </div> +<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>> + +<?cs if:reference ?> + <div id="copyright"> + <?cs call:custom_copyright() ?> </div> -</div> -<div class="dac-footer wrap"> - <div class="cols dac-footer-main"> - <div class="col-1of2"> - <a class="dac-footer-getnews" data-modal-toogle href="javascript:;">Get news & tips <span class="dac-fab dac-primary"><i class="dac-sprite dac-mail"></i></span></a> - </div> - <div class="col-1of2 dac-footer-reachout"> - <div class="dac-footer-contact"> - <a class="dac-footer-contact-link" href="http://android-developers.blogspot.com/">Blog</a> - <a class="dac-footer-contact-link" href="/support.html">Support</a> - </div> - <div class="dac-footer-social"> - <a class="dac-fab dac-footer-social-link" href="https://www.youtube.com/user/androiddevelopers"><i class="dac-sprite dac-youtube"></i></a> - <a class="dac-fab dac-footer-social-link" href="https://plus.google.com/+AndroidDevelopers"><i class="dac-sprite dac-gplus"></i></a> - <a class="dac-fab dac-footer-social-link" href="https://twitter.com/AndroidDev"><i class="dac-sprite dac-twitter"></i></a> - </div> - </div> + <div id="build_info"> + <?cs call:custom_buildinfo() ?> </div> - - <hr class="dac-footer-separator"/> - - <?cs if:reference ?> - <p class="dac-footer-copyright"> - <?cs call:custom_copyright() ?> - </p> - <p class="dac-footer-build"> - <?cs call:custom_buildinfo() ?> - </p> - <?cs elif:!hide_license_footer ?> - <p class="dac-footer-copyright"> - <?cs call:custom_cc_copyright() ?> - </p> - <?cs /if ?> - - <p class="dac-footer-links"> - <a href="/about/index.html">About Android</a> - <a href="/auto/index.html">Auto</a> - <a href="/tv/index.html">TV</a> - <a href="/wear/index.html">Wear</a> - <a href="/legal.html">Legal</a> - - <span id="language" class="locales"> - <select name="language" onchange="changeLangPref(this.value, true)"> - <option value="en" selected="selected">English</option> - <option value="es">Español</option> - <option value="ja">日本語</option> - <option value="ko">한국어</option> - <option value="ru">Русский</option> - <option value="zh-cn">中文(简体)</option> - <option value="zh-tw">中文(繁體)</option> - </select> - </span> - </p> -</div> <!-- end footer --> +<?cs elif:!hide_license_footer ?> + <div id="copyright"> + <?cs call:custom_cc_copyright() ?> + </div> +<?cs /if ?> +<?cs if:!no_footer_links ?> + <div id="footerlinks"> + <?cs call:custom_footerlinks() ?> + </div> +<?cs /if ?> +</div> <!-- end footer -->
\ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/head_tag.cs b/tools/droiddoc/templates-sdk-dev/head_tag.cs index b3239b525..9f79f5479 100644 --- a/tools/droiddoc/templates-sdk-dev/head_tag.cs +++ b/tools/droiddoc/templates-sdk-dev/head_tag.cs @@ -15,7 +15,10 @@ ?><?cs # END if/else devsite ?> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="viewport" content="width=device-width" /> +<meta name="viewport" content="width=<?cs + if:page.viewport_width ?><?cs + var:page.viewport_width ?><?cs + else ?>device-width<?cs /if ?>" /> <?cs if:page.metaDescription ?> <meta name="Description" content="<?cs var:page.metaDescription ?>"><?cs diff --git a/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs b/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs index 61754f05b..8e5969361 100644 --- a/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs +++ b/tools/droiddoc/templates-sdk-dev/nosidenavpage.cs @@ -11,7 +11,6 @@ <?cs call:custom_masthead() ?> <div id="body-content"> -<div> <div id="doc-content" style="position:relative;"> <?cs call:tag_list(root.descr) ?> diff --git a/tools/droiddoc/templates-sdk-dev/sample.cs b/tools/droiddoc/templates-sdk-dev/sample.cs index 7b4bf0f88..32a0788ef 100644 --- a/tools/droiddoc/templates-sdk-dev/sample.cs +++ b/tools/droiddoc/templates-sdk-dev/sample.cs @@ -92,9 +92,9 @@ <div class="content-footer <?cs if:fullpage ?>wrap<?cs - else ?>cols<?cs /if ?>" + else ?>layout-content-row<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="<?cs + <div class="layout-content-col <?cs if:fullpage ?>col-16<?cs elif:training||guide ?>col-8<?cs else ?>col-9<?cs /if ?>" style="padding-top:4px"> @@ -103,7 +103,7 @@ <?cs /if ?> </div> <?cs if:!fullscreen ?> - <div class="paging-links col-4"> + <div class="paging-links layout-content-col col-4"> <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" @@ -128,7 +128,7 @@ <?cs # for training classes, provide a different kind of link when the next page is a different class ?> <?cs if:training && !page.article ?> - <div class="content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="next-class-link hide">Next class: </a> </div> <?cs /if ?> diff --git a/tools/droiddoc/templates-sdk-dev/sampleindex.cs b/tools/droiddoc/templates-sdk-dev/sampleindex.cs index e62d3fe9d..1bacb53ad 100644 --- a/tools/droiddoc/templates-sdk-dev/sampleindex.cs +++ b/tools/droiddoc/templates-sdk-dev/sampleindex.cs @@ -82,9 +82,9 @@ <?cs /if ?><?cs # end if/else online docs ?> <div class="content-footer <?cs if:fullpage ?>wrap<?cs - else ?>cols<?cs /if ?>" + else ?>layout-content-row<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="<?cs + <div class="layout-content-col <?cs if:fullpage ?>col-16<?cs elif:training||guide ?>col-8<?cs else ?>col-9<?cs /if ?>" style="padding-top:4px"> @@ -93,7 +93,7 @@ <?cs /if ?> </div> <?cs if:!fullscreen ?> - <div class="paging-links col-4"> + <div class="paging-links layout-content-col col-4"> <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" @@ -118,7 +118,7 @@ <?cs # for training classes, provide a different kind of link when the next page is a different class ?> <?cs if:training && !page.article ?> - <div class="content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="next-class-link hide">Next class: </a> </div> <?cs /if ?> diff --git a/tools/droiddoc/templates-sdk-dev/trailer.cs b/tools/droiddoc/templates-sdk-dev/trailer.cs index 225b2c169..337f8d346 100644 --- a/tools/droiddoc/templates-sdk-dev/trailer.cs +++ b/tools/droiddoc/templates-sdk-dev/trailer.cs @@ -1,4 +1,3 @@ -</div> <!-- end .cols --> <?cs # normally opened by header.cs ?> </div> <!-- end body-content --> <?cs # normally opened by header.cs ?> <?cs if:carousel ?> diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css index cc4dce711..a105834de 100644 --- a/tools/droiddoc/templates-sdk/assets/css/default.css +++ b/tools/droiddoc/templates-sdk/assets/css/default.css @@ -17,18 +17,31 @@ html, body { height: 100%; margin: 0; padding: 0; - background-color:#F9F9F9; + background-color: #fff; -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; /* prevent subpixel antialiasing, which thickens the text */ /* text-rendering: optimizeLegibility; */ /* turned off ligatures due to bug 5945455 */ } body { - color: #222; - font: 14px/19px Roboto, sans-serif; + color: #515151; + color: rgba(0, 0, 0, .68); + font: 14px/24px Roboto, sans-serif; font-weight: 400; letter-spacing:.1; - padding:0 10px; } + min-width: 940px; + padding:0 20px; } + +body.responsive { + min-width: 0; +} + +@media (max-width: 719px) { + body.responsive { + padding: 0 10px; + } +} #page-container { width: 940px; @@ -98,44 +111,252 @@ body { #devdoc-nav.fixed { position: fixed; margin:0; - top: 65px; /* sticky-header height + 20px gutter */ + top: 84px; /* sticky-header height + 20px gutter */ } -#devdoc-nav span.small { - font-size:12px; - font-weight:normal; +@media (max-width: 719px) { + .responsive #devdoc-nav { + /* hide it temporarily, so responsive content can be tested. */ + /* Need to implement a more future proof solution for responsive navigation */ + display: none; + } } #content { width: 760px; float: left; } + +/***** PREVIOUSLY style.css ******************/ +/* This should be close to the top, so it is easier to override. */ +[dir='rtl'] { + direction: rtl; +} +html { + line-height: 20px; +} +pre, table, input, textarea, code { + font-size: 1em; +} +address, abbr, cite { + font-style: normal; +} +[dir='rtl'] th { + text-align: right; +} +html[lang^=ja] blockquote, html[lang^=ja] q, html[lang^=ko] blockquote, html[lang^=ko] q, +html[lang^=zh] blockquote, html[lang^=zh] q { + font-style: normal; +} +q { + font-style: italic; +} +fieldset, iframe, img { + border: 0; +} +img { + border: none; + -ms-interpolation-mode: bicubic; + max-width: 100%; + vertical-align: middle; +} +video { + max-width: 100%; + object-fit: cover; +} +q { + quotes: none; +} +sup, sub { + font-size: 11px; + line-height: 0; +} + +table, fieldset { + margin: 0; +} +/* Biggest type */ +.display-1 { + font-size: 56px; + line-height: 68px; +} +@media (max-width: 719px) { + .display-1 { + font-size: 44px; + line-height: 56px; + } +} +h1, h2, h3 { + color: #212121; + color: rgba(0, 0, 0, .87); +} +h1 { + font-size: 44px; + line-height: 56px; + margin: 24px 0 12px; + font-weight: 300; +} +h1.short { + margin-right:320px; +} +@media (max-width: 719px) { + h1 { + font-size: 36px; + line-height: 48px; + } +} +h2 { + font-size: 28px; + line-height: 32px; + margin: 24px 0 16px; + font-weight: 400; +} +h3 { + font-size: 24px; + line-height: 32px; + font-weight: 400; + margin: 16px 0; +} +h4 { + font-size: 18px; + line-height: 24px; + margin: 12px 0; + font-weight: 500; +} +h5, h6 { + font-size: 16px; + line-height: 24px; + margin: 8px 0; +} +hr { /* applied to the bottom of h2 elements */ + height: 1px; + margin: 7px 0 12px; + border: 0; + background: #e5e5e5; +} +p, pre, table, form { + margin: 0 0 12px; +} +small { + font-size: 11.5px; + color: #000; +} +ul, ol { + margin: 0 0 15px 20px; + padding: 0; +} +[dir='rtl'] ul, [dir='rtl'] ol { + margin: 10px 30px 10px 10px; +} +ul ul, ul ol, ol ul, ol ol { + margin-bottom: 0; + margin-top: 0; +} +li { + margin: 0 0 12px; +} +dt { + margin: 24px 0 12px; +} +dd { + margin:0 0 10px 40px; +} +dd p, +dd pre, +dd ul, +dd ol, +dd dl { + margin-top:10px; +} +li p, +li pre, +li ul, +li ol, +li dl { + margin-top: 6px; + margin-bottom: 6px; +} +dl dd dl:first-child { + margin-top: 0; +} +pre strong, pre b, a strong, a b, a code { + color: inherit; +} +pre, code { + color: #060; + font: 13px/18px 'Courier New', monospace; + -webkit-font-smoothing: subpixel-antialiased; + -moz-osx-font-smoothing: auto; +} + +legend { + display: none; +} +a:link, a:visited, .link-color { + color: #0ae; + text-decoration: none; +} +a:focus, a:hover, a:active { + color: #0ae; + text-decoration: none; +} +a.white { + color: #fff; + text-decoration:underline; +} +a.white:hover, a.white:active { + color: #ccc !important; +} +strong, b { + font-weight: bold; +} +table { + border-collapse: collapse; + border-spacing: 0; + border:0; + margin: .5em 1em 1em 0; + width:100%; /* consistent table widths; within IE's quirks */ + background-color:#f7f7f7; +} +th, td { + padding: 4px 12px; + vertical-align: top; + text-align: left; +} +td { + background-color:inherit; + border:solid 1px #DDD; +} +td *:last-child { + margin-bottom:0; +} +th { + background-color: #999; + color: #fff; + border:solid 1px #DDD; + font-weight: normal; +} +tr:first-of-type th:first-of-type:empty { + visibility: hidden; +} + a:hover, acronym:hover { - color: #7aa1b0 !important; } + color: #7aa1b0; } a:focus, a:active { - color: #33b5e5 !important; } + color: #33b5e5; } a.external-link { background:url('../images/styles/open_new_page.png') no-repeat 100% 50%; padding-right:16px; } -img { - border: none; } #jd-content img { margin-bottom:15px; } -ul { - margin: 0; - padding: 0; } - -strong { - font-weight: 500; } - em { font-style: italic; } @@ -155,6 +376,7 @@ video.with-shadow { /* disclosures mixin */ /* content layout */ +/* This grid is deprecated in favor of .cols and .col-X */ .layout-content-row { display: inline-block; margin-bottom: 10px; } @@ -264,12 +486,12 @@ video.with-shadow { /* sublinks */ } #nav li { list-style-type: none; - font-size: 14px; + font-size: 12px; margin:0; padding:0; - line-height: 15px; } + line-height: 18px; } #nav a { - color: #555555; + color: #505050; text-decoration: none; word-wrap:break-word; } #nav .nav-section-header { @@ -288,9 +510,8 @@ video.with-shadow { /* section header links */ #nav > li > div > a { display: block; - color: #333333; - font-weight: 500; - padding: 10px 0 10px 10px; } + font-weight: 700; + padding: 13px 0 12px 10px; } #nav .nav-section-header:after { content: ''; background: transparent url(../images/styles/disclosure_down.png) no-repeat scroll 50% 50%; @@ -298,7 +519,7 @@ video.with-shadow { height: 34px; display: block; position: absolute; - top: 0; + top: 6px; right: 0; } #nav .nav-section-header.empty { padding:0; } @@ -312,22 +533,24 @@ video.with-shadow { #nav .nav-section li a { /* first gen child (2nd level li) */ display:block; - font-weight: normal; + font-weight: 700; text-transform: none; - padding: 7px 5px 7px 10px; + padding: 13px 5px 13px 10px; } #nav .nav-section li li a { /* second gen child (3rd level li) */ - padding: 5px 5px 5px 10px; + font-weight: 400; + padding: 7px 5px 7px 10px; } #nav li.expanded .nav-section-header { - background:#e9e9e9; - background: rgba(0, 0, 0, 0.05); } + background: #f0f0f0; } + #nav li.expanded .nav-section-header.empty { + background: none; } #nav li.expanded li .nav-section-header { - background: transparent; } + background: none; } #nav li.expanded li ul { /* 3rd level ul */ - padding:0 0 0 10px; + padding:6px 0 1px 20px; } #nav li.expanded > .nav-section-header:after { content: ''; @@ -394,16 +617,12 @@ video.with-shadow { padding-bottom:0; } #nav li.expanded ul > li { - background:#efefef; - background: rgba(0, 0, 0, 0.03); } + background:#f7f7f7; } #nav li.expanded ul > li li { background:inherit; } #nav li ul.tree-list-children ul { display:block; } -#nav.samples-nav li li li { - font-size:13px; -} #nav.samples-nav li li li a { padding-top:3px; padding-bottom:3px; @@ -423,25 +642,19 @@ video.with-shadow { /* content header */ .content-header { - height: 30px; - margin:36px 0 23px; /* same as h1 */ - padding:0 0 10px;} /* same as h1 */ + position: relative; +} +.content-header:before, +.content-header:after { + content: ''; + display: table; + /* Clear heading margins, to make absolutely positioned nav a bit more predictable. */ +} .content-header.just-links { margin-bottom:0; padding-bottom:0;} -.content-header h1 { - margin:0; - padding:0; - width: 700px; -} -.content-header > div:first-child { - height:1px; /* set fixed height for the header div to ensure the - next/prev links align with toc on training classes */ -} - .content-footer { - border-top: 1px solid #ccc; margin-top: 10px; padding-top:10px; width:100%; } @@ -453,7 +666,7 @@ video.with-shadow { margin-right:0; } .content-footer.wrap { - width:940px; + max-width:940px; } .content-footer .plus-container { margin:5px 0 0; @@ -467,7 +680,10 @@ a.back-link { } .content-header .paging-links { - margin-top:-25px; + position: absolute; + right: 0; + top: 8px; + width: 220px; } .paging-links { position: relative; @@ -476,9 +692,7 @@ a.back-link { position: absolute; } .paging-links a, .training-nav-top a { - color: #555555; - text-decoration: none; - text-transform: uppercase; } + text-decoration: none; } .paging-links .prev-page-link:before, .training-nav-top .prev-page-link:before, a.back-link:before { @@ -517,20 +731,25 @@ a.back-link { } .training-nav-top a { + border-bottom:0; + box-sizing: border-box; + color: inherit; display:block; float:left; - width:122px; - height:28px; - padding: 8px; - line-height:28px; + padding:10px 0; + line-height:30px; text-align:center; - border:1px solid #DADADA; - border-bottom:0; + width: 50%; + } + + .training-nav-top a.prev-page-link { + padding-left: 15px; + text-align: left; } .training-nav-top a.next-page-link { - border-left:0; - width:123px; + padding-right: 15px; + text-align: right; } .paging-links a.disabled, @@ -557,31 +776,50 @@ a.back-link { /* list of classes on course landing page */ ol.class-list { - list-style:none; - margin-left:0; + counter-reset: class; + list-style: none; + margin: 60px 0 0; } ol.class-list>li { - margin:0 0 15px; - padding:5px 0 0; - overflow:hidden; - border-top:1px solid #ccc; + box-shadow: 0px 2px 5px 0 rgba(0, 0, 0, 0.26); + margin: 0 0 20px; + overflow: hidden; } - ol.class-list li a.title { - font-size:16px; - margin:0; - clear:left; - display:block; - height:32px; - padding:0 4px; + ol.class-list .title { + background: #00bcd4; + color: #fff; + display: block; + font-size: 20px; + font-weight: 500; + height: 32px; + margin: 0; + padding: 52px 16px 12px; + position: relative; } - ol.class-list li a.title h2 { - color:inherit; + ol.class-list .title:before { + border-bottom: 1px solid white; + box-sizing: border-box; + /* Disable the numbers for now, since vert few classes need to be taken in order. */ + /* content: counter(class); */ + counter-increment: class; + height: 40px; + left: 0; + padding: 10px 1px 0 5px; + position: absolute; + top: 0; + text-align: right; + min-width: 30px; + } + ol.class-list .title h2 { + color: currentColor; + font-size: inherit; + font-weight: inherit; margin:0 0 10px; display:block; float:left; width:675px; } - ol.class-list li a.title span { + ol.class-list .title span { display:none; float:left; font-size:18px; @@ -590,40 +828,71 @@ a.back-link { width: 10px; height: 32px; } - ol.class-list li a.title:hover { - background:#ddd; - color:#258AAF !important; - } - ol.class-list li a.title:hover span { - display:block; - } - #jd-content - ol.class-list li img { - float:left; - clear:left; - width:64px; - margin:0 20px 0 0; - } - ol.class-list li p.description { + ol.class-list .description { + box-sizing: border-box; float:left; display:block; - width:250px; margin:0; + padding: 16px 10px 16px 16px; + width: 50%; } - ol.class-list li p.description.article { + ol.class-list .description.article { width: 550px; } ol.class-list ol { - float:left; - width:320px; - margin:0 0 0 30px; - list-style:none; - margin:0 0 0 20px; + box-sizing: border-box; + float: left; + list-style: none; + margin: 0; + padding: 16px 16px 16px 10px; + width: 50%; + } + ol.class-list .lessons li { + margin: 0 0 6px; + line-height: 16px; } - ol.class-list div.lessons li { - margin:0 0 6px; - line-height:16px; + + /* Class colors */ + ol.class-list li:nth-child(10n+1) .title { + background: #00bcd4; + } + ol.class-list li:nth-child(10n+2) .title { + background: #4db6ac; + } + ol.class-list li:nth-child(10n+3) .title { + background: #66bb6a; + } + ol.class-list li:nth-child(10n+4) .title { + background: #7cb342; + } + ol.class-list li:nth-child(10n+5) .title { + background: #afb42b; + } + ol.class-list li:nth-child(10n+6) .title { + background: #ffb300; + } + ol.class-list li:nth-child(10n+7) .title { + background: #ff7043; + } + ol.class-list li:nth-child(10n+8) .title { + background: #ec407a; + } + ol.class-list li:nth-child(10n+9) .title { + background: #ab47bc; + } + ol.class-list li:nth-child(10n+10) .title { + background: #7e57c2; + } + + @media (max-width: 719px) { + .responsive ol.class-list ol, + .responsive ol.class-list .description { + float: none; + margin: 16px; + padding: 0; + width: auto; + } } @@ -1071,233 +1340,6 @@ scroll top left; - - - - - - - - - - - - - - - -/***** PREVIOUSLY style.css ******************/ - - - - - -@media screen, projection, print { -[dir='rtl'] { - direction: rtl; -} -html { - line-height: 20px; -} -pre, table, input, textarea, code { - font-size: 1em; -} -address, abbr, cite { - font-style: normal; -} -[dir='rtl'] th { - text-align: right; -} -html[lang^=ja] blockquote, html[lang^=ja] q, html[lang^=ko] blockquote, html[lang^=ko] q, -html[lang^=zh] blockquote, html[lang^=zh] q { - font-style: normal; -} -q { - font-style: italic; -} -fieldset, iframe, img { - border: 0; -} -img { - -ms-interpolation-mode: bicubic; - vertical-align: middle; - max-width: 100%; -} -q { - quotes: none; -} -sup, sub { - font-size: 11px; - line-height: 0; -} -} - -@media screen, projection { - -table, fieldset { - margin: 0; -} -h1 { - color:#333; - font-size: 34px; - margin: 36px 0 27px; - padding:0 0 10px; - font-weight:300; -} -h1, h2 { - line-height: 30px; -} -h1.short { - margin-right:320px; -} -h1.short { - margin-right:320px; -} -h1.super { - font-size: 37px; -} -h2 { - color:#333; - font-size: 26px; - margin: 32px 0 20px; - padding:0; - font-weight:300; -} -h3 { - color:#333; - font-size: 21px; - font-weight:400; - margin:21px 0 14px 0; -} -h3, h4 { - line-height: 21px; -} -h4 { - font-size: 18px; - margin: 12px 0; - font-weight:500; -} -h5 { - font-size: 14px; -} -h5, h6 { - margin: 5px 0; -} -h6 { - font-size: 12px; -} -hr { /* applied to the bottom of h2 elements */ - height: 1px; - margin: 3px 0 12px; - border: 0; - background: #ccc; -} -p, pre, table, form { - margin: 0 0 15px; -} -small { - font-size: 11.5px; - color: #000; -} -ul, ol { - margin: 0 0 15px 18px; - padding: 0; -} -[dir='rtl'] ul, [dir='rtl'] ol { - margin: 10px 30px 10px 10px; -} -ul ul, ul ol, ol ul, ol ol { - margin-bottom: 0; - margin-top: 0; -} -li { - margin:0 0 5px; -} -dd { - margin:0 0 10px 30px; -} -dd p, -dd pre, -dd ul, -dd ol, -dd dl { - margin-top:10px; -} -li p, -li pre, -li ul, -li ol, -li dl { - margin-top:5px; - margin-bottom:5px; -} -dl dd dl:first-child { - margin-top:0; -} -pre strong, pre b, a strong, a b, a code { - color: inherit; -} -pre, code { - color: #060; - font: 13px/1.5 monospace; -} -code { - font-weight:bold; - font: 13px/14px monospace; -} - -legend { - display: none; -} -a:link, a:visited, .link-color { - color: #258aaf; - text-decoration: none; -} -a:focus, a:hover, a:active { - color: #33B5E5; - text-decoration: none; -} -a.white { - color: #fff; - text-decoration:underline; -} -a.white:hover, a.white:active { - color: #ccc !important; -} -strong, b { - font-weight:bold; - color: #222; -} -table { - border-collapse: collapse; - border-spacing: 0; - border:0; - margin: .5em 1em 1em 0; - width:100%; /* consistent table widths; within IE's quirks */ - background-color:#f7f7f7; -} -th, td { - padding: 4px 12px; - vertical-align: top; - text-align: left; -} -td { - background-color:inherit; - border:solid 1px #DDD; -} -td *:last-child { - margin-bottom:0; -} -th { - background-color: #999; - color: #fff; - border:solid 1px #DDD; - font-weight: normal; -} -tr:first-of-type th:first-of-type:empty { - visibility: hidden; -} - /* -------------------------------------------------------------------------- Footer */ @@ -1468,236 +1510,11 @@ color-stop(50%, #acbc00), color-stop(50%, #bdde00), color-stop(100%, #bdde00)); } /* ============================================================================= - Columns - ========================================================================== */ - -@media screen, projection, print { -.full { - padding: 2.5em 0; - border-top: solid 1px #ddd; - border-bottom: solid 1px #ddd; - background: #f7f7f7; -} -.wrap { - margin: 0 auto; - width: 940px; - clear: both; -} -.cols { - height: 1%; - margin: 0 -1.533742331288343558282%; - width: 103.06748466257669%} -*+html .cols { - margin-bottom: 20px; -} -.cols:after { - clear: both; - content: ' '; - display: block; - height: 0; - visibility: hidden; -} -.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, -.col-13, .col-14, .col-15, .col-16 { - display: inline; - float: left; - margin-left: 10px; - margin-right: 10px; -} -/* -* html .col-1, * html .col-2, * html .col-3, * html .col-4, * html .col-5, * html .col-6, * html -.col-7, * html .col-8, * html .col-9, * html .col-10, * html .col-11, * html .col-12 { - margin: 0; - padding: 0 1.4% 20px; -} -[dir='rtl'] .col-1, [dir='rtl'] .col-2, [dir='rtl'] .col-3, [dir='rtl'] .col-4, [dir='rtl'] .col-5, -[dir='rtl'] .col-6, [dir='rtl'] .col-7, [dir='rtl'] .col-8, [dir='rtl'] .col-9, [dir='rtl'] .col-10, -[dir='rtl'] .col-11, [dir='rtl'] .col-12 { - float: right; -} -*/ -.col-1 { width: 40px } -.col-2 { width: 100px } -.col-3 { width: 160px } -.col-4 { width: 220px } -.col-5 { width: 280px } -.col-6 { width: 340px } -.col-7 { width: 400px } -.col-8 { width: 460px } -.col-9 { width: 520px } -.col-10 { width: 580px } -.col-11 { width: 640px } -.col-12 { width: 700px } -.col-13 { width: 760px } -.col-14 { width: 820px } -.col-15 { width: 880px } -.col-16 { width: 940px } -} - -.col-right { - margin-right:0px; -} - -@media screen and (max-width:772px) { -.col-5, .col-6, .col-7 { - clear: both; - width: 97.0238096%} -} - -/* ============================================================================= Layout ========================================================================== */ @media screen, projection, print { /* -------------------------------------------------------------------------- -Header, Login, Nav-X, Search -*/ -#header { - margin: 0; - padding: 0; -} -#header:before, #header:after { - content: ""; - display: table; - clear: both -} -.logo, .nav-x { - float: left; -} -.nav-x { - margin-top: -2px; - list-style-type: none; -} -.nav-x a { - color: #333; - font-size: 16px; -} -.about a.selected { - color: #9933CC; -} -.design a.selected { - color: #33b5e5; -} -.develop a.selected { - color: #F80; -} -.distribute a.selected { - color: #9C0; -} - - - -.nav-x li { - display: inline; - margin-right: 45px; -} -.search { - float: right; - position: relative; - width: 220px -} -.search .bottom, .search .left, .search .right { - position: absolute; - background-color: #a3a3a3; -} -.search .bottom { - width: 220px; - height: 1px; - top: 24px; - left: 0 -} -.search .left, .search .right { - height: 5px; - width: 1px -} -.search .left { top: 19px; left: 0 } -.search .right { top: 19px; right: 0 } -.search form { - float: left; - margin-top: 2px; - width: inherit; -} -.search .close, -#player-frame .close { - position: absolute; - right: 8px; - bottom: 4px; - width: 16px; - height: 16px; - margin: 0; - text-indent: -1000em; - background: url(../images/close.png) no-repeat 0 0; - z-index:9999; -} -.search .close:hover, .search .close:focus, -#player-frame .close:hover, #player-frame .close:focus { - background-position: -16px 0; - cursor:pointer; -} -#player-frame .close { - top: 6px; -} -.search form input { - color: #999; - font-size: 1em; - width: inherit; - border: none; - margin: 0; - padding:0 0 0 6px; - z-index: 1500; - background-color: transparent -} -.search:hover .bottom, .search:hover .left, .search:hover .right { - background-color: #33b5e5; -} -.search:hover .icon { - background-position: -8px 0 -} -.search form input:focus { - color: #222; - font-weight: bold; - outline:0; -} -/* Search Dropdown */ -.search-dropdown { - padding: 15px; - width: 192px; - border: solid 1px #c5c5c5; - background: #fff; - position: absolute; - top: 35px; - left: 0; - -moz-box-shadow: 0 0 10px rgba(0,0,0,0.2); - -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.2); - box-shadow: 0 0 10px rgba(0,0,0,0.2) -} -.search-dropdown ul, .search-dropdown ul li { - list-style-type: none; - margin: 0; - padding: 0 -} -.search-dropdown ul li { - clear: both -} -.search-dropdown img { - float: left; - margin: 0 10px 10px 0 -} -.search-dropdown h6 { - color: #222; - margin: 0; - line-height: normal -} -.search-dropdown .desc { - color: #999; - font-size: 11.5px; - line-height: normal; - margin: 0; -} -.search-dropdown li a:hover h6, .search-dropdown li a:hover .desc { - color: #33b5e5 -} -/* -------------------------------------------------------------------------- Buttons */ .button, a.button, .button-secondary, a.button-secondary { @@ -1811,7 +1628,7 @@ endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */ -webkit-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05); -moz-box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05); box-shadow: inset 0px 0px 5px 2px rgba(0, 0, 0, .05); - color: #258AAF !important; + color: #0ae !important; } .button.big { font-size:20px; @@ -1880,18 +1697,37 @@ EndColorStr='#ececec'); width:291px; } -.training-nav-top, -.training-nav-bottom { - float:right; - margin:0 0 0 20px; +.training-nav-top { + border:1px solid #e5e5e5; + border-width: 1px 1px 0; + bottom: -56px; + box-sizing: border-box; + position: absolute; + right: 0; + width: 280px; } -.training-nav-top { - position:relative; - top:73px; +@media (max-width: 719px) { + .responsive .training-nav-top { + left: 0; + width: auto; + } + + .responsive #tb-wrapper { + clear: none; + float: none; + margin-left: 0; + } + + .responsive #tb { + float: none; + width: auto; + } } .training-nav-bottom { + float:right; + margin:0 0 0 20px; padding:0 0 20px; } @@ -1904,33 +1740,37 @@ EndColorStr='#ececec'); } #tb-wrapper { - margin:51px 0 0 20px; /* negative top-margin to counter the content-header bottom margin */ + margin:56px 0 0 20px; /* negative top-margin to counter the content-header bottom margin */ } #tb, #qv { - font-size:13px; - line-height:18px; - width:238px; - border:1px solid #ccc; - float:right; + border: 1px solid #e5e5e5; + box-sizing: border-box; + float: right; + padding: 5px 0; + width: 240px; } #tb { - width:278px; + width:280px; } #tb h2, #qv h2 { - margin:10px 15px; - padding:0; - text-transform:uppercase; - border-bottom:1px solid gainsboro; + border-top: 1px solid #e5e5e5; + color: inherit; + font-size: 16px; + line-height: 24px; + margin: 15px 0 4px; + padding: 10px 15px 0; } -#tb *, -#qv * { - font-size:inherit; +#tb h2:first-child, +#qv h2:first-child { + border-top: 0; + padding-top: 0; + margin-top: 10px; } #tb .download-box, @@ -1942,7 +1782,6 @@ EndColorStr='#ececec'); #qv .download-box .filename { font-size:11px; margin:4px 4px 10px; - color:#666; } @@ -1959,9 +1798,9 @@ EndColorStr='#ececec'); width:226px; font-size:13px; line-height:18px; - border-left:4px solid #99CC00; + border-left:3px solid #a9e27d; float:right; - padding:0 0 0 10px; + padding:0 0 0 20px; margin:0 0 1em 20px; } @@ -1985,7 +1824,15 @@ EndColorStr='#ececec'); #tb ol, #tb ul, #qv ul { - margin:0 15px 10px 35px; + list-style-type: none; + margin:0 15px 10px 15px; +} + +#tb li, +#qv li { + margin: 4px 0; + padding: 0 0 0 16px; + position: relative; } #tb p { @@ -2005,11 +1852,7 @@ EndColorStr='#ececec'); #qv ul ul, .sidebox ol ol, .sidebox ul ul { - margin-bottom:0; -} - -#qv ol ol { - margin:3px 0 3px 15px; + margin: 8px 0; } .sidebox p, @@ -2145,7 +1988,6 @@ form .form-error input[type='text'], form .form-error textarea { border-radius: 2px; margin: 10px 0; padding: 20px; - color: #666; position: relative; background: #f9f9f9; } @@ -2443,7 +2285,7 @@ a:visited, border-bottom: 1px solid #CCC; background:#e9e9e9; background: rgba(0, 0, 0, 0.05); /* matches #nav li.expanded */ - + line-height: 19px; /* Fix regression after page line-height is bumped to 24px */ } #api-nav-title { padding:0 5px; @@ -2795,7 +2637,7 @@ a#butterbar-message:hover { } /* -------------------------------------------------------------------------- -Misc +Misc and article typography */ @@ -2842,27 +2684,46 @@ pre.classic { p.img-caption { margin: -10px 0 20px; - font-size:13px; - color:#666; + font-size: 13px; +} + +div.figure-center { + margin: 32px auto 24px; + max-width: 100%; } div.figure, div.figure-right { - float:right; - clear:right; - margin:10px 0 0 0; - padding:0 0 0 20px; + clear: right; + float: right; + margin: 10px 0 0 0; + padding: 0 0 0 20px; + max-width: 50%; /* width must be defined w/ an inline style matching the image width */ } div.figure-left { - float:left; - clear:left; - margin:10px 0 0 0; - padding:0 20px 0 0; + clear: left; + float: left; + margin: 10px 0 0 0; + padding: 0 20px 0 0; + max-width: 50%; /* width must be defined w/ an inline style matching the image width */ } +@media (max-width: 719px) { + /* Collapse on mobile. */ + .responsive div.figure, + .responsive div.figure-right, + .responsive div.figure-left { + float: none; + clear: none; + padding: 0; + margin: 32px auto 24px; + max-width: 100%; + } +} + img.frame { border:1px solid #DDD; padding:4px; @@ -2871,38 +2732,31 @@ img.frame { p.table-caption { margin: 0 0 4px 0; font-size:13px; - color:#666; } p.code-caption { margin-bottom: 4px; font: 12px/1.5 monospace; - color:#666; -} - -div.note, -div.caution, -div.warning { - margin: 0 0 15px; } p.note, div.note, p.caution, div.caution, p.warning, div.warning { - padding: 0 0 0 10px; - border-left: 4px solid; + padding: 0 0 0 20px; + border-left: 3px solid; + margin: 16px 0; } p.note, div.note { - border-color: #258AAF; + border-color: #66c2ff; } p.caution, div.caution { - border-color: #FF8800; + border-color: #f81; } p.warning, div.warning { - border-color: #ff4443; + border-color: #f55; } div.note.design { @@ -2965,8 +2819,7 @@ div.design-announce p { a.notice-developers-video, a.notice-developers, a.notice-designers-video, -a.notice-designers, -a.notice-designers-material { +a.notice-designers { float:right; clear:right; width:238px; @@ -2977,15 +2830,13 @@ a.notice-designers-material { a.notice-developers-video.wide, a.notice-developers.wide, a.notice-designers-video.wide, -a.notice-designers.wide, -a.notice-designers-material.wide { +a.notice-designers.wide { width:278px; } a.notice-developers-video div, a.notice-developers div, a.notice-designers-video div, -a.notice-designers div, -a.notice-designers-material div { +a.notice-designers div { min-height:40px; background:url('../images/styles/notice-developers@2x.png') no-repeat 10px 10px; background-size:40px 40px; @@ -3003,22 +2854,16 @@ a.notice-developers-video div { background:url('../images/styles/notice-developers-video@2x.png') no-repeat 10px 10px; background-size:40px 40px; } -a.notice-designers-material div { - background:url('../images/styles/notice-designers-material@2x.png') no-repeat 10px 10px; - background-size:40px 40px; -} a.notice-developers-video:hover, a.notice-developers:hover, a.notice-designers-video:hover, -a.notice-designers:hover, -a.notice-designers-material:hover { +a.notice-designers:hover { background:#eee; } a.notice-developers-video h3, a.notice-developers h3, a.notice-designers-video h3, -a.notice-designers h3, -a.notice-designers-material h3 { +a.notice-designers h3 { font-size:13px; line-height:18px; font-weight:bold; @@ -3029,16 +2874,14 @@ a.notice-designers-material h3 { a.notice-developers-video p, a.notice-developers p, a.notice-designers-video p, -a.notice-designers p, -a.notice-designers-material p { +a.notice-designers p { margin:0; line-height:14px; } a.notice-developers-video.left, a.notice-developers.left, a.notice-designers-video.left, -a.notice-designers.left, -a.notice-designers-material.left { +a.notice-designers.left { margin-left:0; float:left; } @@ -3465,6 +3308,15 @@ Page-Specific Styles } */ +/* First paragraph of a content pages is a bit larger + - note the very specific selector. */ +.jd-descr > p:first-child, +.jd-descr > #tb-wrapper + p, +.jd-descr > #qv-wrapper + p { + font-size: 16px; + margin-bottom: 16px; +} + /* page-top-right container for reference pages (holds links to summary tables) */ #api-info-block { @@ -3676,6 +3528,7 @@ h5.jd-tagtitle { font-style:italic; } + /* Inline api level indicator for methods */ div.api-level { font-size:.8em; @@ -3696,27 +3549,6 @@ table.jd-tagtable th { } - - - - - - - - - - - - - - - - - - - - - /* SEARCH FILTER */ .menu-container { @@ -3726,53 +3558,39 @@ table.jd-tagtable th { font-weight:normal; } -.search_filtered_wrapper.reference { - width: 193px; - float: right; -} -.search_filtered_wrapper.docs { - width:875px; - float: left; - position:absolute; - top:26px; - right:66px; +.search_filtered_wrapper { + position: absolute; + right: 18px; + top: 64px; } .suggest-card { + float:right; position:relative; width:170px; min-height:90px; padding:5px; border: solid 1px #C5C5C5; background: white; - top: 15px; margin-right:-5px; -moz-box-shadow: 0 0 10px rgba(0,0,0,0.2); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); } .suggest-card.reference { - position:absolute; - z-index:999; - min-width:171px; /* +padding and border makes this match input width */ - min-height:93px; /* add 3px because this has 1 not 4px top border */ - width:auto; - top:41px; - margin:0; + z-index: 998; + width: auto; } .suggest-card.develop { z-index:997; border-top: solid 4px #F80; - float:right; } .suggest-card.design { z-index:996; border-top: solid 4px #33b5e5; - float:right; } .suggest-card.distribute { z-index:995; border-top: solid 4px #9C0; - float:right; } .child-card { width:100%; @@ -3852,8 +3670,6 @@ ul.search_filtered { - - /* SEARCH RESULTS */ @@ -3975,7 +3791,7 @@ td.gsc-search-button { #searchResults h2#searchTitle { padding:0; - margin:5px 0; + margin:30px 0 5px; border:none; } @@ -4024,7 +3840,7 @@ td.gsc-search-button { #searchResults .gsc-tabHeader.gsc-tabhInactive, #searchResults .gsc-cursor-page { text-decoration:none; - color:#258AAF; + color:#0ae; border: solid 1px #DADADA; } @@ -4038,7 +3854,7 @@ td.gsc-search-button { background-image: -ms-linear-gradient(top, #F9F9F9, #ECECEC); background-image: -o-linear-gradient(top, #F9F9F9, #ECECEC); background-image: linear-gradient(top, #F9F9F9, #ECECEC); - filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f9f9f9', + filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#f9f9f9', EndColorStr='#ececec'); color: #33B5E5; } @@ -4063,58 +3879,8 @@ EndColorStr='#ececec'); - /************ STICKY NAV BAR ******************/ -#header-wrapper { - background: #f9f9f9; - margin: 0 -10px 0 -10px; - padding: 31px 10px 0px 10px; - position: relative; -} -#header-wrapper #nav-x div.wrap { - max-width: 940px; - height: 38px; -} -#header-wrapper #nav-x ul.nav-x li { - margin-right: 31px !important; - margin-top: 5px; - margin-bottom: 0px; - height: 30px; -} -#header-wrapper #nav-x > div.wrap ul.nav-x li.active { - color: #669900; - border-bottom: 3px solid #669900; -} -#header-wrapper #nav-x > div.wrap ul.nav-x li.active a { - color: #669900; -} -#header-wrapper #nav-x > div.wrap ul.nav-x a { - font-size: 14.5px; -} -#header-wrapper .developer-console-btn { - float: right; - background: #fefefe; - border-radius: 4px; - padding: 8px 14px; - box-shadow: 1px 1px 0px #7a7a7a; - font-size: 14px; - margin-top: -6px; - cursor: pointer; - color: #464646; - margin-right: 20px; -} -/* not currently used */ -#header-wrapper .shadow { - width: 1034px; - height: 4px; - position: absolute; - left: 50%; - margin-left: -517px; - bottom: -4px; - background-image: url(../images/header-shadow.png); -} - #context { clear: both; padding-top: 14px; @@ -4158,78 +3924,8 @@ EndColorStr='#ececec'); display: none; } -/* Sticky Nav overrides */ -.sticky-menu { - position: fixed; - width: 940px; - height: 0px; - z-index: 51; - top: 12px; -} -#sticky-header { - display: none; - padding: 0 10px; - position: fixed; - background: #f9f9f9; - top: 0px; - left: 0px; - right: 0px; - height: 45px; - box-shadow: 0px 1px 5px rgba(0, 0, 0, 0.1); - border-bottom: 1px solid #a5c43a; - z-index: 50; -} -#sticky-header.design { - border-bottom: 1px solid #33b5e5; -} -#sticky-header.develop { - border-bottom: 1px solid #F80; -} -#sticky-header.distribute { - border-bottom: 1px solid #9C0; -} -#sticky-header.about { - border-bottom: 1px solid #9933CC; -} -#sticky-header > div { - overflow: hidden; - *zoom: 1; - width: 940px; - margin: 0 auto; - clear: both; - padding-top: 9px; -} -#sticky-header > div .logo { - float: left; - width: 26px; - height: 25px; - background: url(../images/dac_logo.png); - background-image: -webkit-image-set(url(../images/dac_logo.png) 1x, url(../images/dac_logo@2x.png) 2x); - z-index: 52; - position: relative; -} -#sticky-header > div .top { - float: left; - width: 38px; - height: 38px; - position: relative; - background: url(../images/styles/gototop.png); - z-index: 52; -} -#sticky-header > div .breadcrumb { - float: left; - padding: 0 0 0 10px; - border-left: 1px solid #d2d2d2; - line-height: 24px; - font-size: 14px; - position: relative; - top: 0px; - z-index: 52; -} - /* offset the <a name=""> tags to account for sticky nav */ -body.reference a[name], -div.renderscript a[name] { +body.reference a[name] { visibility: hidden; display: block; position: relative; @@ -4237,76 +3933,6 @@ div.renderscript a[name] { } -} - - - - - - - -/*********** PREVIOUSLY dac-styles.css ***************/ - - -#header { - border-bottom:0; -} - -#header .wrap { - max-width:940px; - height:41px; - border-bottom:1px solid; - border-color: #ccc; - position:relative; -} - -.about #header .wrap { - border-color: #9933CC; -} - -.design #header .wrap { - border-color: #33b5e5; -} - -.develop #header .wrap { - border-color: #F80; -} - -.distribute #header .wrap { - border-color: #9C0; -} - -.logo a { - float:left; -} - -#header .logo { - margin-top: -6px; - margin-left: 0px; - margin-bottom:0px; - width: 160px; - padding-right:10px; -} - - -#header-wrap .logo.landing-logo { - width:220px; - margin:0; - padding:0; - margin-bottom:22px; -} -#header-wrap .logo.landing-logo img { - padding:0 0 0 10px; -} - -.search { - height:25px; - margin-top: -3px; - margin-bottom: 0px; -} - - - /* Quicknav */ .btn-quicknav { width:20px; @@ -4344,17 +3970,6 @@ div.renderscript a[name] { display:block; } -.nav-x li { - display:block; - float:left; - margin-right:45px; - -webkit-transition: all 0.25s linear; - -moz-transition: all 0.25s linear; - -ms-transition: all 0.25s linear; - -o-transition: all 0.25s linear; - transition: all 0.25s linear; -} - #header-wrap.quicknav .nav-x li { min-width:160px; margin-right:20px; @@ -4440,105 +4055,6 @@ div.renderscript a[name] { } -/* SEARCH AND MORE */ -.search { - position: absolute; - width: 50px; - height:28px; - display: block; - margin-top:-3px; - margin-bottom:7px; - overflow:hidden; - z-index:100; - right:54px; - -webkit-transition: width 0.4s ease; - -moz-transition: width 0.4s ease; - -o-transition: width 0.4s ease; - transition: width 0.4s ease; -} - -.search #search-btn { - width:50px; - height:28px; - background:url(../images/icon_search.png) no-repeat; - float:left; -} - -.search-inner { - width:245px; -} - -.search:hover, .search.active { - width:245px; -} - -.search .bottom, .search .left, .search .right { - position: absolute; - background-color: #a2a2a2 -} - -.search .bottom { - width: 214px; - height: 1px; - top: 24px; - left: 0 -} - -.search .left, .search .right { - height: 5px; - width: 1px -} - -.search .left { - top: 22px; - left: 56px; - background-color:#CCC; -} - -.search .right { - top: 22px; - left: 238px; - background-color:#CCC; -} - -.search form { - margin-top: 2px; - width: 162px; - float:left; -} - -.search form input { - color: #2f2f2f; - font-size: 0.95em; - width: 178px; - border: none; - margin-left: 6px; - z-index: 1500; - position: relative; - background-color: transparent; - border-bottom:1px solid #CCC; - padding:0 0 0 4px; - outline:none; - height:24px; -} - -.search:hover form input { - border-bottom:1px solid #33B5E5; -} - -.search:hover .bottom, .search:hover .left, .search:hover .right { - background-color: #33b5e5; -} - -.search:hover #search-btn { - background-position: 0 -28px -} - -.search form input:focus { - color: #222; - font-weight: bold -} - .moremenu { float: right; position: relative; @@ -4691,9 +4207,9 @@ div.renderscript a[name] { height:12px; text-indent:-8000px; list-style:none; - margin: 0 2px; + margin: 0 3px; border-radius:6px; - background-color:#ccc; + background-color:#ddd; cursor:pointer; -webkit-transition:color .5s ease-in; -moz-transition:color .5s ease-in; @@ -4701,13 +4217,13 @@ div.renderscript a[name] { transition:color .5s ease-in; } .slideshow-container .pagination ul li:hover { - background-color:#999; + background-color:#bbb; } .slideshow-container .pagination ul li.active { - background-color:#33b5e5; + background-color:#6ab344; } .slideshow-container .pagination ul li.active:hover { - background-color:#33b5e5; + background-color:#6ab344; } .slideshow-container ul li { display:inline; @@ -4727,27 +4243,14 @@ a.download-sdk { padding-bottom:0px; } -#nav-x { - padding-top: 13px; -} - -#nav-x .wrap { - min-height:32px; -} - -#nav-x .wrap, #searchResults.wrap { max-width:940px; - border-bottom:1px solid #CCC; + border-bottom:1px solid #e5e5e5; } #searchResults.wrap #leftSearchControl { min-height:700px } -.nav-x { - margin-left:0; - margin-bottom:0; -} @@ -4817,7 +4320,7 @@ a.download-sdk { } .jspDrag { - background: #bbb; + background: #ccc; position: relative; top: 0; left: 0; @@ -5060,7 +4563,7 @@ a.download-sdk { display:none; margin: -1px auto 0; position: relative; - width: 940px; + max-width: 940px; height: 0px; } #player-frame { @@ -5072,6 +4575,22 @@ a.download-sdk { height: 330px; position: relative; } +#player-frame .close { + position: absolute; + right: 8px; + bottom: 4px; + width: 16px; + height: 16px; + margin: 0; + text-indent: -1000em; + top: 6px; + background: url(../images/close.png) no-repeat 0 0; + z-index:9999; +} +#player-frame .close:hover, #player-frame .close:focus { + background-position: -16px 0; + cursor:pointer; +} @@ -5126,7 +4645,7 @@ a.download-sdk { } .landing-docs .normal-links a { - color:#258aaf !important; + color:#0ae !important; } .plusone { @@ -5250,9 +4769,6 @@ a.download-sdk { .home-sections ul li.last { margin-right: 0px; } -.fullpage #footer { - margin-top: -40px; -} /************ DISTRIBUTE PAGES ******************/ @@ -5294,1228 +4810,10 @@ a.download-sdk { } .figure img, .border-img { + box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.37); margin-bottom: 15px; } -/************ RESOURCE CARDS ******************/ - -/* Resource cards, 12, 13, 16-col */ - -/* Basic card-styling with shadow */ -.resource-card { - border-radius: 1px; - box-shadow: 1px 2px 5px rgba(0, 0, 0, 0.12); - background: #fefefe; -} - -/* Styling for background image including tinting and section icons in stacks */ -.card-bg { - display: block; - position: absolute; - vertical-align: top; - width: 100%; - left: 0; - top: 0; - background-size: cover; - background-repeat: no-repeat; - background-position: center; - background-image: url(../images/resource-card-default-android.jpg); -} -.card-bg:after { - content: ""; - display: block; - height: 100%; - width: 100%; - opacity: 1; - background: rgba(0, 0, 0, 0.2); - -webkit-transition: opacity 0.5s; - -moz-transition: opacity 0.5s; - -o-transition: opacity 0.5s; - transition: opacity 0.5s; -} -.static .card-bg:after { - display:none; -} -.card-bg .card-section-icon { - position: absolute; - top: 50%; - width: 100%; - margin-top: -35px; - text-align: center; - padding-top: 65px; - z-index: 100; -} -.card-bg .card-section-icon .icon { - position: absolute; - left: 50%; - margin-left: -28px; - top: 0px; - width: 56px; - height: 56px; - background-repeat: no-repeat; - background-position: 50% 50%; - background-image: url(../images/stack-icon.png); -} -.card-bg .card-section-icon .section { - text-transform: uppercase; - color: white; - font-size: 14px; -} - -.card-info { - position: absolute; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - top: 0; - right: 0; - bottom: 0; - left: 0; - overflow: hidden; - background: #fefefe; - padding: 4px 12px 6px 12px; -} -.card-info .section { - text-transform: uppercase; - color: #898989; - font-size: 12px; - margin-bottom: 1px; -} -.card-info .title { - color: #363636; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - padding-bottom: 5px; - margin-bottom: -2px; - font-size: 16px; -} -.card-info .description { - overflow: hidden; -} -.card-info .description .text { - color: #464646; - font: 13px/15px Roboto Condensed; - overflow: hidden; - width:100%; -} -.card-info .description .util { - position: absolute; - right: 5px; - bottom: 70px; /*-2px;*/ - opacity: 0; - -webkit-transition: opacity 0.5s; - -moz-transition: opacity 0.5s; - -o-transition: opacity 0.5s; - transition: opacity 0.5s; -} -.card-info.empty-desc .title { - white-space: normal; - overflow: visible; -} -.card-info.empty-desc .description { - display: none; -} -/* Truncate card summaries at bounding box and - * and apply ellipsis at lower right */ -.ellipsis { - overflow: hidden; - float:right; - line-height: 15px; - width:100%; -} -.resource-card-6x6 .card-info .description .teddddddxt { - float:left; - position:relative; - margin-left:0; -} -.ellipsis:before { - content:""; - float: left; - width: 5px; - height:100%; -} -.ellipsis > *:first-child.text { - float: right; - width: 100% !important; - margin-left: -5px; -} -.ellipsis:after { - content: "\02026"; - height:17px; - padding-bottom:4px; - - box-sizing: content-box; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - - float: right; position: relative; - top: -16px; left: 100%; - width: 4em; margin-left: -4em; - padding-right: 5px; - - background: -webkit-gradient(linear, left top, right top, - from(rgba(255, 255, 255, 0)), to(white), color-stop(65%, white)); - background: -moz-linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); - background: -o-linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); - background: -ms-linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); - background: linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); -} -.ellipsis:after { - font-style: normal; color: #aaa; - font-size:13px; - text-align: right; -} - -/* Flow Layout */ -.resource-flow-layout { - display: inline-block; -} -.resource-flow-layout .resource-card, .resource-flow-layout .resource-card-stack { - float: left; - position: relative; -} -.resource-flow-layout .resource-card-stack > .resource-card { - margin-right: 0px !important; -} -.resource-flow-layout:after { - content: "."; - display: block; - height: 0; - position:relative; - clear: both; - visibility: hidden; -} -.resource-card:hover { - cursor: pointer; -} -.static .resource-card:hover { - cursor: auto; -} -.resource-card:hover .card-bg:after { - opacity: 0; -} -/* disabled to make way for fade/ellipsis truncation, - and the plusone moves up. -.resource-card:hover .card-info .description .text { - padding-right: 70px; -} */ -.resource-card:hover .card-info .description .util { - opacity: 1; -} - -/* Carousel Layout */ -/* Carousel styles for landing page */ -.resource-carousel-layout { - margin: 20px 0 20px 0; - position: relative; - overflow: hidden; -} -.resource-carousel-layout .slideshow-prev, .resource-carousel-layout .slideshow-next { - display: none; -} -.resource-carousel-layout .pagination { - bottom: 0px; -} -.resource-carousel-layout .frame li { - position: relative; -} -.resource-carousel-layout .frame li .card-bg { - height: 300px; -} -.resource-carousel-layout .frame li .card-info { - padding: 7px 15px 0px 15px; - top: 300px; -} -.resource-carousel-layout .frame li .card-info .section { - font-size: 13px; - margin-bottom: 7px; -} -.resource-carousel-layout .frame li .card-info .title { - font-size: 25px; - margin-bottom: 2px; -} -.resource-carousel-layout .frame li .card-info .description { - font-family: 15px/16px Roboto Condensed, sans-serif; -} -.resource-carousel-layout .frame li .card-info .description .text { - height: 40px; -} -.resource-carousel-layout .frame li .card-info .description .util { - bottom:97px; - right:4px; -} - -/* Stack Layout */ -.resource-stack-layout { - display: inline-block; -} -.resource-stack-layout .resource-card-stack { - float: left; - position: relative; -} -.resource-stack-layout .resource-card { - margin-bottom: 20px; - display: block; - position: relative; -} -.resource-stack-layout .section-card-menu > .card-info .section, .resource-stack-layout .section-card > .card-info .title { - /*text-transform: uppercase;*/ - color: #898989; - font-size: 17px; - line-height: 24px; - margin-bottom: 6px; -} -.resource-stack-layout .section-card { - height: 284px; -} -.resource-stack-layout .section-card > .card-bg { - height: 192px; -} -.resource-stack-layout .section-card > .card-info { - padding: 4px 12px 6px 12px; - top: 192px; -} -.resource-stack-layout .section-card > .card-info .section { - display: none; -} -.resource-stack-layout .section-card > .card-info .title { - font-size: 17px; - border-bottom: 1px solid #959595; - padding-bottom: 0px; -} -.resource-stack-layout .section-card > .card-info .description { - font-size: 13px; - line-height: 15px; -} -.resource-stack-layout .section-card > .card-info .description .text { - height: 30px; -} -.resource-stack-layout .related-card { - height: 90px; -} -.resource-stack-layout .related-card > .card-bg { - left: 0; - top: 0; - width: 90px; - height: 100%; - position: absolute; - display: block; -} -.resource-stack-layout .related-card > .card-info { - left: 90px; - padding: 4px 12px 4px 12px; -} -.resource-stack-layout .related-card > .card-info .section { - font-size: 12px; - margin-bottom: 1px; - display: none; -} -.resource-stack-layout .related-card > .card-info .title { - font-size: 16px; - margin-bottom: -2px; - white-space: normal; - overflow: visible; - text-overflow: ellipsis; -} -.resource-stack-layout .related-card > .card-info .title:after { - content: url(../images/link-out.png); - display: block; -} -.resource-stack-layout .related-card > .card-info .description { - display: none; -} -.resource-stack-layout .section-card-menu { - /* Flexible height */ - display: block; - height: auto; - width: auto; -} -.resource-stack-layout .section-card-menu .card-bg { - height: 155px; - /* Flexible height */ - position: relative; - display: inline-block; - vertical-align: top; -} -.resource-stack-layout .section-card-menu .card-info { - padding: 4px 12px 0px 12px; - /* Flexible height */ - position: relative; - left: auto; - top: auto; - right: auto; - bottom: auto; -} -.resource-stack-layout .section-card-menu .card-info ul { - list-style: none; - margin: 0; -} -.resource-stack-layout .section-card-menu .card-info ul li { - list-style: none; - margin: 0; - padding: 15px 0; - border-top-width: 1px; - border-top-style: solid; - border-top-color: #959595; -} -.resource-stack-layout .section-card-menu .card-info ul li a, .resource-stack-layout .section-card-menu .card-info ul li a:focus, .resource-stack-layout .section-card-menu .card-info ul li a:link, .resource-stack-layout .section-card-menu .card-info ul li a:visited, .resource-stack-layout .section-card-menu .card-info ul li a:active, .resource-stack-layout .section-card-menu .card-info ul li a:hover { - color: #363636 !important; -} -.resource-stack-layout .section-card-menu .card-info ul li:first-child { - border-top: none; -} -.resource-stack-layout .section-card-menu .card-info ul li:hover .title:after { - opacity: 1; - -webkit-transition: opacity 0.5s; - -moz-transition: opacity 0.5s; - -o-transition: opacity 0.5s; - transition: opacity 0.5s; -} -.resource-stack-layout .section-card-menu .card-info ul li:hover .description { - max-height: 30px; - opacity: 1; - -webkit-transition: max-height 0.5s, opacity 1s; - -moz-transition: max-height 0.5s, opacity 1s; - -o-transition: max-height 0.5s, opacity 1s; - transition: max-height 0.5s, opacity 1s; -} -.resource-stack-layout .section-card-menu .card-info .title { - font-size: 16px; - margin-bottom: -2px; - position: relative; -} -.resource-stack-layout .section-card-menu .card-info .title:after { - background: url(../images/stack-arrow-right.png); - content: ''; - opacity: 0; - -webkit-transition: opacity 0.25s; - -moz-transition: opacity 0.25s; - -o-transition: opacity 0.25s; - transition: opacity 0.25s; - position: absolute; - right: 0px; - top: 3px; - width: 10px; - height: 15px; -} -.resource-stack-layout .section-card-menu .card-info .title.more { - text-transform: uppercase; - color: #898989; - display: inline-block; -} -.resource-stack-layout .section-card-menu .card-info .title.more:after { - background: url(../images/stack-arrow-right.png); - content: ''; - display: block; - position: absolute; - right: -20px; - top: 3px; - width: 10px; - height: 15px; -} -.resource-stack-layout .section-card-menu .card-info .description { - max-height: 0px; - opacity: 0; - overflow: hidden; - font-size: 13px; - line-height: 15px; - /* Hover off */ - -webkit-transition: max-height 0.5s, opacity 0.5s; - -moz-transition: max-height 0.5s, opacity 0.5s; - -o-transition: max-height 0.5s, opacity 0.5s; - transition: max-height 0.5s, opacity 0.5s; -} -.resource-stack-layout .section-card-menu .card-info .description .text { - height: 30px; -} -.resource-stack-layout:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} - -/* Generate the flow layout styles for a 3-column 16-col span */ -.resource-flow-layout.col-16 { - margin: 0 -14px 0 0; - width: 954px; -} -.resource-flow-layout.col-16 .resource-card, .resource-flow-layout.col-16 .resource-card-stack { - margin: 0 14px 20px 0; -} -.resource-flow-layout.col-16 .resource-card-row-stack-last { - margin-bottom: 0px !important; -} -.resource-flow-layout.col-16 .resource-card-col-stack-last { - margin-bottom: 0px !important; -} -.resource-flow-layout.col-16 .resource-card-3x6 { - width: 145px; - height: 284px; -} -.resource-flow-layout.col-16 .resource-card-3x12 { - width: 145px; - height: 588px; -} -.resource-flow-layout.col-16 .resource-card-3x18 { - width: 145px; - height: 892px; -} -.resource-flow-layout.col-16 .resource-card-6x6 { - width: 304px; - height: 284px; -} -.resource-flow-layout.col-16 .resource-card-6x12 { - width: 304px; - height: 588px; -} -.resource-flow-layout.col-16 .resource-card-6x18 { - width: 304px; - height: 892px; -} -.resource-flow-layout.col-16 .resource-card-9x6 { - width: 463px; - height: 284px; -} -.resource-flow-layout.col-16 .resource-card-9x12 { - width: 463px; - height: 588px; -} -.resource-flow-layout.col-16 .resource-card-9x18 { - width: 463px; - height: 892px; -} -.resource-flow-layout.col-16 .resource-card-12x6 { - width: 622px; - height: 284px; -} -.resource-flow-layout.col-16 .resource-card-12x12 { - width: 622px; - height: 588px; -} -.resource-flow-layout.col-16 .resource-card-12x18 { - width: 622px; - height: 892px; -} -.resource-flow-layout.col-16 .resource-card-15x6 { - width: 781px; - height: 284px; -} -.resource-flow-layout.col-16 .resource-card-15x12 { - width: 781px; - height: 588px; -} -.resource-flow-layout.col-16 .resource-card-15x18 { - width: 781px; - height: 892px; -} -.resource-flow-layout.col-16 .resource-card-18x6 { - width: 940px; - height: 284px; -} -.resource-flow-layout.col-16 .resource-card-18x12 { - width: 940px; - height: 420px; -} -.resource-flow-layout.col-16 .resource-card-18x18 { - width: 940px; - height: 892px; -} -.resource-flow-layout.col-16 .resource-card-3x2 { - width: 145px; - height: 95px; -} -.resource-flow-layout.col-16 .resource-card-3x2x3 { - width: 145px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-16 .resource-card-3x3 { - width: 145px; - height: 142px; -} -.resource-flow-layout.col-16 .resource-card-3x3x2 { - width: 145px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-16 .resource-card-6x2 { - width: 304px; - height: 95px; -} -.resource-flow-layout.col-16 .resource-card-6x2x3 { - width: 304px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-16 .resource-card-6x3 { - width: 304px; - height: 142px; -} -.resource-flow-layout.col-16 .resource-card-6x3x2 { - width: 304px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-16 .resource-card-9x2 { - width: 463px; - height: 95px; -} -.resource-flow-layout.col-16 .resource-card-9x2x3 { - width: 463px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-16 .resource-card-9x3 { - width: 463px; - height: 142px; -} -.resource-flow-layout.col-16 .resource-card-9x3x2 { - width: 463px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-16 .resource-card-12x2 { - width: 622px; - height: 95px; -} -.resource-flow-layout.col-16 .resource-card-12x2x3 { - width: 622px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-16 .resource-card-12x3 { - width: 622px; - height: 142px; -} -.resource-flow-layout.col-16 .resource-card-12x3x2 { - width: 622px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-16 .resource-card-15x2 { - width: 781px; - height: 95px; -} -.resource-flow-layout.col-16 .resource-card-15x2x3 { - width: 781px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-16 .resource-card-15x3 { - width: 781px; - height: 142px; -} -.resource-flow-layout.col-16 .resource-card-15x3x2 { - width: 781px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-16 .resource-card-18x2 { - width: 940px; - height: 95px; -} -.resource-flow-layout.col-16 .resource-card-18x2x3 { - width: 940px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-16 .resource-card-18x3 { - width: 940px; - height: 142px; -} -.resource-flow-layout.col-16 .resource-card-18x3x2 { - width: 940px; - height: 138px; - margin-bottom: 8px; -} - -/* Generate the flow layout styles for a 3-column 16-col span */ -.resource-flow-layout.col-12 { - margin: 0 -14px 0 0; - width: 714px; -} - -.resource-flow-layout.col-12 .resource-card, .resource-flow-layout.col-12 .resource-card-stack { - margin: 0 14px 20px 0; -} -.resource-flow-layout.col-12 .resource-card-row-stack-last { - margin-bottom: 0px !important; -} -.resource-flow-layout.col-12 .resource-card-col-stack-last { - margin-bottom: 0px !important; -} -.resource-flow-layout.col-12 .resource-card-3x6 { - width: 105px; - height: 284px; -} -.resource-flow-layout.col-12 .resource-card-3x12 { - width: 105px; - height: 588px; -} -.resource-flow-layout.col-12 .resource-card-3x18 { - width: 105px; - height: 892px; -} -.resource-flow-layout.col-12 .resource-card-6x6 { - width: 224px; - height: 284px; -} -.resource-flow-layout.col-12 .resource-card-6x12 { - width: 224px; - height: 588px; -} -.resource-flow-layout.col-12 .resource-card-6x18 { - width: 224px; - height: 892px; -} -.resource-flow-layout.col-12 .resource-card-9x6 { - width: 343px; - height: 284px; -} -.resource-flow-layout.col-12 .resource-card-9x12 { - width: 343px; - height: 588px; -} -.resource-flow-layout.col-12 .resource-card-9x18 { - width: 343px; - height: 892px; -} -.resource-flow-layout.col-12 .resource-card-12x6 { - width: 462px; - height: 284px; -} -.resource-flow-layout.col-12 .resource-card-12x12 { - width: 462px; - height: 588px; -} -.resource-flow-layout.col-12 .resource-card-12x18 { - width: 462px; - height: 892px; -} -.resource-flow-layout.col-12 .resource-card-15x6 { - width: 581px; - height: 284px; -} -.resource-flow-layout.col-12 .resource-card-15x12 { - width: 581px; - height: 588px; -} -.resource-flow-layout.col-12 .resource-card-15x18 { - width: 581px; - height: 892px; -} -.resource-flow-layout.col-12 .resource-card-18x6 { - width: 700px; - height: 284px; -} -.resource-flow-layout.col-12 .resource-card-18x12 { - width: 700px; - height: 420px; -} -.resource-flow-layout.col-12 .resource-card-18x18 { - width: 700px; - height: 892px; -} -.resource-flow-layout.col-12 .resource-card-3x2 { - width: 105px; - height: 95px; -} -.resource-flow-layout.col-12 .resource-card-3x2x3 { - width: 105px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-12 .resource-card-3x3 { - width: 105px; - height: 142px; -} -.resource-flow-layout.col-12 .resource-card-3x3x2 { - width: 105px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-12 .resource-card-6x2 { - width: 224px; - height: 95px; -} -.resource-flow-layout.col-12 .resource-card-6x2x3 { - width: 224px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-12 .resource-card-6x3 { - width: 224px; - height: 142px; -} -.resource-flow-layout.col-12 .resource-card-6x3x2 { - width: 224px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-12 .resource-card-9x2 { - width: 343px; - height: 95px; -} -.resource-flow-layout.col-12 .resource-card-9x2x3 { - width: 343px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-12 .resource-card-9x3 { - width: 343px; - height: 142px; -} -.resource-flow-layout.col-12 .resource-card-9x3x2 { - width: 343px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-12 .resource-card-12x2 { - width: 462px; - height: 95px; -} -.resource-flow-layout.col-12 .resource-card-12x2x3 { - width: 462px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-12 .resource-card-12x3 { - width: 462px; - height: 142px; -} -.resource-flow-layout.col-12 .resource-card-12x3x2 { - width: 462px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-12 .resource-card-15x2 { - width: 581px; - height: 95px; -} -.resource-flow-layout.col-12 .resource-card-15x2x3 { - width: 581px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-12 .resource-card-15x3 { - width: 581px; - height: 142px; -} -.resource-flow-layout.col-12 .resource-card-15x3x2 { - width: 581px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-12 .resource-card-18x2 { - width: 700px; - height: 95px; -} -.resource-flow-layout.col-12 .resource-card-18x2x3 { - width: 700px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-12 .resource-card-18x3 { - width: 700px; - height: 142px; -} -.resource-flow-layout.col-12 .resource-card-18x3x2 { - width: 700px; - height: 138px; - margin-bottom: 8px; -} - -/* Generate the flow layout styles for a 3-column 13-col span */ - -.resource-flow-layout.col-13 { - margin: 0 -14px 0 0; - width: 774px; -} -.resource-flow-layout.col-13 .resource-card, .resource-flow-layout.col-13 .resource-card-stack { - margin: 0 14px 20px 0; -} -.resource-flow-layout.col-13 .resource-card-row-stack-last { - margin-bottom: 0px !important; -} -.resource-flow-layout.col-13 .resource-card-col-stack-last { - margin-bottom: 0px !important; -} -.resource-flow-layout.col-13 .resource-card-3x6 { - width: 115px; - height: 284px; -} -.resource-flow-layout.col-13 .resource-card-3x12 { - width: 115px; - height: 588px; -} -.resource-flow-layout.col-13 .resource-card-3x18 { - width: 115px; - height: 892px; -} -.resource-flow-layout.col-13 .resource-card-6x6 { - width: 244px; - height: 284px; -} -.resource-flow-layout.col-13 .resource-card-6x12 { - width: 244px; - height: 588px; -} -.resource-flow-layout.col-13 .resource-card-6x18 { - width: 244px; - height: 892px; -} -.resource-flow-layout.col-13 .resource-card-9x6 { - width: 373px; - height: 284px; -} -.resource-flow-layout.col-13 .resource-card-9x12 { - width: 373px; - height: 588px; -} -.resource-flow-layout.col-13 .resource-card-9x18 { - width: 373px; - height: 892px; -} -.resource-flow-layout.col-13 .resource-card-12x6 { - width: 502px; - height: 284px; -} -.resource-flow-layout.col-13 .resource-card-12x12 { - width: 502px; - height: 588px; -} -.resource-flow-layout.col-13 .resource-card-12x18 { - width: 502px; - height: 892px; -} -.resource-flow-layout.col-13 .resource-card-15x6 { - width: 631px; - height: 284px; -} -.resource-flow-layout.col-13 .resource-card-15x12 { - width: 631px; - height: 588px; -} -.resource-flow-layout.col-13 .resource-card-15x18 { - width: 631px; - height: 892px; -} -.resource-flow-layout.col-13 .resource-card-18x6 { - width: 760px; - height: 284px; -} -.resource-flow-layout.col-13 .resource-card-18x12 { - width: 760px; - height: 420px; -} -.resource-flow-layout.col-13 .resource-card-18x18 { - width: 760px; - height: 892px; -} -.resource-flow-layout.col-13 .resource-card-3x2 { - width: 115px; - height: 95px; -} -.resource-flow-layout.col-13 .resource-card-3x2x3 { - width: 115px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-13 .resource-card-3x3 { - width: 115px; - height: 142px; -} -.resource-flow-layout.col-13 .resource-card-3x3x2 { - width: 115px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-13 .resource-card-6x2 { - width: 244px; - height: 95px; -} -.resource-flow-layout.col-13 .resource-card-6x2x3 { - width: 244px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-13 .resource-card-6x3 { - width: 244px; - height: 142px; -} -.resource-flow-layout.col-13 .resource-card-6x3x2 { - width: 244px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-13 .resource-card-9x2 { - width: 373px; - height: 95px; -} -.resource-flow-layout.col-13 .resource-card-9x2x3 { - width: 373px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-13 .resource-card-9x3 { - width: 373px; - height: 142px; -} -.resource-flow-layout.col-13 .resource-card-9x3x2 { - width: 373px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-13 .resource-card-12x2 { - width: 502px; - height: 95px; -} -.resource-flow-layout.col-13 .resource-card-12x2x3 { - width: 502px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-13 .resource-card-12x3 { - width: 502px; - height: 142px; -} -.resource-flow-layout.col-13 .resource-card-12x3x2 { - width: 502px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-13 .resource-card-15x2 { - width: 631px; - height: 95px; -} -.resource-flow-layout.col-13 .resource-card-15x2x3 { - width: 631px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-13 .resource-card-15x3 { - width: 631px; - height: 142px; -} -.resource-flow-layout.col-13 .resource-card-15x3x2 { - width: 631px; - height: 138px; - margin-bottom: 8px; -} -.resource-flow-layout.col-13 .resource-card-18x2 { - width: 760px; - height: 95px; -} -.resource-flow-layout.col-13 .resource-card-18x2x3 { - width: 760px; - height: 90px; - margin-bottom: 7px; -} -.resource-flow-layout.col-13 .resource-card-18x3 { - width: 760px; - height: 142px; -} -.resource-flow-layout.col-13 .resource-card-18x3x2 { - width: 760px; - height: 138px; - margin-bottom: 8px; -} - -/* - The following are styles for cards in the flowlayout above, styled by the number of rows they span -*/ -/* Single row items, might be simpler to just apply a class */ -.resource-card-3x6 > .card-bg, .resource-card-6x6 > .card-bg, .resource-card-9x6 > .card-bg, .resource-card-12x6 > .card-bg, .resource-card-15x6 > .card-bg, .resource-card-18x6 > .card-bg { - height: 192px; -} -.resource-card-3x6 > .card-info, .resource-card-6x6 > .card-info, .resource-card-9x6 > .card-info, .resource-card-12x6 > .card-info, .resource-card-15x6 > .card-info, .resource-card-18x6 > .card-info { - padding: 4px 12px 6px 12px; - top: 192px; -} -.resource-card-3x6 > .card-info .section, .resource-card-6x6 > .card-info .section, .resource-card-9x6 > .card-info .section, .resource-card-12x6 > .card-info .section, .resource-card-15x6 > .card-info .section, .resource-card-18x6 > .card-info .section { - font-size: 12px; - margin-bottom: 1px; -} -.resource-card-3x6 > .card-info .title, .resource-card-6x6 > .card-info .title, .resource-card-9x6 > .card-info .title, .resource-card-12x6 > .card-info .title, .resource-card-15x6 > .card-info .title, .resource-card-18x6 > .card-info .title { - font-size: 16px; - margin-bottom: -2px; -} -.resource-card-3x6 > .card-info .description, .resource-card-6x6 > .card-info .description, .resource-card-9x6 > .card-info .description, .resource-card-12x6 > .card-info .description, .resource-card-15x6 > .card-info .description, .resource-card-18x6 > .card-info .description { - font-size: 13px; - line-height: 15px; -} -.resource-card-3x6 > .card-info .description .text, .resource-card-6x6 > .card-info .description .text, .resource-card-9x6 > .card-info .description .text, .resource-card-12x6 > .card-info .description .text, .resource-card-15x6 > .card-info .description .text, .resource-card-18x6 > .card-info .description .text { - height: 30px; -} - -/* Double row items */ -.resource-card-3x12 > .card-bg, .resource-card-6x12 > .card-bg, .resource-card-9x12 > .card-bg, .resource-card-12x12 > .card-bg, .resource-card-15x12 > .card-bg, .resource-card-18x12 > .card-bg { - height: 320px; -} -.resource-card-3x12 > .card-info, .resource-card-6x12 > .card-info, .resource-card-9x12 > .card-info, .resource-card-12x12 > .card-info, .resource-card-15x12 > .card-info, .resource-card-18x12 > .card-info { - padding: 4px 12px 6px 12px; - top: 320px; -} -.resource-card-3x12 > .card-info .section, .resource-card-6x12 > .card-info .section, .resource-card-9x12 > .card-info .section, .resource-card-12x12 > .card-info .section, .resource-card-15x12 > .card-info .section, .resource-card-18x12 > .card-info .section { - font-size: 12px; - margin-bottom: 1px; -} -.resource-card-3x12 > .card-info .title, .resource-card-6x12 > .card-info .title, .resource-card-9x12 > .card-info .title, .resource-card-12x12 > .card-info .title, .resource-card-15x12 > .card-info .title, .resource-card-18x12 > .card-info .title { - font-size: 16px; - margin-bottom: -2px; - white-space: normal; -} -.resource-card-3x12 > .card-info .description, .resource-card-6x12 > .card-info .description, .resource-card-9x12 > .card-info .description, .resource-card-12x12 > .card-info .description, .resource-card-15x12 > .card-info .description, .resource-card-18x12 > .card-info .description { - font-size: 13px; - line-height: 15px; -} - -/* 1/3 row items */ -.resource-card-3x2 > .card-bg, .resource-card-6x2 > .card-bg, .resource-card-9x2 > .card-bg, .resource-card-12x2 > .card-bg, .resource-card-15x2 > .card-bg, .resource-card-18x2 > .card-bg { - left: 0; - top: 0; - width: 90px; - height: 100%; - position: absolute; - display: block; -} -.resource-card-3x2 > .card-info, .resource-card-6x2 > .card-info, .resource-card-9x2 > .card-info, .resource-card-12x2 > .card-info, .resource-card-15x2 > .card-info, .resource-card-18x2 > .card-info { - left: 90px; - padding: 4px 12px 4px 12px; - height: 80px; - overflow: hidden; -} -.resource-card-3x2 > .card-info .section, .resource-card-6x2 > .card-info .section, .resource-card-6x3 > .card-info .section, .resource-card-9x2 > .card-info .section, .resource-card-12x2 > .card-info .section, .resource-card-15x2 > .card-info .section, .resource-card-18x2 > .card-info .section { - font-size: 12px; - margin-bottom: 1px; - /* display: none; */ -} -.resource-card-3x2 > .card-info .title, .resource-card-6x2 > .card-info .title, .resource-card-9x2 > .card-info .title, .resource-card-12x2 > .card-info .title, .resource-card-15x2 > .card-info .title, .resource-card-18x2 > .card-info .title { - font-size: 16px; - margin-bottom: -2px; - white-space: normal; - overflow: visible; - text-overflow: ellipsis; -} -.resource-card-3x2 > .card-info .title:after, .resource-card-6x2 > .card-info .title:after, .resource-card-9x2 > .card-info .title:after, .resource-card-12x2 > .card-info .title:after, .resource-card-15x2 > .card-info .title:after, .resource-card-18x2 > .card-info .title:after { - /* content: url(../images/link-out.png); */ - display: block; -} -.resource-card-3x2 > .card-info .description, .resource-card-6x2 > .card-info .description, .resource-card-9x2 > .card-info .description, .resource-card-12x2 > .card-info .description, .resource-card-15x2 > .card-info .description, .resource-card-18x2 > .card-info .description { - 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; - top: 0; - width: 90px; - height: 100%; - position: absolute; - display: block; -} -.resource-card-3x3 > .card-info, .resource-card-6x3 > .card-info, .resource-card-9x3 > .card-info, .resource-card-12x3 > .card-info, .resource-card-15x3 > .card-info, .resource-card-18x3 > .card-info { - left: 90px; - padding: 4px 12px 0px 12px; -} -.resource-card-3x3 > .card-info .section, .resource-card-6x3 > .card-info .section, .resource-card-9x3 > .card-info .section, .resource-card-12x3 > .card-info .section, .resource-card-15x3 > .card-info .section, .resource-card-18x3 > .card-info .section { - font-size: 12px; - margin-bottom: 1px; - display: none; -} -.resource-card-3x3 > .card-info .title, .resource-card-6x3 > .card-info .title, .resource-card-9x3 > .card-info .title, .resource-card-12x3 > .card-info .title, .resource-card-15x3 > .card-info .title, .resource-card-18x3 > .card-info .title { - font-size: 16px; - margin-bottom: -2px; - white-space: normal; - overflow: visible; -} -.resource-card-3x3 > .card-info .description .text, .resource-card-6x3 > .card-info .description .text, .resource-card-9x3 > .card-info .description .text, .resource-card-12x3 > .card-info .description .text, .resource-card-15x3 > .card-info .description .text, .resource-card-18x3 > .card-info .description .text { - font-size: 12px; - line-height: 15px; - padding-right: 0px !important; - height: 80px; -} -.resource-card-3x3 > .card-info .description .util, .resource-card-6x3 > .card-info .description .util, .resource-card-9x3 > .card-info .description .util, .resource-card-12x3 > .card-info .description .util, .resource-card-15x3 > .card-info .description .util, .resource-card-18x3 > .card-info .description .util { - display: none; -} -/* placement of plusone */ -.resource-card-6x12 > .card-info .description .util, .resource-card-9x12 > .card-info .description .util, .resource-card-12x12 > .card-info .description .util, .resource-card-15x12 > .card-info .description .util { - bottom:2px; -} -.resource-card-18x12 > .card-info .description .util { - bottom:2px; -} -/* Overrides for col-16 6x6 cards linking to local content on landing pages. - Suppresses "section" and puts the title above a hairline rule. */ -.landing .card-info .section, .resource-flow-layout.col-16.landing .resource-card-9x6 .card-info .section { - display:none; -} -.landing .card-info .title { - color: #898989; - font-size: 17px; - line-height: 24px; - margin-bottom: 6px; - border-bottom: 1px solid #959595; - padding-bottom: 0px; -} -.landing .card-info .description { - font-size: 13px; - line-height: 15px; -} -.landing .card-info .description .text { -height:30px; -} -.landing .resource-card-6x6 > .card-info .description .util, .landing .resource-card-9x6 > .card-info .description .util { - bottom:2px; -} -/* - Generate a resource stack layout for a 3 column widget spanning 16 grid cols -*/ -.resource-stack-layout.col-16 { - margin: 0 -14px 0 0; - width: 954px; -} -.resource-stack-layout.col-16 .resource-card-stack { - margin: 0 14px 0 0; - width: 304px; -} - -/* Example of card menu tinting */ -.resource-widget[data-section=distribute\/tools] .section-card-menu -.card-bg:after { - background: rgba(126, 55, 148, 0.4) !important; -} -.resource-widget[data-section=distribute\/tools] .section-card-menu -.card-section-icon .icon { - background-color: #7e3794 !important; -} -.resource-widget[data-section=distribute\/tools] .section-card-menu -.card-info ul li { - border-top-color: #7e3794 !important; -} - -/* tinting for stacks */ - -div.jd-descr > .resource-widget[data-section=distribute\/tools] -.section-card-menu .card-info ul li { - border-top-color: #7e3794 !important; -} - - /** * UTILITIES @@ -6542,11 +4840,13 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] */ .landing-h1 { - font-weight: 100; - font-size: 60px; - line-height: 78px; + color: #44555d; + font-weight: 300; + font-size: 56px; + line-height: 80px; text-align: center; letter-spacing: -1px; + margin-bottom: 6px; } .landing-pre-h1 { @@ -6557,11 +4857,11 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] text-align: center; letter-spacing: -1px; text-transform: uppercase; - } .landing-h1.hero { text-align: left; + color: #fff; } .landing-h2 { @@ -6572,10 +4872,10 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] } .landing-subhead { - color: #999999; + color: #78868d; font-size: 20px; - line-height: 28px; - font-weight:300; + font-weight: 300; + line-height: 32px; text-align: center; } .landing-subhead.hero { @@ -6612,23 +4912,21 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] * LAYOUT */ -#body-content, -.fullpage, -#jd-content, -.jd-descr, -.landing-body-content { - height: 100%; -} - .landing-section { - padding: 80px 10px 80px; - width: 100%; - margin-left: -10px; + background: #eceff1; + clear: both; + padding: 80px 20px 80px; + margin: 0 -20px; text-rendering: optimizeLegibility; } -#extending-android-to-wearables { - padding-top: 30px; +@media (max-width: 719px) { + .responsive .landing-section { + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + } } .landing-short-section { @@ -6636,7 +4934,7 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] } .landing-gray-background { - background-color: #e9e9e9; + background-color: #b0bec5; } .landing-white-background { @@ -6648,24 +4946,19 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] background-color: hsl(8, 70%, 54%); } -.landing-subhead-red { - color: hsl(8, 71%, 84%); - text-align: left; -} - -.landing-subhead-red p { - margin-top: 20px; +.landing-red-background .landing-h1 { + color: white; } -.landing-hero-container { - height: 100%; +.landing-red-background .landing-subhead { + color: hsl(8, 71%, 84%); + text-align: left; } .preview-hero { - height: calc(100% - 110px); + height: calc(100vh - 128px); min-height: 504px; - margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../preview/images/hero.jpg); @@ -6677,9 +4970,8 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] } .wear-hero { - height: calc(100% - 110px); + height: calc(100vh - 128px); min-height: 504px; - margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../wear/images/hero.jpg); @@ -6691,9 +4983,8 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] } .tv-hero { - height: calc(100% - 110px); + height: calc(100vh - 128px); min-height: 504px; - margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../tv/images/hero.jpg); @@ -6705,9 +4996,8 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] } .auto-hero { - height: calc(100% - 110px); + height: calc(100vh - 128px); min-height: 504px; - margin-top: -5px; padding-top: 0; padding-bottom: 0; background-image: url(../../auto/images/hero.jpg); @@ -6720,16 +5010,16 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] .landing-hero-scrim { background: black; - opacity: .2; + height: 100%; + left: 0; position: absolute; + opacity: .2; width: 100%; - height: 100%; - margin-left: -10px; } .landing-hero-wrap { margin: 0 auto; - width: 940px; + max-width: 940px; clear: both; height: 100%; position: relative; @@ -6916,17 +5206,6 @@ a.landing-button:visited { margin-bottom: 20px; } -.col-3-wide { - display: inline; - float: left; - margin-left: 10px; - margin-right: 10px; -} - -.col-3-wide { - width: 302px; -} - /** * ANIMATION */ @@ -6970,7 +5249,7 @@ a.landing-button:visited { } #video-frame { - width:940px; + max-width:940px; height:100%; margin:72px auto; display:none; @@ -7041,8 +5320,7 @@ Styles for d.a.c/index: /* Generic full screen carousel styling to be used across pages. */ .fullscreen-carousel { - margin: 0 -10px; - width: 100%; + margin: 0 -20px; overflow: hidden; position: relative; } @@ -7081,7 +5359,6 @@ Styles for d.a.c/index: font-weight: 300; font-size: 18px; line-height: 24px; - -webkit-font-smoothing: antialiased; } .fullscreen-carousel .hero .hero-bg { @@ -7215,48 +5492,19 @@ Styles for d.a.c/index: } - - - -/* - Styles for the entity link used in the actions bar and in the cta of - the resources that appear in the tab carousel. -*/ -.actions-bar a:after, -.resource .cta:after { - content: '›'; - font-weight: 400; - font-size: 22px; - left: 5px; - line-height: 1; - position: relative; - top: 1px; - transition: left 190ms ease-out; -} - -.actions-bar a:hover:after, -.resource .cta:hover:after { - left: 10px; -} - - - - /* Styles for the actions bar. */ .actions-bar { - background: #9acd00; - margin: 0 -10px; + background: #b0bec5; text-align: center; } .actions-bar .actions { - padding: 30px 0 30px; + padding: 24px 0; text-align: justify; font-size: 0.1px; line-height: 0.1px; - margin: 0 10px 0 0; } .actions-bar .actions:after { @@ -7270,23 +5518,28 @@ Styles for d.a.c/index: } .actions-bar a { - font-size: 21px; - line-height: 27px; + font-size: 24px; + line-height: 50px; color: #fff; font-weight: 300; - -webkit-font-smoothing: antialiased; } -.actions-bar a:after { - top: 0px; - font-size: 22px; +.actions-bar .dac-sprite { + margin: 0 -6px 0 -12px; + -webkit-transition: all 190ms ease-out; + transition: all 190ms ease-out; } -.actions-bar a:hover { - color: #fff !important; -} +.actions-bar a:hover .dac-sprite { + transform: translateX(5px); +} +@media (max-width: 719px) { + .responsive .actions-bar .actions > div { + display: block; + } +} @@ -7450,3 +5703,3043 @@ a.home-new-cta-btn:hover, .resource-card-6x2 > .card-bg.helpouts-card-bg:after { display:none; } + +.dac-visible-mobile-block, .dac-mobile-only, .dac-visible-mobile-inline, .dac-visible-mobile-inline-block, .dac-visible-tablet-block, .dac-visible-tablet-inline, .dac-visible-tablet-inline-block, .dac-visible-desktop-block, .dac-visible-desktop-inline, .dac-visible-desktop-inline-block { + display: none !important; +} + +@media (max-width: 719px) { + .responsive .dac-hidden-mobile { + display: none !important; + } + + .responsive .dac-visible-mobile-block, .responsive .dac-mobile-only { + display: block !important; + } + + .responsive .dac-visible-mobile-inline { + display: inline !important; + } + + .responsive .dac-visible-mobile-inline-block { + display: inline-block !important; + } +} + +@media (min-width: 720px) and (max-width: 979px) { + .responsive .dac-hidden-tablet { + display: none !important; + } + + .responsive .dac-visible-tablet-block { + display: block !important; + } + + .responsive .dac-visible-tablet-inline { + display: inline !important; + } + + .responsive .dac-visible-tablet-inline-block { + display: inline-block !important; + } +} + +@media (min-width: 980px) { + .responsive .dac-hidden-desktop { + display: none !important; + } + + .responsive .dac-visible-desktop-block { + display: block !important; + } + + .responsive .dac-visible-desktop-inline { + display: inline !important; + } + + .responsive .dac-visible-desktop-inline-block { + display: inline-block !important; + } +} + +/* New CSS */ +/************ RESOURCE CARDS ******************/ +/* Basic card-styling with shadow */ +.resource-card { + background: #fff; + box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.21); + display: block; + position: relative; +} + +/* Styling for background image including tinting and section icons in stacks */ +.card-bg { + bottom: 131px; + display: block; + position: absolute; + vertical-align: top; + width: 100%; + left: 0; + top: 0; + background-size: cover; + background-repeat: no-repeat; + background-position: center; + background-image: url(../images/resource-card-default-android.jpg); +} + +.card-bg:after { + content: ""; + display: block; + height: 100%; + width: 100%; + opacity: 1; + background: rgba(0, 0, 0, 0.05); + -webkit-transition: opacity 0.5s; + transition: opacity 0.5s; +} + +.static .card-bg:after { + display: none; +} + +.card-bg .card-section-icon { + position: absolute; + top: 50%; + width: 100%; + margin-top: -35px; + text-align: center; + padding-top: 65px; + z-index: 100; +} + +.card-bg .card-section-icon .icon { + position: absolute; + left: 50%; + margin-left: -28px; + top: 0px; + width: 56px; + height: 56px; + background-repeat: no-repeat; + background-position: 50% 50%; + background-image: url(../images/stack-icon.png); +} + +.card-bg .card-section-icon .section { + text-transform: uppercase; + color: white; + font-size: 14px; +} + +.card-info { + position: absolute; + box-sizing: border-box; + height: 131px; + right: 0; + bottom: 0; + left: 0; + overflow: hidden; + background: #fefefe; + padding: 6px 12px; +} + +.card-info .section { + color: #898989; + font-size: 11px; + font-weight: 700; + letter-spacing: 0.77px; + line-height: 20px; + text-transform: uppercase; +} + +.card-info .title { + color: #333; + font-size: 18px; + font-weight: 500; + line-height: 24px; + margin-bottom: 2px; + max-height: 48px; + overflow: hidden; + padding-bottom: 5px; + text-overflow: ellipsis; + white-space: normal; +} + +.card-info .description { + overflow: hidden; +} + +.card-info .description .text { + color: #666; + font-size: 14px; + height: 60px; + line-height: 20px; + overflow: hidden; + width: 100%; +} + +.card-info .description .util { + position: absolute; + right: 5px; + bottom: 70px; + opacity: 0; + -webkit-transition: opacity 0.5s; + transition: opacity 0.5s; +} + +.card-info.empty-desc .title { + white-space: normal; + overflow: visible; +} + +.card-info.empty-desc .description { + display: none; +} + +/* Truncate card summaries at bounding box and + * and apply ellipsis at lower right */ +.ellipsis { + overflow: hidden; + float: right; + line-height: 15px; + width: 100%; +} + +.ellipsis:before { + content: ""; + float: left; + width: 5px; + height: 100%; +} + +.ellipsis > *:first-child.text { + float: right; + width: 100% !important; + margin-left: -5px; +} + +.ellipsis:after { + content: "\02026"; + height: 17px; + padding-bottom: 4px; + box-sizing: content-box; + float: right; + position: relative; + top: -16px; + left: 100%; + width: 4em; + margin-left: -4em; + padding-right: 5px; + background: -webkit-gradient(linear, left top, right top, from(rgba(255, 255, 255, 0)), to(white), color-stop(65%, white)); + background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0), white 65%, white); + background: linear-gradient(to right, rgba(255, 255, 255, 0), white 65%, white); +} + +.ellipsis:after { + font-style: normal; + color: #aaa; + font-size: 13px; + text-align: right; +} + +.resource-card:hover { + cursor: pointer; +} + +.static .resource-card:hover { + cursor: auto; +} + +.resource-card:hover .card-bg:after { + opacity: 0; +} + +.resource-card:hover .card-info .description .util { + opacity: 1; +} + +/* Carousel Layout */ +/* Carousel styles for landing page */ +.resource-carousel-layout { + height: 531px; + margin: 20px 0 20px 0; + padding: 0 !important; + position: relative; + overflow: hidden; +} + +.resource-carousel-layout .slideshow-prev, .resource-carousel-layout .slideshow-next { + display: none; +} + +.resource-carousel-layout .pagination { + bottom: 97px; + left: auto; + padding-right: 10px; + right: 0; + text-align: right; + width: 16.66666667%; +} + +.resource-carousel-layout .pagination ul li { + text-indent: 8000px; +} + +.resource-carousel-layout .frame li { + position: relative; +} + +.resource-carousel-layout .frame li .card-bg { + bottom: 131px; +} + +.resource-carousel-layout .frame li .card-info { + height: 131px; + padding: 6px 12px; + top: auto; +} + +.resource-carousel-layout .frame li .card-info .title { + font-size: 28px; + font-weight: 400; + line-height: 32px; +} + +.resource-carousel-layout .frame li .card-info .description .text { + height: 40px; +} + +.resource-carousel-layout .frame li .card-info .description .util { + bottom: 97px; + right: 4px; +} + +/* Stack Layout */ +.resource-stack-layout { + display: inline-block; + padding: 0; +} + +.resource-stack-layout .section-card-menu > .card-info .section, .resource-stack-layout .section-card > .card-info .title { + /*text-transform: uppercase;*/ + color: #898989; + font-size: 17px; + line-height: 24px; + margin-bottom: 6px; +} + +.resource-stack-layout .section-card { + height: 284px; +} + +.resource-stack-layout .section-card > .card-bg { + height: 192px; +} + +.resource-stack-layout .section-card > .card-info { + padding: 4px 12px 6px 12px; + top: 192px; +} + +.resource-stack-layout .section-card > .card-info .section { + display: none; +} + +.resource-stack-layout .section-card > .card-info .title { + font-size: 17px; + border-bottom: 1px solid #959595; + padding-bottom: 0px; +} + +.resource-stack-layout .section-card > .card-info .description { + font-size: 13px; + line-height: 15px; +} + +.resource-stack-layout .section-card > .card-info .description .text { + height: 30px; +} + +.resource-stack-layout .related-card { + height: 90px; +} + +.resource-stack-layout .related-card > .card-bg { + left: 0; + top: 0; + width: 90px; + height: 100%; + position: absolute; + display: block; +} + +.resource-stack-layout .related-card > .card-info { + left: 90px; + padding: 4px 12px 4px 12px; +} + +.resource-stack-layout .related-card > .card-info .section { + font-size: 12px; + margin-bottom: 1px; + display: none; +} + +.resource-stack-layout .related-card > .card-info .title { + font-size: 16px; + margin-bottom: -2px; + white-space: normal; + overflow: visible; + text-overflow: ellipsis; +} + +.resource-stack-layout .related-card > .card-info .title:after { + content: url(../images/link-out.png); + display: block; +} + +.resource-stack-layout .related-card > .card-info .description { + display: none; +} + +.resource-stack-layout .section-card-menu { + /* Flexible height */ + display: block; + height: auto; + width: auto; +} + +.resource-stack-layout .section-card-menu .card-bg { + height: 155px; + /* Flexible height */ + position: relative; + display: inline-block; + vertical-align: top; +} + +.resource-stack-layout .section-card-menu .card-info { + padding: 4px 12px 0px 12px; + /* Flexible height */ + position: relative; + left: auto; + top: auto; + right: auto; + bottom: auto; +} + +.resource-stack-layout .section-card-menu .card-info ul { + list-style: none; + margin: 0; +} + +.resource-stack-layout .section-card-menu .card-info ul li { + list-style: none; + margin: 0; + padding: 15px 0; + border-top-width: 1px; + border-top-style: solid; + border-top-color: #959595; +} + +.resource-stack-layout .section-card-menu .card-info ul li a, .resource-stack-layout .section-card-menu .card-info ul li a:focus, .resource-stack-layout .section-card-menu .card-info ul li a:link, .resource-stack-layout .section-card-menu .card-info ul li a:visited, .resource-stack-layout .section-card-menu .card-info ul li a:active, .resource-stack-layout .section-card-menu .card-info ul li a:hover { + color: #333 !important; +} + +.resource-stack-layout .section-card-menu .card-info ul li:first-child { + border-top: none; +} + +.resource-stack-layout .section-card-menu .card-info ul li:hover .title:after { + opacity: 1; + -webkit-transition: opacity 0.5s; + transition: opacity 0.5s; +} + +.resource-stack-layout .section-card-menu .card-info ul li:hover .description { + max-height: 30px; + opacity: 1; + -webkit-transition: max-height 0.5s, opacity 1s; + transition: max-height 0.5s, opacity 1s; +} + +.resource-stack-layout .section-card-menu .card-info .title { + font-size: 16px; + margin-bottom: -2px; + position: relative; +} + +.resource-stack-layout .section-card-menu .card-info .title:after { + background: url(../images/stack-arrow-right.png); + content: ''; + opacity: 0; + -webkit-transition: opacity 0.25s; + transition: opacity 0.25s; + position: absolute; + right: 0px; + top: 3px; + width: 10px; + height: 15px; +} + +.resource-stack-layout .section-card-menu .card-info .title.more { + text-transform: uppercase; + color: #898989; + display: inline-block; +} + +.resource-stack-layout .section-card-menu .card-info .title.more:after { + background: url(../images/stack-arrow-right.png); + content: ''; + display: block; + position: absolute; + right: -20px; + top: 3px; + width: 10px; + height: 15px; +} + +.resource-stack-layout .section-card-menu .card-info .description { + max-height: 0px; + opacity: 0; + overflow: hidden; + font-size: 13px; + line-height: 15px; + /* Hover off */ + -webkit-transition: max-height 0.5s, opacity 0.5s; + transition: max-height 0.5s, opacity 0.5s; +} + +.resource-stack-layout .section-card-menu .card-info .description .text { + height: 30px; +} + +.resource-stack-layout:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + +.resource-card, .resource-card-stack { + margin-bottom: 20px; +} + +.resource-card-row-stack-last { + margin-bottom: 0px !important; +} + +.resource-card-col-stack-last { + margin-bottom: 0px !important; +} + +.resource-card-3x6 { + height: 300px; +} + +.resource-card-3x12 { + height: 620px; +} + +.resource-card-3x18 { + height: 940px; +} + +.resource-card-6x6 { + height: 300px; +} + +.resource-card-6x12 { + height: 620px; +} + +.resource-card-6x18 { + height: 940px; +} + +.resource-card-9x6 { + height: 300px; +} + +.resource-card-9x12 { + height: 620px; +} + +.resource-card-9x18 { + height: 940px; +} + +.resource-card-12x6 { + height: 300px; +} + +.resource-card-12x12 { + height: 620px; +} + +.resource-card-12x18 { + height: 940px; +} + +.resource-card-15x6 { + height: 300px; +} + +.resource-card-15x12 { + height: 620px; +} + +.resource-card-15x18 { + height: 940px; +} + +.resource-card-18x6 { + height: 300px; +} + +.resource-card-18x12 { + height: 620px; +} + +.resource-card-18x18 { + height: 940px; +} + +.resource-card-3x2 { + height: 100px; +} + +.resource-card-3x2x3 { + height: 90px; + margin-bottom: 15px; +} + +.resource-card-3x3 { + height: 150px; +} + +.resource-card-3x3x2 { + height: 142px; + margin-bottom: 16px; +} + +.resource-card-6x2 { + height: 100px; +} + +.resource-card-6x2x3 { + height: 90px; + margin-bottom: 15px; +} + +.resource-card-6x3 { + height: 150px; +} + +.resource-card-6x3x2 { + height: 142px; + margin-bottom: 16px; +} + +.resource-card-9x2 { + height: 100px; +} + +.resource-card-9x2x3 { + height: 90px; + margin-bottom: 15px; +} + +.resource-card-9x3 { + height: 150px; +} + +.resource-card-9x3x2 { + height: 142px; + margin-bottom: 16px; +} + +.resource-card-12x2 { + height: 100px; +} + +.resource-card-12x2x3 { + height: 90px; + margin-bottom: 15px; +} + +.resource-card-12x3 { + height: 150px; +} + +.resource-card-12x3x2 { + height: 142px; + margin-bottom: 16px; +} + +.resource-card-15x2 { + height: 100px; +} + +.resource-card-15x2x3 { + height: 90px; + margin-bottom: 15px; +} + +.resource-card-15x3 { + height: 150px; +} + +.resource-card-15x3x2 { + height: 142px; + margin-bottom: 16px; +} + +.resource-card-18x2 { + height: 100px; +} + +.resource-card-18x2x3 { + height: 90px; + margin-bottom: 15px; +} + +.resource-card-18x3 { + height: 150px; +} + +.resource-card-18x3x2 { + height: 142px; + margin-bottom: 16px; +} + +/* + The following are styles for cards in the flowlayout above, styled by the number of rows they span +*/ +/* Single row, 2 column items. */ +.resource-card-9x6 { + height: 390px; +} + +/* Double row, 1 column items. Eg full width video thumbnails. */ +.resource-card-18x12 { + height: 558px; +} + +/* 1/3 row items */ +.resource-card-3x2 > .card-bg, .resource-card-6x2 > .card-bg, .resource-card-9x2 > .card-bg, .resource-card-12x2 > .card-bg, .resource-card-15x2 > .card-bg, .resource-card-18x2 > .card-bg { + left: 0; + top: 0; + width: 90px; + height: 100%; + position: absolute; + display: block; +} + +.resource-card-3x2 > .card-info, .resource-card-6x2 > .card-info, .resource-card-9x2 > .card-info, .resource-card-12x2 > .card-info, .resource-card-15x2 > .card-info, .resource-card-18x2 > .card-info { + height: 100%; + left: 90px; + padding: 6px 12px; + overflow: hidden; +} + +.resource-card-3x2 > .card-info .title, .resource-card-6x2 > .card-info .title, .resource-card-9x2 > .card-info .title, .resource-card-12x2 > .card-info .title, .resource-card-15x2 > .card-info .title, .resource-card-18x2 > .card-info .title { + max-height: 48px; + white-space: normal; +} + +.resource-card-3x2 > .card-info .description, .resource-card-6x2 > .card-info .description, .resource-card-9x2 > .card-info .description, .resource-card-12x2 > .card-info .description, .resource-card-15x2 > .card-info .description, .resource-card-18x2 > .card-info .description { + display: none; +} + +.resource-card-3x2 > .card-info .text, .resource-card-6x2 > .card-info .text, .resource-card-9x2 > .card-info .text, .resource-card-12x2 > .card-info .text, .resource-card-15x2 > .card-info .text, .resource-card-18x2 > .card-info .text { + height: auto; +} + +/* 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, .resource-card-6x3, .resource-card-9x3, .resource-card-12x3, .resource-card-15x3, .resource-card-18x3 { + height: 160px; +} + +.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; + top: 0; + width: 90px; + height: 100%; + position: absolute; + display: block; +} + +.resource-card-3x3 > .card-info, .resource-card-6x3 > .card-info, .resource-card-9x3 > .card-info, .resource-card-12x3 > .card-info, .resource-card-15x3 > .card-info, .resource-card-18x3 > .card-info { + height: 100%; + left: 90px; + padding: 6px 12px; +} + +.resource-card-3x3 > .card-info .section, .resource-card-6x3 > .card-info .section, .resource-card-9x3 > .card-info .section, .resource-card-12x3 > .card-info .section, .resource-card-15x3 > .card-info .section, .resource-card-18x3 > .card-info .section { + display: none; +} + +.resource-card-3x3 > .card-info .title, .resource-card-6x3 > .card-info .title, .resource-card-9x3 > .card-info .title, .resource-card-12x3 > .card-info .title, .resource-card-15x3 > .card-info .title, .resource-card-18x3 > .card-info .title { + max-height: 96px; + white-space: normal; +} + +.resource-card-3x3 > .card-info .text, .resource-card-6x3 > .card-info .text, .resource-card-9x3 > .card-info .text, .resource-card-12x3 > .card-info .text, .resource-card-15x3 > .card-info .text, .resource-card-18x3 > .card-info .text { + height: auto; +} + +.resource-card-3x3 > .card-info .util, .resource-card-6x3 > .card-info .util, .resource-card-9x3 > .card-info .util, .resource-card-12x3 > .card-info .util, .resource-card-15x3 > .card-info .util, .resource-card-18x3 > .card-info .util { + display: none; +} + +/* placement of plusone */ +.resource-card-6x12 > .card-info .description .util, .resource-card-9x12 > .card-info .description .util, .resource-card-12x12 > .card-info .description .util, .resource-card-15x12 > .card-info .description .util { + bottom: 2px; +} + +.resource-card-18x12 > .card-info .description .util { + bottom: 2px; +} + +/* Overrides for col-16 6x6 cards linking to local content on landing pages. + Suppresses "section". */ +.landing .card-info .section { + display: none; +} + +/* + Generate a resource stack layout for a 3 column widget spanning 16 grid cols +*/ +.resource-stack-layout.col-16 { + margin: 0 -14px 0 0; + width: 954px; +} + +.resource-stack-layout.col-16 .resource-card-stack { + margin: 0 14px 0 0; + width: 304px; +} + +/* Example of card menu tinting */ +.resource-widget[data-section=distribute\/tools] .section-card-menu .card-bg:after { + background: rgba(126, 55, 148, 0.4) !important; +} + +.resource-widget[data-section=distribute\/tools] .section-card-menu .card-section-icon .icon { + background-color: #7e3794 !important; +} + +.resource-widget[data-section=distribute\/tools] .section-card-menu .card-info ul li { + border-top-color: #7e3794 !important; +} + +/* tinting for stacks */ +div.jd-descr > .resource-widget[data-section=distribute\/tools] .section-card-menu .card-info ul li { + border-top-color: #7e3794 !important; +} + +.dac-fab { + background: #fff; + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.21); + box-sizing: border-box; + border-radius: 50%; + border: none; + cursor: pointer; + display: inline-block; + font-size: 0; + height: 36px; + line-height: 36px; + outline: 0; + padding: 0; + text-align: center; + -webkit-transition: box-shadow .3s; + transition: box-shadow .3s; + vertical-align: middle; + width: 36px; +} + +.dac-fab:hover, a:hover > .dac-fab { + box-shadow: 0 3px 8px rgba(0, 0, 0, 0.21); +} + +.dac-fab.dac-primary { + background: #00c7a0; +} + +.dac-fab.dac-large { + height: 54px; + line-height: 54px; + width: 54px; +} + +/* Footer component */ +.dac-footer { + border-top: 1px solid #f9f9f9; + color: #999; + font-size: 12px; + padding-bottom: 20px; +} + +.dac-footer a { + color: #999; +} + +.dac-footer p { + margin: 7px 0 0; +} + +.dac-footer-main { + padding: 30px 0; +} + +.dac-footer-reachout { + text-align: right; +} + +.dac-footer-contact, .dac-footer-social { + display: inline; +} + +.dac-footer-social-link + .dac-footer-social-link { + margin-left: 8px; +} + +.dac-footer a.dac-footer-getnews, .dac-footer a.dac-footer-contact-link { + color: #000; + cursor: pointer; + font-size: 20px; + font-weight: 300; + margin-right: 24px; + vertical-align: middle; +} + +.dac-footer-getnews > .dac-fab { + margin-left: 4px; +} + +.dac-footer-separator { + background: #f9f9f9; + margin: 0 0 12px; +} + +.dac-footer-links a + a:before { + content: '|'; + cursor: default; + margin: 0 10px 0 8px; +} + +.dac-footer .locales { + float: right; + margin: 0; +} + +.dac-footer .locales select { + background-color: #f9f9f9; + border: none; + border-radius: 0; + color: #999; + font-size: 12px; + height: auto; + margin-top: -2px; + padding: 8px 12px; +} + +@media (max-width: 719px) { + .responsive .dac-footer-reachout { + text-align: left; + } + + .responsive .dac-footer-social { + display: block; + } + + .responsive .dac-footer-social-link, .responsive .dac-footer-contact-link { + display: inline-block; + margin-top: 20px; + } + + .responsive .dac-footer .locales { + display: block; + float: none; + margin-top: 15px; + } +} + +/* ============================================================================= + Columns + ========================================================================== */ +.wrap { + margin: 0 auto; + max-width: 940px; + clear: both; +} + +.cols { + margin-left: -10px; + margin-right: -10px; + /** + * For modern browsers + * 1. The space content is one way to avoid an Opera bug when the + * contenteditable attribute is included anywhere else in the document. + * Otherwise it causes space to appear at the top and bottom of elements + * that are clearfixed. + * 2. The use of `table` rather than `block` is only necessary if using + * `:before` to contain the top-margins of child elements. + */ +} + +.cols:before, .cols:after { + content: ' '; + /* 1 */ + display: table; + /* 2 */ +} + +.cols:after { + clear: both; +} + +[class*=col-] { + box-sizing: border-box; + float: left; + min-height: 1px; + padding-left: 10px; + padding-right: 10px; + position: relative; +} + +.col-1 { + width: 6.25%; +} + +.col-2 { + width: 12.5%; +} + +.col-3 { + width: 18.75%; +} + +.col-4 { + width: 25%; +} + +.col-5 { + width: 31.25%; +} + +.col-6 { + width: 37.5%; +} + +.col-7 { + width: 43.75%; +} + +.col-8 { + width: 50%; +} + +.col-9 { + width: 56.25%; +} + +.col-10 { + width: 62.5%; +} + +.col-11 { + width: 68.75%; +} + +.col-12 { + width: 75%; +} + +.col-13 { + width: 81.25%; +} + +.col-14 { + width: 87.5%; +} + +.col-15 { + width: 93.75%; +} + +.col-16 { + width: 100%; +} + +.col-13 .col-1 { + width: 7.69230769%; +} + +.col-13 .col-2 { + width: 15.38461538%; +} + +.col-13 .col-3 { + width: 23.07692308%; +} + +.col-13 .col-4 { + width: 30.76923077%; +} + +.col-13 .col-5 { + width: 38.46153846%; +} + +.col-13 .col-6 { + width: 46.15384615%; +} + +.col-13 .col-7 { + width: 53.84615385%; +} + +.col-13 .col-8 { + width: 61.53846154%; +} + +.col-13 .col-9 { + width: 69.23076923%; +} + +.col-13 .col-10 { + width: 76.92307692%; +} + +.col-13 .col-11 { + width: 84.61538462%; +} + +.col-13 .col-12 { + width: 92.30769231%; +} + +.col-13 .col-13 { + width: 100%; +} + +.col-12 .col-1 { + width: 8.33333333%; +} + +.col-12 .col-2 { + width: 16.66666667%; +} + +.col-12 .col-3 { + width: 25%; +} + +.col-12 .col-4 { + width: 33.33333333%; +} + +.col-12 .col-5 { + width: 41.66666667%; +} + +.col-12 .col-6 { + width: 50%; +} + +.col-12 .col-7 { + width: 58.33333333%; +} + +.col-12 .col-8 { + width: 66.66666667%; +} + +.col-12 .col-9 { + width: 75%; +} + +.col-12 .col-10 { + width: 83.33333333%; +} + +.col-12 .col-11 { + width: 91.66666667%; +} + +.col-12 .col-12 { + width: 100%; +} + +.col-1of1, .col-2of2, .col-3of3, .col-4of4, .col-5of5, .col-6of6, .col-8of8, .col-10of10, .col-12of12, .col-16of16 { + width: 100%; +} + +.col-1of2, .col-2of4, .col-3of6, .col-4of8, .col-5of10, .col-6of12, .col-8of16 { + width: 50%; +} + +.col-1of3, .col-2of6, .col-4of12 { + width: 33.33333333%; +} + +.col-2of3, .col-4of6, .col-8of12 { + width: 66.66666667%; +} + +.col-1of4, .col-2of8, .col-3of12, .col-4of16 { + width: 25%; +} + +.col-3of4, .col-6of8, .col-9of12, .col-12of16 { + width: 75%; +} + +.col-1of5, .col-2of10 { + width: 20%; +} + +.col-2of5, .col-4of10 { + width: 40%; +} + +.col-3of5, .col-6of10 { + width: 60%; +} + +.col-4of5, .col-8of10 { + width: 80%; +} + +.col-1of6, .col-2of12 { + width: 16.66666667%; +} + +.col-5of6, .col-10of12 { + width: 83.33333333%; +} + +.col-1of8, .col-2of16 { + width: 12.5%; +} + +.col-3of8, .col-6of16 { + width: 37.5%; +} + +.col-5of8, .col-10of16 { + width: 62.5%; +} + +.col-7of8, .col-14of16 { + width: 87.5%; +} + +.col-1of10 { + width: 10%; +} + +.col-3of10 { + width: 30%; +} + +.col-7of10 { + width: 70%; +} + +.col-9of10 { + width: 90%; +} + +.col-1of12 { + width: 8.33333333%; +} + +.col-5of12 { + width: 41.66666667%; +} + +.col-7of12 { + width: 58.33333333%; +} + +.col-11of12 { + width: 91.66666667%; +} + +.col-1of16 { + width: 6.25%; +} + +.col-3of16 { + width: 18.75%; +} + +.col-5of16 { + width: 31.25%; +} + +.col-7of16 { + width: 43.75%; +} + +.col-9of16 { + width: 56.25%; +} + +.col-11of16 { + width: 68.75%; +} + +.col-13of16 { + width: 81.25%; +} + +.col-15of16 { + width: 93.75%; +} + +.col-pull-1of1, .col-pull-2of2, .col-pull-3of3, .col-pull-4of4, .col-pull-5of5, .col-pull-6of6, .col-pull-8of8, .col-pull-10of10, .col-pull-12of12, .col-pull-16of16 { + left: -100%; +} + +.col-pull-1of2, .col-pull-2of4, .col-pull-3of6, .col-pull-4of8, .col-pull-5of10, .col-pull-6of12, .col-pull-8of16 { + left: -50%; +} + +.col-pull-1of3, .col-pull-2of6, .col-pull-4of12 { + left: -33.33333333%; +} + +.col-pull-2of3, .col-pull-4of6, .col-pull-8of12 { + left: -66.66666667%; +} + +.col-pull-1of4, .col-pull-2of8, .col-pull-3of12, .col-pull-4of16 { + left: -25%; +} + +.col-pull-3of4, .col-pull-6of8, .col-pull-9of12, .col-pull-12of16 { + left: -75%; +} + +.col-pull-1of5, .col-pull-2of10 { + left: -20%; +} + +.col-pull-2of5, .col-pull-4of10 { + left: -40%; +} + +.col-pull-3of5, .col-pull-6of10 { + left: -60%; +} + +.col-pull-4of5, .col-pull-8of10 { + left: -80%; +} + +.col-pull-1of6, .col-pull-2of12 { + left: -16.66666667%; +} + +.col-pull-5of6, .col-pull-10of12 { + left: -83.33333333%; +} + +.col-pull-1of8, .col-pull-2of16 { + left: -12.5%; +} + +.col-pull-3of8, .col-pull-6of16 { + left: -37.5%; +} + +.col-pull-5of8, .col-pull-10of16 { + left: -62.5%; +} + +.col-pull-7of8, .col-pull-14of16 { + left: -87.5%; +} + +.col-pull-1of10 { + left: -10%; +} + +.col-pull-3of10 { + left: -30%; +} + +.col-pull-7of10 { + left: -70%; +} + +.col-pull-9of10 { + left: -90%; +} + +.col-pull-1of12 { + left: -8.33333333%; +} + +.col-pull-5of12 { + left: -41.66666667%; +} + +.col-pull-7of12 { + left: -58.33333333%; +} + +.col-pull-11of12 { + left: -91.66666667%; +} + +.col-pull-1of16 { + left: -6.25%; +} + +.col-pull-3of16 { + left: -18.75%; +} + +.col-pull-5of16 { + left: -31.25%; +} + +.col-pull-7of16 { + left: -43.75%; +} + +.col-pull-9of16 { + left: -56.25%; +} + +.col-pull-11of16 { + left: -68.75%; +} + +.col-pull-13of16 { + left: -81.25%; +} + +.col-pull-15of16 { + left: -93.75%; +} + +.col-push-1of1, .col-push-2of2, .col-push-3of3, .col-push-4of4, .col-push-5of5, .col-push-6of6, .col-push-8of8, .col-push-10of10, .col-push-12of12, .col-push-16of16 { + left: 100%; +} + +.col-push-1of2, .col-push-2of4, .col-push-3of6, .col-push-4of8, .col-push-5of10, .col-push-6of12, .col-push-8of16 { + left: 50%; +} + +.col-push-1of3, .col-push-2of6, .col-push-4of12 { + left: 33.33333333%; +} + +.col-push-2of3, .col-push-4of6, .col-push-8of12 { + left: 66.66666667%; +} + +.col-push-1of4, .col-push-2of8, .col-push-3of12, .col-push-4of16 { + left: 25%; +} + +.col-push-3of4, .col-push-6of8, .col-push-9of12, .col-push-12of16 { + left: 75%; +} + +.col-push-1of5, .col-push-2of10 { + left: 20%; +} + +.col-push-2of5, .col-push-4of10 { + left: 40%; +} + +.col-push-3of5, .col-push-6of10 { + left: 60%; +} + +.col-push-4of5, .col-push-8of10 { + left: 80%; +} + +.col-push-1of6, .col-push-2of12 { + left: 16.66666667%; +} + +.col-push-5of6, .col-push-10of12 { + left: 83.33333333%; +} + +.col-push-1of8, .col-push-2of16 { + left: 12.5%; +} + +.col-push-3of8, .col-push-6of16 { + left: 37.5%; +} + +.col-push-5of8, .col-push-10of16 { + left: 62.5%; +} + +.col-push-7of8, .col-push-14of16 { + left: 87.5%; +} + +.col-push-1of10 { + left: 10%; +} + +.col-push-3of10 { + left: 30%; +} + +.col-push-7of10 { + left: 70%; +} + +.col-push-9of10 { + left: 90%; +} + +.col-push-1of12 { + left: 8.33333333%; +} + +.col-push-5of12 { + left: 41.66666667%; +} + +.col-push-7of12 { + left: 58.33333333%; +} + +.col-push-11of12 { + left: 91.66666667%; +} + +.col-push-1of16 { + left: 6.25%; +} + +.col-push-3of16 { + left: 18.75%; +} + +.col-push-5of16 { + left: 31.25%; +} + +.col-push-7of16 { + left: 43.75%; +} + +.col-push-9of16 { + left: 56.25%; +} + +.col-push-11of16 { + left: 68.75%; +} + +.col-push-13of16 { + left: 81.25%; +} + +.col-push-15of16 { + left: 93.75%; +} + +@media (max-width: 960px) and (min-width: 720px) { + .responsive .col-tablet-1of1, .responsive .col-tablet-2of2, .responsive .col-tablet-3of3, .responsive .col-tablet-4of4, .responsive .col-tablet-5of5, .responsive .col-tablet-6of6, .responsive .col-tablet-8of8, .responsive .col-tablet-10of10, .responsive .col-tablet-12of12, .responsive .col-tablet-16of16 { + width: 100%; + } + + .responsive .col-tablet-1of2, .responsive .col-tablet-2of4, .responsive .col-tablet-3of6, .responsive .col-tablet-4of8, .responsive .col-tablet-5of10, .responsive .col-tablet-6of12, .responsive .col-tablet-8of16 { + width: 50%; + } + + .responsive .col-tablet-1of3, .responsive .col-tablet-2of6, .responsive .col-tablet-4of12 { + width: 33.33333333%; + } + + .responsive .col-tablet-2of3, .responsive .col-tablet-4of6, .responsive .col-tablet-8of12 { + width: 66.66666667%; + } + + .responsive .col-tablet-1of4, .responsive .col-tablet-2of8, .responsive .col-tablet-3of12, .responsive .col-tablet-4of16 { + width: 25%; + } + + .responsive .col-tablet-3of4, .responsive .col-tablet-6of8, .responsive .col-tablet-9of12, .responsive .col-tablet-12of16 { + width: 75%; + } + + .responsive .col-tablet-1of5, .responsive .col-tablet-2of10 { + width: 20%; + } + + .responsive .col-tablet-2of5, .responsive .col-tablet-4of10 { + width: 40%; + } + + .responsive .col-tablet-3of5, .responsive .col-tablet-6of10 { + width: 60%; + } + + .responsive .col-tablet-4of5, .responsive .col-tablet-8of10 { + width: 80%; + } + + .responsive .col-tablet-1of6, .responsive .col-tablet-2of12 { + width: 16.66666667%; + } + + .responsive .col-tablet-5of6, .responsive .col-tablet-10of12 { + width: 83.33333333%; + } + + .responsive .col-tablet-1of8, .responsive .col-tablet-2of16 { + width: 12.5%; + } + + .responsive .col-tablet-3of8, .responsive .col-tablet-6of16 { + width: 37.5%; + } + + .responsive .col-tablet-5of8, .responsive .col-tablet-10of16 { + width: 62.5%; + } + + .responsive .col-tablet-7of8, .responsive .col-tablet-14of16 { + width: 87.5%; + } + + .responsive .col-tablet-1of10 { + width: 10%; + } + + .responsive .col-tablet-3of10 { + width: 30%; + } + + .responsive .col-tablet-7of10 { + width: 70%; + } + + .responsive .col-tablet-9of10 { + width: 90%; + } + + .responsive .col-tablet-1of12 { + width: 8.33333333%; + } + + .responsive .col-tablet-5of12 { + width: 41.66666667%; + } + + .responsive .col-tablet-7of12 { + width: 58.33333333%; + } + + .responsive .col-tablet-11of12 { + width: 91.66666667%; + } + + .responsive .col-tablet-1of16 { + width: 6.25%; + } + + .responsive .col-tablet-3of16 { + width: 18.75%; + } + + .responsive .col-tablet-5of16 { + width: 31.25%; + } + + .responsive .col-tablet-7of16 { + width: 43.75%; + } + + .responsive .col-tablet-9of16 { + width: 56.25%; + } + + .responsive .col-tablet-11of16 { + width: 68.75%; + } + + .responsive .col-tablet-13of16 { + width: 81.25%; + } + + .responsive .col-tablet-15of16 { + width: 93.75%; + } +} + +.col-3-wide { + width: 33.33333333%; +} + +@media (max-width: 719px) { + .responsive [class*=col-] { + float: none; + left: 0; + width: auto; + } +} + +/* Header component */ +.dac-header { + background: #fff; + height: 64px; + margin: 0 -20px; +} + +.about .dac-header, .distribute .dac-header, .develop .dac-header { + height: 128px; +} + +.dac-header-inner { + background: #fff; + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.07); + box-sizing: border-box; + height: 64px; +} + +.dac-header.dac-sub .dac-header-inner { + border-bottom: 1px solid #e5e5e5; + box-shadow: none; +} + +.dac-header.is-sticky .dac-header-inner { + left: 0; + position: fixed; + top: 0; + right: 0; + -webkit-animation: .3s dac-header-show; + animation: .3s dac-header-show; + z-index: 52; +} + +.dac-header-logo { + border-right: 1px solid #e5e5e5; + display: block; + font-size: 20px; + font-weight: 300; + float: left; + letter-spacing: .3px; + line-height: 36px; + margin-right: 16px; + padding: 14px 24px 14px; +} + +.dac-header-logo:link, .dac-header-logo:visited, .dac-header-logo:hover, .dac-header-logo:active { + color: #444; +} + +.dac-header-logo-image { + margin-right: 5px; + vertical-align: top; +} + +.dac-header-consoleBtn { + border: 1px solid #c5c5c5; + border-radius: 4px; + box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.11); + background: #fff; + float: right; + font-size: 14px; + line-height: 28px; + margin: 17px 30px 17px 10px; + padding: 0 10px; + position: relative; + z-index: 52; +} + +.dac-header-consoleBtn > .dac-sprite { + margin-right: 5px; +} + +.dac-header-consoleBtn:link, .dac-header-consoleBtn:visited, .dac-header-consoleBtn:hover, .dac-header-consoleBtn:active { + color: #666; +} + +.dac-header-consoleBtn:focus { + background: rgba(63, 81, 181, 0.1); + outline: 0; +} + +@media (max-width: 719px) { + .responsive .dac-header { + height: 64px; + text-align: center; + } + + .responsive .dac-header-logo { + border-right: 0; + display: inline-block; + margin-right: 0; + float: none; + } + + .responsive .dac-header.dac-sub { + display: none; + } + + .responsive .dac-header-consoleBtn { + display: none; + } +} + +@-webkit-keyframes dac-header-show { + 0% { + -webkit-transform: translateY(-64px); + transform: translateY(-64px); + } + + 100% { + -webkit-transform: translateY(0); + transform: translateY(0); + } +} + +@keyframes dac-header-show { + 0% { + -webkit-transform: translateY(-64px); + transform: translateY(-64px); + } + + 100% { + -webkit-transform: translateY(0); + transform: translateY(0); + } +} + +/* Header Breadcrumbs component */ +.dac-header-crumbs { + display: none; + list-style-type: none; + margin: 0; +} + +.is-sticky .dac-header-crumbs { + display: block; +} + +.dac-header-crumbs-item { + float: left; + position: relative; + margin: 0; + padding-left: 10px; +} + +.dac-header-crumbs-item:before { + color: #444; + content: '>'; + font-weight: 300; + font-size: 20px; + left: 0; + line-height: 28px; + padding: 16px 0; + position: absolute; +} + +.dac-header-crumbs-item:first-child:before { + content: none; +} + +.dac-header-crumbs-link { + display: block; + font-size: 16px; + font-weight: 300; + line-height: 32px; + padding: 16px 16px; + -webkit-transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); + transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); +} + +.dac-header-crumbs-link:link, .dac-header-crumbs-link:visited, .dac-header-crumbs-link:hover, .dac-header-crumbs-link:active { + color: #444; +} + +.dac-header-crumbs-link:focus { + background: rgba(63, 81, 181, 0.1); + outline: 0; +} + +.dac-header-crumbs-link.current { + color: #6ab344; + font-weight: 400; +} + +@media (max-width: 719px) { + .responsive .dac-header-crumbs { + display: none; + } +} + +/* Header site search component */ +.dac-header-search { + background: #fff; + border-left: 1px solid #e5e5e5; + display: block; + float: right; + height: 28px; + padding: 18px 0; + position: relative; + overflow: hidden; + -webkit-transition: width 0.4s ease, left 0.4s ease; + transition: width 0.4s ease, left 0.4s ease; + width: 64px; + z-index: 52; +} + +.dac-header-search:hover, .dac-header-search.active { + width: 228px; +} + +.dac-header-search-inner { + width: 228px; +} + +.dac-header-search-btn { + background: url(../images/icon_search.png) 50% 0 no-repeat; + height: 28px; + position: absolute; + width: 64px; +} + +.dac-header-search:hover .dac-header-search-btn { + background-position: 50% -28px; +} + +.dac-header-search-form { + left: 54px; + opacity: 0; + position: absolute; + right: 24px; + top: 20px; + -webkit-transition: opacity .4s; + transition: opacity .4s; +} + +.dac-header-search:hover .dac-header-search-form, .dac-header-search.active .dac-header-search-form { + opacity: 1; +} + +.dac-header-search-input { + background-color: transparent; + border: none; + border-bottom: 1px solid #CCC; + box-sizing: border-box; + color: #2f2f2f; + font-size: 14px; + height: 24px; + outline: none; + padding: 4px 20px 4px 0; + width: 100%; + z-index: 1500; +} + +.dac-header-search:hover .dac-header-search-input { + border-bottom: 1px solid #33b5e5; +} + +.dac-header-search-input:focus { + color: #222; + font-weight: bold; + outline: 0; +} + +.dac-header-search-close { + position: absolute; + right: 4px; + bottom: 4px; + width: 16px; + height: 16px; + margin: 0; + text-indent: -1000em; + background: url(../images/close.png) no-repeat 0 0; + z-index: 9999; +} + +.dac-header-search-close:hover, .dac-header-search-close:focus { + background-position: -16px 0; + cursor: pointer; +} + +@media (max-width: 719px) { + .responsive .dac-header-search { + position: absolute; + left: calc(100% - 64px); + right: 0; + top: 0; + width: auto; + } + + .responsive .dac-header-search:hover, .responsive .dac-header-search.active { + left: 64px; + width: auto; + } +} + +/* Main navigation component */ +.is-sticky .dac-nav, .dac-nav-head, .dac-nav-toggle { + display: none; +} + +.dac-nav-list { + list-style-type: none; + left: 192px; + margin: 0; + position: absolute; + right: 0; + top: 0; + z-index: 51; +} + +.dac-nav-item { + float: left; + margin: 0; +} + +.dac-nav-head { + margin-bottom: 10px; +} + +.dac-nav-dimmer { + background: #000; + display: none; + height: 100%; + left: 0; + opacity: 0; + position: fixed; + top: 0; + -webkit-transition: visibility 0s linear .3s, opacity .3s linear; + transition: visibility 0s linear .3s, opacity .3s linear; + -webkit-transform: translateZ(0); + transform: translateZ(0); + visibility: hidden; + width: 100%; + z-index: 52; +} + +.dac-nav-hamburger { + display: inline-block; + height: 15px; + width: 16px; +} + +.dac-nav-hamburger-top, .dac-nav-hamburger-mid, .dac-nav-hamburger-bot { + background: #999; + display: block; + height: 3px; + margin: 3px 0 0; + width: 100%; +} + +.dac-nav-link { + display: block; + font-size: 16px; + font-weight: 300; + letter-spacing: .24px; + line-height: 32px; + padding: 18px 16px 14px; + -webkit-transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); + transition: background-color 0.35s cubic-bezier(0.35, 0, 0.25, 1); +} + +.dac-nav-link:link, .dac-nav-link:visited, .dac-nav-link:hover, .dac-nav-link:active { + color: #444; +} + +.dac-nav-link:focus { + background: rgba(63, 81, 181, 0.1); + outline: 0; +} + +.dac-nav-link.has-subnav, .dac-nav-link.selected { + border-bottom: 3px solid #6ab344; + font-weight: 500; + padding-bottom: 11px; +} + +.dac-nav-secondary { + border-bottom: 1px solid #e5e5e5; + display: none; + left: -192px; + list-style-type: none; + margin: 0; + position: absolute; + top: 64px; + right: 0; +} + +.dac-nav-link.has-subnav + .dac-nav-secondary, .dac-nav-link.selected + .dac-nav-secondary { + display: block; +} + +.dac-nav-secondary .dac-nav-link { + padding: 17px 16px 15px; +} + +.dac-nav-secondary .dac-nav-link:link, .dac-nav-secondary .dac-nav-link:visited, .dac-nav-secondary .dac-nav-link:hover, .dac-nav-secondary .dac-nav-link:active { + color: #666; +} + +@media (min-width: 720px) and (max-width: 979px) { + .responsive .dac-nav-secondary .dac-nav-link { + padding-left: 8px; + padding-right: 8px; + } +} + +.dac-nav-secondary .dac-nav-item:first-child .dac-nav-link { + padding-left: 20px; +} + +.dac-nav-secondary .dac-nav-link.selected { + border: none; + font-weight: 700; +} + +@media (max-width: 719px) { + .responsive.dac-nav-open { + overflow: hidden; + } + + .responsive .dac-nav-toggle { + border-right: 1px solid #e5e5e5; + display: inline-block; + position: absolute; + left: 0; + line-height: 64px; + text-align: center; + width: 64px; + } + + .responsive .dac-nav-head, .responsive .dac-nav-secondary, .responsive .dac-nav-dimmer { + display: block; + } + + .responsive .dac-nav-dimmer.dac-nav-open { + opacity: .8; + -webkit-transition-delay: 0s; + transition-delay: 0s; + visibility: visible; + } + + .responsive .dac-nav-list { + background: #fff; + left: auto; + padding: 0 0 20px 0; + position: static; + } + + .responsive .dac-nav-list { + bottom: 0; + max-width: 280px; + overflow-y: auto; + position: fixed; + right: 100%; + top: 0; + -webkit-transition: -webkit-transform .3s ease; + transition: transform .3s ease; + width: 85%; + z-index: 52; + } + + .responsive .dac-nav-list.dac-nav-open { + -webkit-transform: translate3d(100%, 0, 0); + transform: translate3d(100%, 0, 0); + } + + .responsive .dac-nav-secondary { + border: none; + position: static; + width: 100%; + } + + .responsive .dac-nav-item { + float: none; + } + + .responsive .dac-nav-link { + display: block; + font-size: 12px; + font-weight: 600; + color: #333; + padding: 0 20px; + } + + .responsive .dac-nav-link.selected { + color: #09f; + } + + .responsive .dac-nav-secondary .dac-nav-link { + font-weight: 400; + margin-left: 20px; + margin-right: 20px; + } + + .responsive .dac-nav-link.has-subnav, .responsive .dac-nav-link.selected { + border: none; + } + + .responsive .dac-logo-image { + margin-right: 5px; + vertical-align: top; + } + + .responsive .dac-nav-logo { + box-shadow: 0 2px 2px rgba(0, 0, 0, 0.04); + font-size: 20px; + font-weight: 300; + letter-spacing: .3px; + line-height: 36px; + padding: 14px 24px; + } + + .responsive .dac-nav-logo:link, .responsive .dac-nav-logo:visited, .responsive .dac-nav-logo:hover, .responsive .dac-nav-logo:active { + color: #444; + } +} + +.dac-light.dac-hero, .dac-light.dac-section { + background-color: #eceff1; +} + +.dac-gray.dac-hero, .dac-gray.dac-section { + background-color: #b0bec5; +} + +.dac-dark.dac-hero, .dac-dark.dac-section { + background-color: #37474f; +} + +.dac-red.dac-hero, .dac-red.dac-section { + background-color: #dc4d38; +} + +.dac-hero-cta:link, .dac-hero-cta:visited, .dac-section-title, .dac-section-links { + color: #212121; + color: rgba(0, 0, 0, 0.87); +} + +.dac-invert .dac-hero-cta:link, .dac-invert .dac-hero-cta:visited, .dac-invert .dac-section-title, .dac-invert .dac-section-links { + color: white; +} + +.dac-hero-tag, .dac-hero-description, .dac-section-subtitle { + color: #757575; + color: rgba(0, 0, 0, 0.54); +} + +.dac-invert .dac-hero-tag, .dac-invert .dac-hero-description, .dac-invert .dac-section-subtitle { + color: #b2b2b2; + color: rgba(255, 255, 255, 0.7); +} + +/* Hero carousel */ +.dac-hero { + background-color: #fff; + background-position: 50% 30%; + background-size: cover; + box-sizing: border-box; + font-size: 16px; + min-height: 550px; + padding-top: 120px; +} + +.dac-hero.dac-darken: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 .dac-hero-content { + position: relative; +} + +@media (max-width: 719px) { + .responsive .dac-hero { + padding-bottom: 20px; + padding-top: 20px; + } +} + +.dac-hero-tag { + font-size: 11px; + font-weight: 700; + letter-spacing: .07em; + margin-bottom: 2px; + text-transform: uppercase; +} + +.dac-hero-title { + margin: 0 0 14px; +} + +.dac-hero-description { + margin-bottom: 16px; +} + +.dac-hero-cta { + display: inline-block; + line-height: 40px; + margin-right: 20px; +} + +.dac-hero-cta:hover { + color: currentColor; +} + +.dac-hero-cta .dac-sprite { + margin-left: -8px; +} + +.dac-hero-figure { + text-align: center; +} + +.dac-hero-carousel { + height: 550px; + position: relative; +} + +.dac-hero-carousel > .dac-hero { + bottom: 0; + left: 0; + position: absolute; + right: 0; + top: 0; +} + +.dac-hero-carousel > .dac-hero, .dac-hero-carousel > .dac-hero .wrap { + opacity: 0; +} + +.dac-hero-carousel > .dac-hero.active { + opacity: 1; + -webkit-transition: opacity .5s; + transition: opacity .5s; + z-index: 1; +} + +.dac-hero-carousel > .dac-hero.active .wrap { + opacity: 1; + -webkit-transition: opacity .5s .5s; + transition: opacity .5s .5s; +} + +.dac-hero-carousel > .dac-hero.out, .dac-hero-carousel > .dac-hero.out .wrap { + -webkit-transition: opacity 0s .5s; + transition: opacity 0s .5s; + opacity: 0; +} + +.dac-hero-carousel-pagination { + bottom: 33px; + left: 0; + position: absolute; + right: 0; + z-index: 51; +} + +@media (max-width: 719px) { + .responsive .dac-hero-carousel-pagination { + text-align: right; + bottom: 20px; + } +} + +.dac-pagination { + list-style: none; + margin: 0 -3px; +} + +.dac-pagination-item { + background-color: rgba(153, 153, 153, 0.4); + border-radius: 50%; + cursor: pointer; + display: inline-block; + height: 14px; + margin: 0 3px; + overflow: hidden; + text-indent: 100%; + -webkit-transition: background-color .1s ease-in; + transition: background-color .1s ease-in; + white-space: nowrap; + width: 14px; +} + +.dac-pagination-item:hover { + background-color: rgba(153, 153, 153, 0.6); +} + +.dac-pagination-item.active, .dac-pagination-item.active:hover { + background-color: #6ab344; +} + +.dac-invert .dac-pagination-item { + background-color: rgba(204, 204, 204, 0.2); +} + +.dac-invert .dac-pagination-item:hover { + background-color: rgba(153, 153, 153, 0.4); +} + +/* Form component */ +.dac-form { + font-size: 16px; + /* Modal Responsive */ +} + +.dac-form a { + color: #000; +} + +.dac-form-aside { + display: inline-block; + font-size: 12px; + margin-top: 0; +} + +.dac-form-required { + color: #ef4300; +} + +.dac-form-fieldset { + padding: 0; +} + +.dac-form-legend { + display: block; + font-weight: 500; + margin: 20px 0; + padding: 0; + width: 100%; +} + +.dac-form-legend > .dac-form-required { + float: right; + margin-top: 3px; +} + +.dac-form-input { + border: 0 solid #e3e3e3; + border-bottom-width: 1px; + display: block; + outline: 0; + padding: 8px 0; + -webkit-transition: border-color .2s; + transition: border-color .2s; + width: 100%; +} + +.dac-form-input-group { + position: relative; +} + +.dac-form-input-group > .dac-form-required { + display: block; + bottom: 3px; + position: absolute; + right: 0; +} + +.dac-form-input:focus { + border-bottom-color: #09f; +} + +.dac-form-floatlabel { + display: block; + margin-top: 5px; + -webkit-transform-origin: 0 100%; + -ms-transform-origin: 0 100%; + transform-origin: 0 100%; + -webkit-transform: translate3d(0, 30px, 0) scale(1); + transform: translate3d(0, 30px, 0) scale(1); + -webkit-transition: -webkit-transform .2s; + transition: transform .2s; +} + +.dac-focused > .dac-form-floatlabel, .dac-has-value > .dac-form-floatlabel { + -webkit-transform: translate3d(0, 0, 0) scale(.75); + transform: translate3d(0, 0, 0) scale(.75); +} + +.dac-form-radio, .dac-form-checkbox { + display: none; +} + +.dac-form-radio-group, .dac-form-checkbox-group { + display: table; + margin-top: 10px; +} + +.dac-form-radio-button, .dac-form-checkbox-button { + box-sizing: border-box; + cursor: pointer; + display: table-cell; + float: left; + height: 18px; + margin: 2px 10px 0 0; + position: relative; + width: 18px; +} + +.dac-form-radio-button::after, .dac-form-radio-button::before, .dac-form-checkbox-button::after, .dac-form-checkbox-button::before { + box-sizing: border-box; + content: ''; + border-radius: 50%; + display: block; + height: 100%; + position: absolute; + width: 100%; +} + +.dac-form-radio-button::before, .dac-form-checkbox-button::before { + background: rgba(0, 0, 0, 0.7); + -webkit-transform: translateZ(0) scale(0); + transform: translateZ(0) scale(0); + -webkit-transition: -webkit-transform .3s; + transition: transform .3s; +} + +.dac-form-radio:checked + .dac-form-radio-button::before, .dac-form-checkbox:checked + .dac-form-checkbox-button::before { + -webkit-transform: translateZ(0) scale(.5); + transform: translateZ(0) scale(.5); +} + +.dac-form-radio-button::after, .dac-form-checkbox-button::after { + border: 2px solid rgba(0, 0, 0, 0.7); +} + +.dac-form-checkbox-button::after, .dac-form-checkbox-button::before { + border-radius: 0; +} + +@media (max-width: 719px) { + .responsive .dac-form-legend { + margin-bottom: 0; + } +} + +/* Media component */ +.dac-media { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + -webkit-flex-flow: row wrap; + -ms-flex-flow: row wrap; + flex-flow: row wrap; +} + +.dac-media-figure { + margin: 0; +} + +.dac-media-body { + -webkit-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; +} + +.no-flexbox .dac-media { + display: table; + width: 100%; +} + +.no-flexbox .dac-media-body, .no-flexbox .dac-media-figure { + display: table-cell; +} + +.no-flexbox .dac-media-figure { + padding: 0; +} + +.no-flexbox .dac-media-body { + width: 100%; +} + +/* Modal component */ +.dac-modal { + /* Modal dimmer */ + /* Modal Header */ + /* Modal window */ + /* Modal Action button */ + /* Modal Footer */ + /* Modal Responsive */ +} + +.dac-modal-open { + overflow: hidden; +} + +.dac-modal-dimmer { + background: #000; + height: 100%; + left: 0; + opacity: 0; + position: fixed; + top: 0; + -webkit-transform: translateZ(0); + transform: translateZ(0); + -webkit-transition: visibility 0s linear .3s, opacity .3s linear; + transition: visibility 0s linear .3s, opacity .3s linear; + visibility: hidden; + width: 100%; + z-index: 51; +} + +.dac-modal-dimmer.dac-active { + opacity: .8; + -webkit-transition-delay: 0s; + transition-delay: 0s; + visibility: visible; +} + +.dac-modal-header { + background: #00695c; + margin: -35px -35px 0; + padding: 35px 35px 30px; + position: relative; +} + +.dac-modal-header-close { + background: none; + border: none; + cursor: pointer; + line-height: 0; + outline: 0; + opacity: .7; + padding: 8px; + position: absolute; + right: 5px; + -webkit-transition: background-color .3s; + transition: background-color .3s; + top: 5px; +} + +.dac-modal-header-close:active { + background: rgba(255, 255, 255, 0.2); +} + +.dac-modal-header-title { + color: #fff; + font-size: 24px; + font-weight: 300; + line-height: 32px; + margin: 0; + padding-right: 150px; +} + +.dac-modal-header-subtitle { + bottom: 23px; + color: #fff; + display: inline-block; + font: inherit; + font-size: 14px; + opacity: .8; + position: absolute; + right: 35px; +} + +.dac-modal-header hr { + display: none; +} + +.dac-modal-window { + background: #fff; + border-top-left-radius: 6px; + border-top-right-radius: 6px; + box-sizing: border-box; + left: 50%; + margin-left: -480px; + max-width: 960px; + opacity: 0; + padding: 35px 35px 17.5px; + position: fixed; + top: 50%; + -webkit-transition: visibility 0s linear .3s, opacity .3s linear; + transition: visibility 0s linear .3s, opacity .3s linear; + -webkit-transform: translate(0, -50%); + -ms-transform: translate(0, -50%); + transform: translate(0, -50%); + visibility: hidden; + width: 100%; + z-index: 51; +} + +.dac-modal-window.dac-active { + opacity: 1; + -webkit-transition-delay: 0s; + transition-delay: 0s; + visibility: visible; +} + +.dac-modal-action { + bottom: 0; + position: absolute; + right: 0; +} + +.dac-modal-iframe { + display: none; +} + +.dac-modal-footer { + margin-top: 35px; + position: relative; +} + +@media (max-width: 1010px) { + .responsive .dac-modal-window { + bottom: auto; + left: 10px; + margin: 10px; + right: 10px; + top: 50%; + -webkit-transform: translate3d(0, -50%, 0); + transform: translate3d(0, -50%, 0); + width: auto; + } +} + +@media (max-width: 719px) { + .responsive .dac-modal-header { + margin: -10px -10px 10px; + padding-bottom: 10px; + padding-left: 10px; + padding-right: 10px; + } + + .responsive .dac-modal-header-title { + font-size: 16px; + line-height: 26px; + padding: 0; + } + + .responsive .dac-modal-header-subtitle { + display: inline-block; + margin: 0; + position: static; + text-align: right; + width: 100%; + } + + .responsive .dac-modal-window { + border-radius: 0; + bottom: auto; + margin: 10px; + left: 0; + padding: 10px; + top: 0; + -webkit-transform: none; + -ms-transform: none; + transform: none; + width: auto; + } + + .responsive .dac-modal-footer { + border-top: 1px solid #e3e3e3; + margin: 20px -10px 0; + padding: 30px 10px; + } + + .responsive .dac-modal-action { + display: block; + margin: 40px auto 0; + position: static; + } +} + +.newsletter-checkboxes { + padding-top: 10px; +} + +.dac-expand, .dac-section { + margin-left: -20px; + margin-right: -20px; + padding-left: 20px; + padding-right: 20px; +} + +@media (max-width: 719px) { + .responsive .dac-expand, .responsive .dac-section { + margin-left: -10px; + margin-right: -10px; + padding-left: 10px; + padding-right: 10px; + } +} + +.dac-invert { + color: #b2b2b2; + color: rgba(255, 255, 255, 0.7); +} + +.dac-invert h1, .dac-invert h2, .dac-invert h3 { + color: #fff; +} + +.dac-light.dac-hero, .dac-light.dac-section { + background-color: #eceff1; +} + +.dac-gray.dac-hero, .dac-gray.dac-section { + background-color: #b0bec5; +} + +.dac-dark.dac-hero, .dac-dark.dac-section { + background-color: #37474f; +} + +.dac-red.dac-hero, .dac-red.dac-section { + background-color: #dc4d38; +} + +.dac-hero-cta:link, .dac-hero-cta:visited, .dac-section-title, .dac-section-links { + color: #212121; + color: rgba(0, 0, 0, 0.87); +} + +.dac-invert .dac-hero-cta:link, .dac-invert .dac-hero-cta:visited, .dac-invert .dac-section-title, .dac-invert .dac-section-links { + color: white; +} + +.dac-hero-tag, .dac-hero-description, .dac-section-subtitle { + color: #757575; + color: rgba(0, 0, 0, 0.54); +} + +.dac-invert .dac-hero-tag, .dac-invert .dac-hero-description, .dac-invert .dac-section-subtitle { + color: #b2b2b2; + color: rgba(255, 255, 255, 0.7); +} + +.dac-section { + background-position: 50% 50%; + background-size: cover; + padding-bottom: 84px; + padding-top: 84px; + position: relative; +} + +.dac-section.dac-small { + padding-bottom: 32px; + padding-top: 32px; +} + +.dac-section-title { + text-align: center; + margin-bottom: 40px; + margin-top: 0; +} + +.dac-section-subtitle { + font-size: 16px; + margin-bottom: 40px; + margin-top: -24px; + text-align: center; +} + +.dac-section-links { + font-size: 16px; + list-style: none; + line-height: 40px; + margin: 16px 0 0; + text-align: center; +} + +@media (max-width: 719px) { + .responsive .dac-section-links { + margin-left: -8px; + text-align: left; + } +} + +.dac-section-link { + display: inline-block; + margin: 0 32px; +} + +@media (max-width: 719px) { + .responsive .dac-section-link { + display: block; + margin: 0; + } +} + +.dac-section-link a:link, .dac-section-link a:visited { + color: inherit; +} + +/* +SCSS variables are information about icon's compiled state, stored under its original file name + +.icon-home { + width: $icon-home-width; +} + +The large array-like variables contain all information about a single icon +$icon-home: x y offset_x offset_y width height total_width total_height image_path; + +At the bottom of this section, we provide information about the spritesheet itself +$spritesheet: width height image $spritesheet-sprites; +*/ +.dac-sprite, #tb li:before, #qv li:before { + background-image: url(/assets/images/sprite.png); + display: inline-block; + vertical-align: middle; } + @media screen and (min-device-pixel-ratio: 1.5) { + .dac-sprite, #tb li:before, #qv li:before { + background-image: url(/assets/images/sprite-2x.png); + background-size: 50% 50%; } } + +.dac-sprite.dac-auto-chevron { + background-position: 0px -38px; + height: 24px; + width: 24px; + vertical-align: -6px; } + .dac-invert .dac-sprite.dac-auto-chevron { + background-position: -26px -38px; + height: 24px; + width: 24px; } +.dac-sprite.dac-auto-chevron-large { + background-position: -38px 0px; + height: 36px; + width: 36px; + vertical-align: -10px; } + .dac-invert .dac-sprite.dac-auto-chevron-large { + background-position: 0px 0px; + height: 36px; + width: 36px; } + +.dac-sprite.dac-arrow-right { + background-position: -76px -35px; + height: 18px; + width: 11px; } + +.dac-sprite.dac-chevron-large-right-black { + background-position: -38px 0px; + height: 36px; + width: 36px; } + +.dac-sprite.dac-chevron-large-right-white { + background-position: 0px 0px; + height: 36px; + width: 36px; } + +.dac-sprite.dac-chevron-right-black { + background-position: 0px -38px; + height: 24px; + width: 24px; } + +.dac-sprite.dac-chevron-right-white { + background-position: -26px -38px; + height: 24px; + width: 24px; } + +.dac-sprite.dac-close { + background-position: -54px -64px; + height: 12px; + width: 12px; } + +.dac-sprite.dac-google-play { + background-position: -52px -38px; + height: 18px; + width: 16px; } + +.dac-sprite.dac-gplus { + background-position: -76px 0px; + height: 17px; + width: 16px; } + +.dac-sprite.dac-mail { + background-position: -36px -64px; + height: 12px; + width: 16px; } + +.dac-sprite.dac-rss { + background-position: -20px -64px; + height: 14px; + width: 14px; } + +.dac-sprite.dac-twitter { + background-position: -76px -19px; + height: 14px; + width: 16px; } + +.dac-sprite.dac-youtube { + background-position: 0px -64px; + height: 14px; + width: 18px; } + +.dac-visible-mobile-block, .dac-mobile-only, .dac-visible-mobile-inline, .dac-visible-mobile-inline-block, .dac-visible-tablet-block, .dac-visible-tablet-inline, .dac-visible-tablet-inline-block, .dac-visible-desktop-block, .dac-visible-desktop-inline, .dac-visible-desktop-inline-block { + display: none !important; } + +@media (max-width: 719px) { + .responsive .dac-hidden-mobile { + display: none !important; } + .responsive .dac-visible-mobile-block, .responsive .dac-mobile-only { + display: block !important; } + .responsive .dac-visible-mobile-inline { + display: inline !important; } + .responsive .dac-visible-mobile-inline-block { + display: inline-block !important; } } + +@media (min-width: 720px) and (max-width: 979px) { + .responsive .dac-hidden-tablet { + display: none !important; } + .responsive .dac-visible-tablet-block { + display: block !important; } + .responsive .dac-visible-tablet-inline { + display: inline !important; } + .responsive .dac-visible-tablet-inline-block { + display: inline-block !important; } } + +@media (min-width: 980px) { + .responsive .dac-hidden-desktop { + display: none !important; } + .responsive .dac-visible-desktop-block { + display: block !important; } + .responsive .dac-visible-desktop-inline { + display: inline !important; } + .responsive .dac-visible-desktop-inline-block { + display: inline-block !important; } } + +#tb li:before, #qv li:before { + background-position: 0px -38px; + height: 24px; + width: 24px; + content: ''; + left: -8px; + opacity: .7; + position: absolute; } diff --git a/tools/droiddoc/templates-sdk/assets/css/fullscreen.css b/tools/droiddoc/templates-sdk/assets/css/fullscreen.css index 7912e3490..0f108e046 100644 --- a/tools/droiddoc/templates-sdk/assets/css/fullscreen.css +++ b/tools/droiddoc/templates-sdk/assets/css/fullscreen.css @@ -14,195 +14,7 @@ */ @media screen, projection, print { -.full { - padding: 2.5em 0; - border-top: solid 1px #ddd; - border-bottom: solid 1px #ddd; - background: #f7f7f7; + .wrap { + max-width: none; + } } -.wrap { - margin: 0 auto; - width: 100%; - min-width:600px; - clear: both; -} -.cols { - height: 1%; - margin: 0 -1.533742331288343558282%; - width: 103.06748466257669%} -*+html .cols { - margin-bottom: 20px; -} -.cols:after { - clear: both; - content: ' '; - display: block; - height: 0; - visibility: hidden; -} -.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, -.col-13, .col-14, .col-15, .col-16 { - float: left; - margin: 0 1.063829787234% 20px 1.063829787234%; -} -* html .col-1, * html .col-2, * html .col-3, * html .col-4, * html .col-5, * html .col-6, * html -.col-7, * html .col-8, * html .col-9, * html .col-10, * html .col-11, * html .col-12, * html -.col-13, * html .col-14, * html .col-15, * html .col-16 { - margin: 0; - margin: 0 1.063829787234% 20px 1.063829787234%; -} -[dir='rtl'] .col-1, [dir='rtl'] .col-2, [dir='rtl'] .col-3, [dir='rtl'] .col-4, [dir='rtl'] .col-5, -[dir='rtl'] .col-6, [dir='rtl'] .col-7, [dir='rtl'] .col-8, [dir='rtl'] .col-9, [dir='rtl'] .col-10, -[dir='rtl'] .col-11, [dir='rtl'] .col-12 { - float: right; -} -.col-1 { - width: 4.16666666666667%; -} -.col-2 { - width: 10.4166666666667%; -} -.col-3 { - width: 16.6666666666667%; -} -.col-4 { - width: 22.9166666666667%; -} -.col-5 { - width: 29.1666666666667%; -} -.col-6 { - width: 35.4166666666667%; -} -.col-7 { - width: 41.6666666666667%; -} -.col-8 { - width: 47.9166666666667%; -} -.col-9 { - width: 55.3333333333333%; -} -.col-10 { - width: 60.4166666666667%; -} -.col-11 { - width: 66.6666666666667%; -} -.col-12 { - width: 72.9166666666667%; -} -.col-13 { - width: 79.1666666666667%; -} -.col-14 { - width: 85.4166666666667%; -} -.col-15 { - width: 91.6666666666667%; -} -.col-16 { - width: 97.9166666666667%; -} - - - - - - - -#header .col-1, -#nav-x .col-1 { width: 40px } -#header .col-2, -#nav-x .col-2 { width: 100px } -#header .col-3, -#nav-x .col-3 { width: 160px } -#header .col-4, -#nav-x .col-4 { width: 220px } -#header .col-5, -#nav-x .col-5 { width: 280px } -#header .col-6, -#nav-x .col-6 { width: 340px } -#header .col-7, -#nav-x .col-7 { width: 400px } -#header .col-8, -#nav-x .col-8 { width: 460px } -#header .col-9, -#nav-x .col-9 { width: 520px } -#header .col-10, -#nav-x .col-10 { width: 580px } -#header .col-11, -#nav-x .col-11 { width: 640px } -#header .col-12, -#nav-x .col-12 { width: 700px } -#header .col-13, -#nav-x .col-13 { width: 760px } -#header .col-14, -#nav-x .col-14 { width: 820px } -#header .col-15, -#nav-x .col-15 { width: 880px } -#header .col-16, -#nav-x .col-16 { width: 940px } - - - -body { - padding:0 20px; -} -#header, -#searchResults, -#nav-x { - margin:0; -} -#body-content { - margin:0; -} -#body-content > .col-12 { - width:77.9804965%; - margin:0 0 0 0.97%; /* this percentage chosen to make IE9 happy */ -} -#side-nav { - width: 19.9804965%; - margin:0 1.063829787234% 0 0; -} - -#header .wrap { - max-width: 100%; -} - -#header-wrapper #nav-x div.wrap, -#searchResults.wrap { - max-width:100%; -} - -.nav-x { - margin:-2px 0 0 0; -} - -#devdoc-nav.fixed, -#devdoc-nav.fixed a.totop { - left:20px; /* !important ... for IE i think */ -} - -#sticky-header { - padding: 0 20px; -} - -#sticky-header > div { - width: 100%; -} - -.sticky-menu { - width:100%; - left:-20px; -} - -.col-right { - margin-right:0px; -} - -@media screen and (max-width:772px) { -.col-5, .col-6, .col-7 { - clear: both; - width: 97.0238096%} -}
\ No newline at end of file diff --git a/tools/droiddoc/templates-sdk-dev/assets/images/android_logo.png b/tools/droiddoc/templates-sdk/assets/images/android_logo.png Binary files differindex 8fa1b7a48..8fa1b7a48 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/images/android_logo.png +++ b/tools/droiddoc/templates-sdk/assets/images/android_logo.png diff --git a/tools/droiddoc/templates-sdk-dev/assets/images/android_logo@2x.png b/tools/droiddoc/templates-sdk/assets/images/android_logo@2x.png Binary files differindex 1f3e23d24..1f3e23d24 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/images/android_logo@2x.png +++ b/tools/droiddoc/templates-sdk/assets/images/android_logo@2x.png diff --git a/tools/droiddoc/templates-sdk/assets/images/resource-card-default-android.jpg b/tools/droiddoc/templates-sdk/assets/images/resource-card-default-android.jpg Binary files differindex 80507444a..398030f13 100644 --- a/tools/droiddoc/templates-sdk/assets/images/resource-card-default-android.jpg +++ b/tools/droiddoc/templates-sdk/assets/images/resource-card-default-android.jpg diff --git a/tools/droiddoc/templates-sdk-dev/assets/images/sprite-2x.png b/tools/droiddoc/templates-sdk/assets/images/sprite-2x.png Binary files differindex 4d842d1cc..4d842d1cc 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/images/sprite-2x.png +++ b/tools/droiddoc/templates-sdk/assets/images/sprite-2x.png diff --git a/tools/droiddoc/templates-sdk-dev/assets/images/sprite.png b/tools/droiddoc/templates-sdk/assets/images/sprite.png Binary files differindex f8245694b..f8245694b 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/images/sprite.png +++ b/tools/droiddoc/templates-sdk/assets/images/sprite.png diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js index 7f4be4e16..ca642171f 100644 --- a/tools/droiddoc/templates-sdk/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk/assets/js/docs.js @@ -82,7 +82,7 @@ $(document).ready(function() { .after('<hr/>'); // set up the search close button - $('.search .close').click(function() { + $('#search-close').click(function() { $searchInput = $('#search_autocomplete'); $searchInput.attr('value', ''); $(this).addClass("hide"); @@ -92,32 +92,6 @@ $(document).ready(function() { hideResults(); }); - // Set up quicknav - var quicknav_open = false; - $("#btn-quicknav").click(function() { - if (quicknav_open) { - $(this).removeClass('active'); - quicknav_open = false; - collapse(); - } else { - $(this).addClass('active'); - quicknav_open = true; - expand(); - } - }) - - var expand = function() { - $('#header-wrap').addClass('quicknav'); - $('#quicknav').stop().show().animate({opacity:'1'}); - } - - var collapse = function() { - $('#quicknav').stop().animate({opacity:'0'}, 100, function() { - $(this).hide(); - $('#header-wrap').removeClass('quicknav'); - }); - } - //Set up search $("#search_autocomplete").focus(function() { @@ -180,73 +154,71 @@ $(document).ready(function() { // Highlight the header tabs... // highlight Design tab - if ($("body").hasClass("design")) { - $("#header li.design a").addClass("selected"); - $("#sticky-header").addClass("design"); + var urlSegments = pagePathOriginal.split('/'); + var navEl = $(".dac-nav-list"); + var subNavEl = navEl.find(".dac-nav-secondary"); + var parentNavEl; + if ($("body").hasClass("design")) { + navEl.find("> li.design > a").addClass("selected"); // highlight About tabs } else if ($("body").hasClass("about")) { - var rootDir = pagePathOriginal.substring(1,pagePathOriginal.indexOf('/', 1)); - if (rootDir == "about") { - $("#nav-x li.about a").addClass("selected"); - } else if (rootDir == "wear") { - $("#nav-x li.wear a").addClass("selected"); - } else if (rootDir == "tv") { - $("#nav-x li.tv a").addClass("selected"); - } else if (rootDir == "auto") { - $("#nav-x li.auto a").addClass("selected"); + if (urlSegments[1] == "about" || urlSegments[1] == "wear" || urlSegments[1] == "tv" || urlSegments[1] == "auto") { + navEl.find("> li.home > a").addClass('has-subnav'); + subNavEl.find("li." + urlSegments[1] + " > a").addClass("selected"); + } else { + navEl.find("> li.home > a").addClass('selected'); } // highlight Develop tab } else if ($("body").hasClass("develop") || $("body").hasClass("google")) { - $("#header li.develop a").addClass("selected"); - $("#sticky-header").addClass("develop"); + parentNavEl = navEl.find("> li.develop > a"); + parentNavEl.addClass('has-subnav'); + // In Develop docs, also highlight appropriate sub-tab - var rootDir = pagePathOriginal.substring(1,pagePathOriginal.indexOf('/', 1)); - if (rootDir == "training") { - $("#nav-x li.training a").addClass("selected"); - } else if (rootDir == "guide") { - $("#nav-x li.guide a").addClass("selected"); - } else if (rootDir == "reference") { + if (urlSegments[1] == "training") { + subNavEl.find("li.training > a").addClass("selected"); + } else if (urlSegments[1] == "guide") { + subNavEl.find("li.guide > a").addClass("selected"); + } else if (urlSegments[1] == "reference") { // If the root is reference, but page is also part of Google Services, select Google if ($("body").hasClass("google")) { - $("#nav-x li.google a").addClass("selected"); + subNavEl.find("li.google > a").addClass("selected"); } else { - $("#nav-x li.reference a").addClass("selected"); + subNavEl.find("li.reference > a").addClass("selected"); } - } else if ((rootDir == "tools") || (rootDir == "sdk")) { - $("#nav-x li.tools a").addClass("selected"); + } else if ((urlSegments[1] == "tools") || (urlSegments[1] == "sdk")) { + subNavEl.find("li.tools > a").addClass("selected"); } else if ($("body").hasClass("google")) { - $("#nav-x li.google a").addClass("selected"); + subNavEl.find("li.google > a").addClass("selected"); } else if ($("body").hasClass("samples")) { - $("#nav-x li.samples a").addClass("selected"); + subNavEl.find("li.samples > a").addClass("selected"); + } else { + parentNavEl.removeClass('has-subnav').addClass("selected"); } - // highlight Distribute tab } else if ($("body").hasClass("distribute")) { - $("#header li.distribute a").addClass("selected"); - $("#sticky-header").addClass("distribute"); - - var baseFrag = pagePathOriginal.indexOf('/', 1) + 1; - var secondFrag = pagePathOriginal.substring(baseFrag, pagePathOriginal.indexOf('/', baseFrag)); - if (secondFrag == "users") { - $("#nav-x li.users a").addClass("selected"); - } else if (secondFrag == "engage") { - $("#nav-x li.engage a").addClass("selected"); - } else if (secondFrag == "monetize") { - $("#nav-x li.monetize a").addClass("selected"); - } else if (secondFrag == "analyze") { - $("#nav-x li.analyze a").addClass("selected"); - } else if (secondFrag == "tools") { - $("#nav-x li.disttools a").addClass("selected"); - } else if (secondFrag == "stories") { - $("#nav-x li.stories a").addClass("selected"); - } else if (secondFrag == "essentials") { - $("#nav-x li.essentials a").addClass("selected"); - } else if (secondFrag == "googleplay") { - $("#nav-x li.googleplay a").addClass("selected"); + parentNavEl = navEl.find("> li.distribute > a"); + parentNavEl.addClass('has-subnav'); + + if (urlSegments[2] == "users") { + subNavEl.find("li.users > a").addClass("selected"); + } else if (urlSegments[2] == "engage") { + subNavEl.find("li.engage > a").addClass("selected"); + } else if (urlSegments[2] == "monetize") { + subNavEl.find("li.monetize > a").addClass("selected"); + } else if (urlSegments[2] == "analyze") { + subNavEl.find("li.analyze > a").addClass("selected"); + } else if (urlSegments[2] == "tools") { + subNavEl.find("li.disttools > a").addClass("selected"); + } else if (urlSegments[2] == "stories") { + subNavEl.find("li.stories > a").addClass("selected"); + } else if (urlSegments[2] == "essentials") { + subNavEl.find("li.essentials > a").addClass("selected"); + } else if (urlSegments[2] == "googleplay") { + subNavEl.find("li.googleplay > a").addClass("selected"); + } else { + parentNavEl.removeClass('has-subnav').addClass("selected"); } - } else if ($("body").hasClass("about")) { - $("#sticky-header").addClass("about"); } // set global variable so we can highlight the sidenav a bit later (such as for google reference) @@ -392,13 +364,12 @@ false; // navigate across topic boundaries only in design docs var $olClasses = $('<ol class="class-list"></ol>'); var $liClass; - var $imgIcon; var $h2Title; var $pSummary; var $olLessons; var $liLesson; $classLinks.each(function(index) { - $liClass = $('<li></li>'); + $liClass = $('<li class="clearfix"></li>'); $h2Title = $('<a class="title" href="'+$(this).attr('href')+'"><h2>' + $(this).html()+'</h2><span></span></a>'); $pSummary = $('<p class="description">' + $classDescriptions[index] + '</p>'); @@ -407,18 +378,14 @@ false; // navigate across topic boundaries only in design docs $lessons = $(this).closest('li').find('ul li a'); if ($lessons.length) { - $imgIcon = $('<img src="'+toRoot+'assets/images/resource-tutorial.png" ' - + ' width="64" height="64" alt=""/>'); $lessons.each(function(index) { $olLessons.append('<li><a href="'+$(this).attr('href')+'">' + $(this).html()+'</a></li>'); }); } else { - $imgIcon = $('<img src="'+toRoot+'assets/images/resource-article.png" ' - + ' width="64" height="64" alt=""/>'); $pSummary.addClass('article'); } - $liClass.append($h2Title).append($imgIcon).append($pSummary).append($olLessons); + $liClass.append($h2Title).append($pSummary).append($olLessons); $olClasses.append($liClass); }); $('.jd-descr').append($olClasses); @@ -504,15 +471,6 @@ false; // navigate across topic boundaries only in design docs po.src = 'https://apis.google.com/js/plusone.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); - - // Revise the sidenav widths to make room for the scrollbar - // which avoids the visible width from changing each time the bar appears - var $sidenav = $("#side-nav"); - var sidenav_width = parseInt($sidenav.innerWidth()); - - $("#devdoc-nav #nav").css("width", sidenav_width - 4 + "px"); // 4px is scrollbar width - - $(".scroll-pane").removeAttr("tabindex"); // get rid of tabindex added by jscroller if ($(".scroll-pane").length > 1) { @@ -586,6 +544,15 @@ false; // navigate across topic boundaries only in design docs }); }); } + + // Responsive testing + var responsiveParam = location.href.match(/[?&]responsive=?(|true|false)/); + if (responsiveParam) { + localStorage['test-responsive'] = ['', 'true'].indexOf(responsiveParam) > -1; + } + if (localStorage['test-responsive']) { + $(document.body).addClass('responsive'); + } }); // END of the onload event @@ -738,21 +705,28 @@ function initExpandableNavItems(rootTag) { /** Create the list of breadcrumb links in the sticky header */ function buildBreadcrumbs() { - var $breadcrumbUl = $("#sticky-header ul.breadcrumb"); + var $breadcrumbUl = $(".dac-header-crumbs"); + var primaryNavLink = ".dac-nav-list > .dac-nav-item > .dac-nav-link"; + // Add the secondary horizontal nav item, if provided - var $selectedSecondNav = $("div#nav-x ul.nav-x a.selected").clone().removeClass("selected"); + var $selectedSecondNav = $(".dac-nav-secondary .dac-nav-link.selected").clone() + .attr('class', 'dac-header-crumbs-link'); + if ($selectedSecondNav.length) { - $breadcrumbUl.prepend($("<li>").append($selectedSecondNav)) + $breadcrumbUl.prepend($('<li class="dac-header-crumbs-item">').append($selectedSecondNav)); } + // Add the primary horizontal nav - var $selectedFirstNav = $("div#header-wrap ul.nav-x a.selected").clone().removeClass("selected"); + var $selectedFirstNav = $(primaryNavLink + ".selected, " + primaryNavLink + ".has-subnav").clone() + .attr('class', 'dac-header-crumbs-link'); + // If there's no header nav item, use the logo link and title from alt text if ($selectedFirstNav.length < 1) { - $selectedFirstNav = $("<a>") + $selectedFirstNav = $('<a class="dac-header-crumbs-link">') .attr('href', $("div#header .logo a").attr('href')) .text($("div#header .logo img").attr('alt')); } - $breadcrumbUl.prepend($("<li>").append($selectedFirstNav)); + $breadcrumbUl.prepend($('<li class="dac-header-crumbs-item">').append($selectedFirstNav)); } @@ -824,7 +798,7 @@ function setNavBarLeftPos() { function updateSideNavPosition() { var newLeft = $(window).scrollLeft() - navBarLeftPos; $('#devdoc-nav').css({left: -newLeft}); - $('#devdoc-nav .totop').css({left: -(newLeft - parseInt($('#side-nav').css('margin-left')))}); + $('#devdoc-nav .totop').css({left: -(newLeft - parseInt($('#side-nav').css('padding-left')))}); } // TODO: use $(document).ready instead @@ -1068,7 +1042,7 @@ var prevScrollLeft = 0; // used to compare current position to previous position /* Sets the vertical scoll position at which the sticky bar should appear. This method is called to reset the position when search results appear or hide */ function setStickyTop() { - stickyTop = $('#header-wrapper').outerHeight() - $('#sticky-header').outerHeight(); + stickyTop = $('#header-wrapper').outerHeight() - $('#header > .dac-header-inner').outerHeight(); } /* @@ -1078,8 +1052,7 @@ $(window).scroll(function(event) { setStickyTop(); var hiding = false; - var $stickyEl = $('#sticky-header'); - var $menuEl = $('.menu-container'); + var $headerEl = $('#header'); // Exit if there's no sidenav if ($('#side-nav').length == 0) return; // Exit if the mouse target is a DIV, because that means the event is coming @@ -1120,16 +1093,14 @@ $(window).scroll(function(event) { .css({'width':'auto','margin':''}) .prependTo('#side-nav'); // delay hide the sticky - $menuEl.removeClass('sticky-menu'); - $stickyEl.fadeOut(250); + $headerEl.removeClass('is-sticky'); hiding = false; // update the sidenaav position for side scrolling updateSideNavPosition(); } else if (!sticky && shouldBeSticky) { sticky = true; - $stickyEl.fadeIn(10); - $menuEl.addClass('sticky-menu'); + $headerEl.addClass('is-sticky'); // make the sidenav fixed var width = $('#devdoc-nav').width(); @@ -1142,8 +1113,7 @@ $(window).scroll(function(event) { updateSideNavPosition(); } else if (hiding && top < 15) { - $menuEl.removeClass('sticky-menu'); - $stickyEl.hide(); + $headerEl.removeClass('is-sticky'); hiding = false; } resizeNav(250); // pass true in order to delay the scrollbar re-initialization for performance @@ -1841,12 +1811,11 @@ function sync_selection_table(toroot) // if there are api results if ((gMatches.length > 0) || (gGoogleMatches.length > 0)) { // reveal suggestion list - $('.suggest-card.dummy').show(); $('.suggest-card.reference').show(); var listIndex = 0; // list index position // reset the lists - $(".search_filtered_wrapper.reference li").remove(); + $(".suggest-card.reference li").remove(); // ########### ANDROID RESULTS ############# if (gMatches.length > 0) { @@ -1876,13 +1845,12 @@ function sync_selection_table(toroot) } } else { $('.suggest-card.reference').hide(); - $('.suggest-card.dummy').hide(); } // ########### JD DOC RESULTS ############# if (gDocsMatches.length > 0) { // reset the lists - $(".search_filtered_wrapper.docs li").remove(); + $(".suggest-card:not(.reference) li").remove(); // determine google results to show // NOTE: The order of the conditions below for the sugg.type MUST BE SPECIFIC: @@ -1947,7 +1915,7 @@ function sync_selection_table(toroot) } } else { - $('.search_filtered_wrapper.docs .suggest-card:not(.dummy)').hide(300); + $('.suggest-card:not(.reference)').hide(300); } } @@ -1971,14 +1939,14 @@ function search_changed(e, kd, toroot) // show/hide the close button if (text != '') { - $(".search .close").removeClass("hide"); + $("#search-close").removeClass("hide"); } else { - $(".search .close").addClass("hide"); + $("#search-close").addClass("hide"); } // 27 = esc if (e.keyCode == 27) { // close all search results - if (kd) $('.search .close').trigger('click'); + if (kd) $('#search-close').trigger('click'); return true; } // 13 = enter @@ -2536,7 +2504,7 @@ function search_focus_changed(obj, focused) { if (!focused) { if(obj.value == ""){ - $(".search .close").addClass("hide"); + $("#search-close").addClass("hide"); } $(".suggest-card").hide(); } @@ -2553,7 +2521,7 @@ function submit_search() { function hideResults() { $("#searchResults").slideUp('fast', setStickyTop); - $(".search .close").addClass("hide"); + $("#search-close").addClass("hide"); location.hash = ''; $("#search_autocomplete").val("").blur(); @@ -2670,7 +2638,7 @@ google.setOnLoadCallback(function(){ } else { // first time loading search results for this page $('#searchResults').slideDown('slow', setStickyTop); - $(".search .close").removeClass("hide"); + $("#search-close").removeClass("hide"); loadSearchResults(); } }, true); @@ -2714,7 +2682,7 @@ $(window).hashchange( function(){ searchControl.execute(query); $('#searchResults').slideDown('slow', setStickyTop); $("#search_autocomplete").focus(); - $(".search .close").removeClass("hide"); + $("#search-close").removeClass("hide"); updateResultTitle(query); }); @@ -3536,6 +3504,10 @@ function showSamples() { var addedPageResources = {}; $(document).ready(function() { + // Need to initialize hero carousel before other sections for dedupe + // to work correctly. + $('[data-carousel-query]').dacCarouselQuery(); + $('.resource-widget').each(function() { initResourceWidget(this); }); @@ -3545,8 +3517,8 @@ function showSamples() { showing lines that are cut off. This works with the css ellipsis classes to fade last text line and apply an ellipsis char. */ - //card text currently uses 15px line height. - var lineHeight = 15; + //card text currently uses 20px line height. + var lineHeight = 20; $('.card-info .text').ellipsisfade(lineHeight); }); @@ -3562,11 +3534,10 @@ function showSamples() { isCarousel = $widget.hasClass('resource-carousel-layout'), isStack = $widget.hasClass('resource-stack-layout'); - // find size of widget by pulling out its class name - var sizeCols = 1; + // remove illegal col-x class which is not relevant anymore thanks to responsive styles. var m = $widget.get(0).className.match(/\bcol-(\d+)\b/); - if (m) { - sizeCols = parseInt(m[1], 10); + if (m && !$widget.is('.cols > *')) { + $widget.removeClass('col-' + m[1]); } var opts = { @@ -3576,7 +3547,6 @@ function showSamples() { sortOrder: $widget.data('sortorder'), query: $widget.data('query'), section: $widget.data('section'), - sizeCols: sizeCols, /* Added by LFL 6/6/14 */ resourceStyle: $widget.data('resourcestyle') || 'card', stackSort: $widget.data('stacksort') || 'true' @@ -3604,7 +3574,7 @@ function showSamples() { /* Initializes a Resource Carousel Widget */ function drawResourcesCarouselWidget($widget, opts, resources) { $widget.empty(); - var plusone = true; //always show plusone on carousel + var plusone = false; // stop showing plusone buttons on cards $widget.addClass('resource-card slideshow-container') .append($('<a>').addClass('slideshow-prev').text('Prev')) @@ -3642,7 +3612,7 @@ function showSamples() { function drawResourcesStackWidget($widget, opts, resources, sections) { // Don't empty widget, grab all items inside since they will be the first // items stacked, followed by the resource query - var plusone = true; //by default show plusone on section cards + var plusone = false; // stop showing plusone buttons on cards var cards = $widget.find('.resource-card').detach().toArray(); var numStacks = opts.numStacks || 1; var $stacks = []; @@ -3737,22 +3707,33 @@ function showSamples() { return $el; } + + function createResponsiveFlowColumn(cardSize) { + var cardWidth = parseInt(cardSize.match(/(\d+)/)[1], 10); + var column = $('<div>').addClass('col-' + (cardWidth / 3) + 'of6'); + if (cardWidth < 9) { + column.addClass('col-tablet-1of2'); + } else if (cardWidth > 9 && cardWidth < 18) { + column.addClass('col-tablet-1of1'); + } + if (cardWidth < 18) { + column.addClass('col-mobile-1of1') + } + return column; + } /* Initializes a flow widget, see distribute.scss for generating accompanying css */ function drawResourcesFlowWidget($widget, opts, resources) { - $widget.empty(); + $widget.empty().addClass('cols'); var cardSizes = opts.cardSizes || ['6x6']; var i = 0, j = 0; - var plusone = true; // by default show plusone on resource cards + var plusone = false; // stop showing plusone buttons on cards while (i < resources.length) { var cardSize = cardSizes[j++ % cardSizes.length]; cardSize = cardSize.replace(/^\s+|\s+$/,''); - // Some card sizes do not get a plusone button, such as where space is constrained - // or for cards commonly embedded in docs (to improve overall page speed). - plusone = !((cardSize == "6x2") || (cardSize == "6x3") || - (cardSize == "9x2") || (cardSize == "9x3") || - (cardSize == "12x2") || (cardSize == "12x3")); + + var column = createResponsiveFlowColumn(cardSize).appendTo($widget); // A stack has a third dimension which is the number of stacked items var isStack = cardSize.match(/(\d+)x(\d+)x(\d+)/); @@ -3763,7 +3744,7 @@ function showSamples() { // Create a stack container which should have the dimensions defined // by the product of the items inside. $stackDiv = $('<div>').addClass('resource-card-stack resource-card-' + isStack[1] - + 'x' + isStack[2] * isStack[3]) .appendTo($widget); + + 'x' + isStack[2] * isStack[3]) .appendTo(column); } // Build each stack item or just a single item @@ -3785,7 +3766,7 @@ function showSamples() { stackCount = 0; } - $card.appendTo($stackDiv || $widget); + $card.appendTo($stackDiv || column); } while (++i < resources.length && stackCount > 0); } @@ -3800,6 +3781,10 @@ function showSamples() { } function buildResourceList(opts) { + return $.queryResources(opts); + } + + $.queryResources = function(opts) { var maxResults = opts.maxResults || 100; var query = opts.query || ''; @@ -3848,8 +3833,9 @@ function showSamples() { // add to list of already added indices for (var j = 0; j < resources.length; j++) { - // console.log(resources[j].title); - addedResourceIndices[resources[j].index] = 1; + if (resources[j]) { + addedResourceIndices[resources[j].index] = 1; + } } // concat to final results list @@ -3891,7 +3877,7 @@ function showSamples() { function getResourceNotAlreadyAddedFilter(addedResourceIndices) { return function(resource) { - return !addedResourceIndices[resource.index]; + return resource && !addedResourceIndices[resource.index]; }; } @@ -4155,7 +4141,7 @@ function showSamples() { $this.parent().siblings().each(function () { if ($(this).is(":visible")) { - var h = $(this).height(); + var h = $(this).outerHeight(true); remainingHeight = remainingHeight - h; } }); @@ -4354,3 +4340,467 @@ function showSamples() { } } })(); + +(function($) { + 'use strict'; + + /** + * Toggle Floating Label state. + * @param {HTMLElement} el - The DOM element. + * @param options + * @constructor + */ + function FloatingLabel(el, options) { + this.el = $(el); + this.options = $.extend({}, FloatingLabel.DEFAULTS_, options); + this.group = this.el.closest('.dac-form-input-group'); + this.input = this.group.find('.dac-form-input'); + + this.checkValue_ = this.checkValue_.bind(this); + this.checkValue_(); + + this.input.on('focus', function() { + this.group.addClass('dac-focused'); + }.bind(this)); + this.input.on('blur', function() { + this.group.removeClass('dac-focused'); + this.checkValue_(); + }.bind(this)); + this.input.on('keyup', this.checkValue_); + } + + /** + * The label is moved out of the textbox when it has a value. + */ + FloatingLabel.prototype.checkValue_ = function() { + if (this.input.val().length) { + this.group.addClass('dac-has-value'); + } else { + this.group.removeClass('dac-has-value'); + } + }; + + /** + * jQuery plugin + * @param {object} options - Override default options. + */ + $.fn.dacFloatingLabel = function(options) { + return this.each(function() { + new FloatingLabel(this, options); + }); + }; + + $(document).on('ready.aranja', function() { + $('.dac-form-floatlabel').each(function() { + $(this).dacFloatingLabel($(this).data()); + }); + }); +})(jQuery); + +/* global toRoot, CAROUSEL_OVERRIDE */ +(function($) { + // Ordering matters + var TAG_MAP = [ + {from: 'developerstory', to: 'Android Developer Story'}, + {from: 'googleplay', to: 'Google Play'} + ]; + + function DacCarouselQuery(el) { + this.el = $(el); + + var opts = this.el.data(); + opts.maxResults = parseInt(opts.maxResults || '100', 10); + opts.query = opts.carouselQuery; + var resources = $.queryResources(opts); + + this.el.empty(); + $(resources).map(function() { + var resource = $.extend({}, this, CAROUSEL_OVERRIDE[this.url]); + var slide = $('<article class="dac-expand dac-hero">'); + var image = cleanUrl(resource.heroImage || resource.image); + var fullBleed = image && !resource.heroColor; + + // Configure background + slide.css({ + backgroundImage: fullBleed ? 'url(' + image + ')' : '', + backgroundColor: resource.heroColor || '' + }); + + // Should copy be inverted + slide.toggleClass('dac-invert', resource.heroInvert || fullBleed); + slide.toggleClass('dac-darken', fullBleed); + + var cols = $('<div class="cols dac-hero-content">'); + + // inline image column + var rightCol = $('<div class="col-1of2 col-push-1of2 dac-hero-figure">') + .appendTo(cols); + + if (!fullBleed && image) { + rightCol.append($('<img>').attr('src', image)); + } + + // info column + $('<div class="col-1of2 col-pull-1of2">') + .append($('<div class="dac-hero-tag">').text(formatTag(resource))) + .append($('<h1 class="dac-hero-title">').text(formatTitle(resource))) + .append($('<p class="dac-hero-description">').text(resource.summary)) + .append($('<a class="dac-hero-cta">') + .text(formatCTA(resource)) + .attr('href', cleanUrl(resource.url)) + .prepend($('<span class="dac-sprite dac-auto-chevron">')) + ) + .appendTo(cols); + + slide.append(cols.wrap('<div class="wrap">').parent()); + return slide[0]; + }).prependTo(this.el); + + // Pagination element. + this.el.append('<div class="dac-hero-carousel-pagination"><div class="wrap" data-carousel-pagination>'); + + this.el.dacCarousel(); + } + + function cleanUrl(url) { + if (url && url.indexOf('//') === -1) { + url = toRoot + url; + } + return url; + } + + function formatTag(resource) { + // Hmm, need a better more scalable solution for this. + for (var i = 0, mapping; mapping = TAG_MAP[i]; i++) { + if (resource.tags.indexOf(mapping.from) > -1) { + return mapping.to; + } + } + return resource.type; + } + + function formatTitle(resource) { + return resource.title.replace(/android developer story: /i, ''); + } + + function formatCTA(resource) { + return resource.type === 'youtube' ? 'Watch the video' : 'Learn more'; + } + + // jQuery plugin + $.fn.dacCarouselQuery = function() { + return this.each(function() { + var el = $(this); + var data = el.data('dac.carouselQuery'); + + if (!data) { el.data('dac.carouselQuery', (data = new DacCarouselQuery(el))); } + }); + }; + + // Data API + $(function() { + $('[data-carousel-query]').dacCarouselQuery(); + }); +})(jQuery); + +(function($) { + /** + * A CSS based carousel, inspired by SequenceJS. + * @param {jQuery} el + * @param {object} options + * @constructor + */ + function DacCarousel(el, options) { + this.el = $(el); + this.options = options = $.extend({}, DacCarousel.OPTIONS, this.el.data(), options || {}); + this.frames = this.el.find(options.frameSelector); + this.count = this.frames.size(); + this.current = options.start; + + this.initPagination(); + this.initEvents(); + this.initFrame(); + } + + DacCarousel.OPTIONS = { + auto: true, + autoTime: 10000, + autoMinTime: 5000, + btnPrev: '[data-carousel-prev]', + btnNext: '[data-carousel-next]', + frameSelector: 'article', + loop: true, + start: 0, + pagination: '[data-carousel-pagination]' + }; + + DacCarousel.prototype.initPagination = function() { + this.pagination = $([]); + if (!this.options.pagination) { return; } + + var pagination = $('<ul class="dac-pagination">'); + var parent = this.el; + if (typeof this.options.pagination === 'string') { parent = this.el.find(this.options.pagination); } + + if (this.count > 1) { + for (var i = 0; i < this.count; i++) { + var li = $('<li class="dac-pagination-item">').text(i); + if (i === this.options.start) { li.addClass('active'); } + li.click(this.go.bind(this, i)); + + pagination.append(li); + } + this.pagination = pagination.children(); + parent.append(pagination); + } + }; + + DacCarousel.prototype.initEvents = function() { + var that = this; + + this.el.hover(function() { + that.pauseRotateTimer(); + }, function() { + that.startRotateTimer(); + }); + + $(this.options.btnPrev).click(function(e) { + e.preventDefault(); + that.prev(); + }); + + $(this.options.btnNext).click(function(e) { + e.preventDefault(); + that.next(); + }); + }; + + DacCarousel.prototype.initFrame = function() { + this.frames.removeClass('active').eq(this.options.start).addClass('active'); + }; + + DacCarousel.prototype.startRotateTimer = function() { + if (!this.options.auto || this.rotateTimer) { return; } + this.rotateTimer = setTimeout(this.next.bind(this), this.options.autoTime); + }; + + DacCarousel.prototype.pauseRotateTimer = function() { + clearTimeout(this.rotateTimer); + this.rotateTimer = null; + }; + + DacCarousel.prototype.prev = function() { + this.go(this.current - 1); + }; + + DacCarousel.prototype.next = function() { + this.go(this.current + 1); + }; + + DacCarousel.prototype.go = function(next) { + // Figure out what the next slide is. + while (this.count > 0 && next >= this.count) { next -= this.count; } + while (next < 0) { next += this.count; } + + // Cancel if we're already on that slide. + if (next === this.current) { return; } + + // Prepare next slide. + this.frames.eq(next).removeClass('out'); + + // Recalculate styles before starting slide transition. + var that = this; + resolveStyles(this.el[0], function() { + // Update pagination + that.pagination.removeClass('active').eq(next).addClass('active'); + + // Transition out current frame + that.frames.eq(that.current).toggleClass('active out'); + + // Transition in a new frame + that.frames.eq(next).toggleClass('active'); + + that.current = next; + }); + }; + + // Helper + function resolveStyles(el, callback) { + /*jshint expr:true*/ + el.offsetTop; + callback(); + } + + // jQuery plugin + $.fn.dacCarousel = function() { + this.each(function() { + var $el = $(this); + $el.data('dac-carousel', new DacCarousel(this)); + }); + return this; + }; + + // Data API + $(function() { + $('[data-carousel]').dacCarousel(); + }); +})(jQuery); + +(function($) { + 'use strict'; + + /** + * Toggle the visabilty of the mobile navigation. + * @param {HTMLElement} el - The DOM element. + * @param options + * @constructor + */ + function ToggleModal(el, options) { + this.el = $(el); + this.options = $.extend({}, ToggleModal.DEFAULTS_, options); + this.el.on('click', this.clickHandler_.bind(this)); + } + + ToggleModal.DEFAULTS_ = { + toggleClass: 'dac-modal-open' + }; + + /** + * The actual toggle logic. + * @param event + * @private + */ + ToggleModal.prototype.clickHandler_ = function(event) { + event.preventDefault(); + //TODO: Toggle a class on the modal itself + $('body').toggleClass(this.options.toggleClass); + $('.dac-modal-dimmer').toggleClass('dac-active'); + $('.dac-modal-window').toggleClass('dac-active'); + }; + + /** + * jQuery plugin + * @param {object} options - Override default options. + */ + $.fn.dacToggleModal = function(options) { + return this.each(function() { + new ToggleModal(this, options); + }); + }; + + /** + * Data Attribute API + */ + $(document).on('ready.aranja', function() { + $('[data-modal-toogle]').each(function() { + $(this).dacToggleModal($(this).data()); + }); + }); +})(jQuery); + +(function($) { + 'use strict'; + + /** + * Toggle the visabilty of the mobile navigation. + * @param {HTMLElement} el - The DOM element. + * @param options + * @constructor + */ + function ToggleNav(el, options) { + this.el = $(el); + this.options = $.extend({}, ToggleNav.DEFAULTS_, options); + this.options.target = [this.options.navigation]; + + if (this.options.body) {this.options.target.push('body')} + if (this.options.dimmer) {this.options.target.push(this.options.dimmer)} + + this.el.on('click', this.clickHandler_.bind(this)); + } + + /** + * ToggleNav Default Settings + * @type {{body: boolean, dimmer: string, navigation: string, toggleClass: string}} + * @private + */ + ToggleNav.DEFAULTS_ = { + body: true, + dimmer: '.dac-nav-dimmer', + navigation: '[data-dac-nav]', + toggleClass: 'dac-nav-open' + }; + + /** + * The actual toggle logic. + * @param event + * @private + */ + ToggleNav.prototype.clickHandler_ = function(event) { + event.preventDefault(); + $(this.options.target.join(', ')).toggleClass(this.options.toggleClass); + }; + + /** + * jQuery plugin + * @param {object} options - Override default options. + */ + $.fn.dacToggleMobileNav = function(options) { + return this.each(function() { + new ToggleNav(this, options); + }); + }; + + /** + * Data Attribute API + */ + $(window).on('load.aranja', function() { + $('[data-dac-toggle-nav]').each(function() { + $(this).dacToggleMobileNav($(this).data()); + }); + }); +})(jQuery); + +(function($) { + 'use strict'; + + /** + * Submit the newsletter form to a Google Form. + * @param {HTMLElement} el - The Form DOM element. + * @constructor + */ + function NewsletterForm(el) { + this.el = $(el); + this.url = this.el.attr('action'); + this.el.on('submit', this.submitHandler_.bind(this)); + } + + /** + * Close the modal when the form is sent. + * @private + */ + NewsletterForm.prototype.submitHandler_ = function() { + //TODO: Close the modal with an event and let modal.js handle this + $('body').removeClass('dac-modal-open'); + $('.dac-modal-dimmer').removeClass('dac-active'); + $('.dac-modal-window').removeClass('dac-active'); + }; + + /** + * jQuery plugin + * @param {object} options - Override default options. + */ + $.fn.dacNewsletterForm = function(options) { + return this.each(function() { + new NewsletterForm(this, options); + }); + }; + + /** + * Data Attribute API + */ + $(document).on('ready.aranja', function() { + $('[data-newsletter-form]').each(function() { + $(this).dacNewsletterForm(); + }); + }); +})(jQuery); diff --git a/tools/droiddoc/templates-sdk/class.cs b/tools/droiddoc/templates-sdk/class.cs index 693eaedc9..7aa99f968 100644 --- a/tools/droiddoc/templates-sdk/class.cs +++ b/tools/droiddoc/templates-sdk/class.cs @@ -169,15 +169,13 @@ Summary: <div class="jd-descr"> <?cs call:deprecated_warning(class) ?> -<?cs if:subcount(class.descr) || subcount(class.annotationdocumentation) ?> +<?cs if:subcount(class.descr) ?> <h2>Class Overview</h2> -<?cs if:subcount(class.descr) ?><p itemprop="articleBody"><?cs call:tag_list(class.descr) ?></p><?cs /if ?> -<?cs if:subcount(class.annotationdocumentation) ?><?cs each:annodoc = class.annotationdocumentation?> -<p><?cs var:annodoc.text ?></p> -<?cs /each?><?cs /if?> +<p itemprop="articleBody"><?cs call:tag_list(class.descr) ?></p> <?cs /if ?> <?cs call:see_also_tags(class.seeAlso) ?> + </div><!-- jd-descr --> @@ -198,12 +196,12 @@ Summary: </td> <td class="jd-linkcol" width="100%"><nobr> <span class="sympad"><?cs call:cond_link(method.name, toroot, method.href, included) ?></span>(<?cs call:parameter_list(method.params) ?>)</nobr> - <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) || subcount(method.showAnnotations) ?> - <div class="jd-descrdiv"> - <?cs if:subcount(method.shortDescr) || subcount(method.annotationdocumentation) ?><?cs call:short_descr(method)?><?cs /if?> - <?cs call:show_annotations_list(method) ?> - </div> - <?cs /if ?> + <?cs if:subcount(method.shortDescr) || subcount(method.deprecated) ?> + <div class="jd-descrdiv"> + <?cs call:short_descr(method) ?> + <?cs call:show_annotations_list(method) ?> + </div> + <?cs /if ?> </td></tr> <?cs set:count = count + #1 ?> <?cs /each ?> diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs index d48ea2974..a02774944 100644 --- a/tools/droiddoc/templates-sdk/components/masthead.cs +++ b/tools/droiddoc/templates-sdk/components/masthead.cs @@ -4,7 +4,7 @@ <?cs else ?> <a name="top"></a> -<!-- dialog to prompt lang pref change when loaded from hardcoded URL +<!-- dialog to prompt lang pref change when loaded from hardcoded URL <div id="langMessage" style="display:none"> <div> <div class="lang en"> @@ -52,260 +52,170 @@ <?cs if:!devsite ?><?cs # leave out the global header for devsite; it is in devsite template ?> <!-- Header --> <div id="header-wrapper"> - <div id="header"><?cs call:butter_bar() ?> - <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" - 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> - <a href="#" class="arrow-active">Quicknav</a> - </div> - </div> - <ul class="nav-x col-9"> - <li class="design"> - <a href="<?cs var:toroot ?>design/index.html" - zh-tw-lang="設計" - zh-cn-lang="设计" - ru-lang="Проектирование" - ko-lang="디자인" - ja-lang="設計" - es-lang="Diseñar" - >Design</a></li> - <li class="develop"><a href="<?cs var:toroot ?>develop/index.html" - zh-tw-lang="開發" - zh-cn-lang="开发" - ru-lang="Разработка" - ko-lang="개발" - ja-lang="開発" - es-lang="Desarrollar" - >Develop</a></li> - <li class="distribute last"><a href="<?cs var:toroot ?>distribute/<?cs - if:android.whichdoc == "offline" ?>googleplay/<?cs /if ?>index.html" - zh-tw-lang="發佈" - zh-cn-lang="分发" - ru-lang="Распространение" - ko-lang="배포" - ja-lang="配布" - es-lang="Distribuir" - >Distribute</a></li> - </ul> + <div class="dac-header" id="header"><?cs call:butter_bar() ?> + <div class="dac-header-inner"> + <a class="dac-nav-toggle" data-dac-toggle-nav href="javascript:;" title="Open navigation"> + <span class="dac-nav-hamburger"> + <span class="dac-nav-hamburger-top"></span> + <span class="dac-nav-hamburger-mid"></span> + <span class="dac-nav-hamburger-bot"></span> + </span> + </a> + <a class="dac-header-logo" href="<?cs var:toroot ?>index.html"> + <img class="dac-header-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png" + srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x" + width="32" height="36" alt="Android" /> Developers + </a> + <ul class="dac-header-crumbs"> + <?cs # More <li> elements added here with javascript ?> + <?cs if:!section.landing ?><li class="dac-header-crumbs-item"><span class="dac-header-crumbs-link current"><?cs var:page.title ?></a></li><?cs + /if ?> + </ul> <?cs # ADD SEARCH AND MENU ?> <?cs call:header_search_widget() ?> - - <!-- Expanded quicknav --> - <div id="quicknav" class="col-13"> - <ul> - <li class="about"> - <ul> - <li><a href="<?cs var:toroot ?>about/index.html">About</a></li> - <li><a href="<?cs var:toroot ?>wear/index.html">Wear</a></li> - <li><a href="<?cs var:toroot ?>tv/index.html">TV</a></li> - <li><a href="<?cs var:toroot ?>auto/index.html">Auto</a></li> - </ul> - </li> - <li class="design"> - <ul> - <li><a href="<?cs var:toroot ?>design/index.html">Get Started</a></li> - <li><a href="<?cs var:toroot ?>design/devices.html">Devices</a></li> - <li><a href="<?cs var:toroot ?>design/style/index.html">Style</a></li> - <li><a href="<?cs var:toroot ?>design/patterns/index.html">Patterns</a></li> - <li><a href="<?cs var:toroot ?>design/building-blocks/index.html">Building Blocks</a></li> - <li><a href="<?cs var:toroot ?>design/downloads/index.html">Downloads</a></li> - <li><a href="<?cs var:toroot ?>design/videos/index.html">Videos</a></li> - </ul> - </li> - <li class="develop"> - <ul> - <li><a href="<?cs var:toroot ?>training/index.html" - zh-tw-lang="訓練課程" - zh-cn-lang="培训" - ru-lang="Курсы" - ko-lang="교육" - ja-lang="トレーニング" - es-lang="Capacitación" - >Training</a></li> - <li><a href="<?cs var:toroot ?>guide/index.html" - zh-tw-lang="API 指南" - zh-cn-lang="API 指南" - ru-lang="Руководства по API" - ko-lang="API 가이드" - ja-lang="API ガイド" - es-lang="Guías de la API" - >API Guides</a></li> - <li><a href="<?cs var:toroot ?>reference/packages.html" - zh-tw-lang="參考資源" - zh-cn-lang="参考" - ru-lang="Справочник" - ko-lang="참조문서" - ja-lang="リファレンス" - es-lang="Referencia" - >Reference</a></li> - <li><a href="<?cs var:toroot ?>sdk/index.html" - zh-tw-lang="相關工具" - zh-cn-lang="工具" - ru-lang="Инструменты" - ko-lang="도구" - ja-lang="ツール" - es-lang="Herramientas" - >Tools</a> - </li> - <li><a href="<?cs var:toroot ?>google/index.html">Google Services</a> - </li> - <?cs if:android.hasSamples ?> - <li><a href="<?cs var:toroot ?>samples/index.html">Samples</a> - </li> - <?cs /if ?> - </ul> - </li> - <li class="distribute last"> - <ul> - <li><a href="<?cs var:toroot ?>distribute/googleplay/index.html">Google Play</a></li> - <li><a href="<?cs var:toroot ?>distribute/essentials/index.html">Essentials</a></li> - <li><a href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li> - <li><a href="<?cs var:toroot ?>distribute/engage/index.html">Engage & Retain</a></li> - <li><a href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a></li> - <li><a href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a></li> - <li><a href="<?cs var:toroot ?>distribute/tools/index.html">Tools & Reference</a></li> - <li><a href="<?cs var:toroot ?>distribute/stories/index.html">Developer Stories</a></li> - </ul> - </li> - </ul> - </div><!-- /Expanded quicknav --> + <a class="dac-header-consoleBtn" href="https://play.google.com/apps/publish/"> + <span class="dac-sprite dac-google-play"></span> + <span class="dac-visible-desktop-inline">Developer</span> + Console + </a> </div><!-- end header-wrap.wrap --> </div><!-- end header --> - <?cs if:about || wear || tv || auto ?> - <!-- Secondary x-nav --> - <div id="nav-x"> - <div class="wrap"> - <ul class="nav-x col-9 about" style="width:100%"> - <li class="about"><a href="<?cs var:toroot ?>about/index.html" - >About</a></li> - <li class="wear"><a href="<?cs var:toroot ?>wear/index.html" - >Wear</a></li> - <li class="tv"><a href="<?cs var:toroot ?>tv/index.html" - >TV</a></li> - <li class="auto"><a href="<?cs var:toroot ?>auto/index.html" - >Auto</a></li> - </ul> - </div> - </div> - <!-- /Sendondary x-nav ABOUT --> - - - - <?cs elif:training || guide || reference || tools || develop || google || samples ?> - <!-- Secondary x-nav --> - <div id="nav-x"> - <div class="wrap" style="position:relative;z-index:1"> - - <?cs if:reference ?> - - <?cs /if ?> - - <ul class="nav-x col-9 develop" style="width:100%"> - <li class="training"><a href="<?cs var:toroot ?>training/index.html" - zh-tw-lang="訓練課程" - zh-cn-lang="培训" - ru-lang="Курсы" - ko-lang="교육" - ja-lang="トレーニング" - es-lang="Capacitación" - >Training</a></li> - <li class="guide"><a href="<?cs var:toroot ?>guide/index.html" - zh-tw-lang="API 指南" - zh-cn-lang="API 指南" - ru-lang="Руководства по API" - ko-lang="API 가이드" - ja-lang="API ガイド" - es-lang="Guías de la API" - >API Guides</a></li> - <li class="reference"><a href="<?cs var:toroot ?>reference/packages.html" - zh-tw-lang="參考資源" - zh-cn-lang="参考" - ru-lang="Справочник" - ko-lang="참조문서" - ja-lang="リファレンス" - es-lang="Referencia" - >Reference</a></li> - <li class="tools"><a href="<?cs var:toroot ?>sdk/index.html" - zh-tw-lang="相關工具" - zh-cn-lang="工具" - ru-lang="Инструменты" - ko-lang="도구" - ja-lang="ツール" - es-lang="Herramientas" - >Tools</a></li> - <li class="google"><a href="<?cs var:toroot ?>google/index.html" - >Google Services</a> - </li> - <?cs if:android.hasSamples ?> - <li class="samples"><a href="<?cs var:toroot ?>samples/index.html" - >Samples</a> - </li> - <?cs /if ?> - </ul> - </div> - </div> - <!-- /Sendondary x-nav DEVELOP --> - - <?cs elif:distribute || googleplay || essentials || users || engage || monetize || analyze || disttools || stories ?> - <!-- Secondary distribute x-nav --> - <div id="nav-x"> - <div class="wrap"> - <ul class="nav-x distribute"> - <li class="googleplay"><a href="<?cs var:toroot ?>distribute/googleplay/index.html" - >Google Play</a></li> - <li class="essentials"><a href="<?cs var:toroot ?>distribute/essentials/index.html" - >Essentials</a></li> - <li class="users"><a href="<?cs var:toroot ?>distribute/users/index.html" - >Get Users</a></li> - <li class="engage"><a href="<?cs var:toroot ?>distribute/engage/index.html" - >Engage & Retain</a></li> - <li class="monetize"><a href="<?cs var:toroot ?>distribute/monetize/index.html" - >Monetize</a> - </li> - <li class="analyze"><a href="<?cs var:toroot ?>distribute/analyze/index.html" - >Analyze</a> - </li> - <li class="disttools"><a href="<?cs var:toroot ?>distribute/tools/index.html" - >Tools</a> - </li> - <li class="stories"><a href="<?cs var:toroot ?>distribute/stories/index.html" - >Stories</a> - </li> - </ul> - <a href="https://play.google.com/apps/publish/" class="developer-console-btn">Developer Console</a> - </div> <!-- /Secondary distribute x-nav --> - </div> - <!-- /Sendondary x-nav DISTRIBUTE --> - <?cs /if ?> - <div id="searchResults" class="wrap" style="display:none;"> <h2 id="searchTitle">Results</h2> <div id="leftSearchControl" class="search-control">Loading...</div> </div> </div> <!--end header-wrapper --> - <div id="sticky-header"> - <div> - <a class="logo" href="#top"></a> - <a class="top" href="#top"></a> - <ul class="breadcrumb"> - <?cs # More <li> elements added here with javascript ?> - <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs - /if ?> - </ul> - </div> - </div> + <!-- Navigation--> + <nav class="dac-nav"> + <div class="dac-nav-dimmer" data-dac-toggle-nav></div> + <ul class="dac-nav-list" data-dac-nav> + <li class="dac-nav-item dac-nav-head"> + <a class="dac-nav-link dac-nav-logo" data-dac-toggle-nav href="javascript:;" title="Close navigation"> + <img class="dac-logo-image" src="<?cs var:toroot ?>assets/images/android_logo.png" + srcset="<?cs var:toroot ?>assets/images/android_logo@2x.png 2x" + width="32" height="36" alt="Android" /> Developers + </a> + </li> + <li class="dac-nav-item home"> + <a class="dac-nav-link dac-visible-mobile-block" href="<?cs var:toroot ?>index.html">Home</a> + <ul class="dac-nav-secondary about"> + <li class="dac-nav-item about"> + <a class="dac-nav-link" href="<?cs var:toroot ?>about/index.html">About</a> + </li> + <li class="dac-nav-item wear"> + <a class="dac-nav-link" href="<?cs var:toroot ?>wear/index.html">Wear</a> + </li> + <li class="dac-nav-item tv"> + <a class="dac-nav-link" href="<?cs var:toroot ?>tv/index.html">TV</a> + </li> + <li class="dac-nav-item auto"> + <a class="dac-nav-link" href="<?cs var:toroot ?>auto/index.html">Auto</a> + </li> + </ul> + </li> + <li class="dac-nav-item design"> + <a class="dac-nav-link" href="<?cs var:toroot ?>design/index.html" + zh-tw-lang="設計" + zh-cn-lang="设计" + ru-lang="Проектирование" + ko-lang="디자인" + ja-lang="設計" + es-lang="Diseñar">Design</a> + </li> + <li class="dac-nav-item develop"> + <a class="dac-nav-link" href="<?cs var:toroot ?>develop/index.html" + zh-tw-lang="開發" + zh-cn-lang="开发" + ru-lang="Разработка" + ko-lang="개발" + ja-lang="開発" + es-lang="Desarrollar">Develop</a> + <ul class="dac-nav-secondary develop"> + <li class="dac-nav-item training"> + <a class="dac-nav-link" href="<?cs var:toroot ?>training/index.html" + zh-tw-lang="訓練課程" + zh-cn-lang="培训" + ru-lang="Курсы" + ko-lang="교육" + ja-lang="トレーニング" + es-lang="Capacitación">Training</a> + </li> + <li class="dac-nav-item guide"> + <a class="dac-nav-link" href="<?cs var:toroot ?>guide/index.html" + zh-tw-lang="API 指南" + zh-cn-lang="API 指南" + ru-lang="Руководства по API" + ko-lang="API 가이드" + ja-lang="API ガイド" + es-lang="Guías de la API">API Guides</a> + </li> + <li class="dac-nav-item reference"> + <a class="dac-nav-link" href="<?cs var:toroot ?>reference/packages.html" + zh-tw-lang="參考資源" + zh-cn-lang="参考" + ru-lang="Справочник" + ko-lang="참조문서" + ja-lang="リファレンス" + es-lang="Referencia">Reference</a> + </li> + <li class="dac-nav-item tools"> + <a class="dac-nav-link" href="<?cs var:toroot ?>sdk/index.html" + zh-tw-lang="相關工具" + zh-cn-lang="工具" + ru-lang="Инструменты" + ko-lang="도구" + ja-lang="ツール" + es-lang="Herramientas">Tools</a></li> + <li class="dac-nav-item google"> + <a class="dac-nav-link" href="<?cs var:toroot ?>google/index.html">Google Services</a> + </li> + <?cs if:android.hasSamples ?> + <li class="dac-nav-item samples"> + <a class="dac-nav-link" href="<?cs var:toroot ?>samples/index.html">Samples</a> + </li> + <?cs /if ?> + </ul> + </li> + <li class="dac-nav-item distribute"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/<?cs if:android.whichdoc == 'offline' ?>googleplay/<?cs /if ?>index.html" + zh-tw-lang="發佈" + zh-cn-lang="分发" + ru-lang="Распространение" + ko-lang="배포" + ja-lang="配布" + es-lang="Distribuir">Distribute</a> + <ul class="dac-nav-secondary distribute"> + <li class="dac-nav-item googleplay"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/googleplay/index.html">Google Play</a></li> + <li class="dac-nav-item essentials"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/essentials/index.html">Essentials</a></li> + <li class="dac-nav-item users"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/users/index.html">Get Users</a></li> + <li class="dac-nav-item engage"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/engage/index.html">Engage & Retain</a></li> + <li class="dac-nav-item monetize"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/monetize/index.html">Monetize</a> + </li> + <li class="dac-nav-item analyze"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/analyze/index.html">Analyze</a> + </li> + <li class="dac-nav-item disttools"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/tools/index.html">Tools</a> + </li> + <li class="dac-nav-item stories"> + <a class="dac-nav-link" href="<?cs var:toroot ?>distribute/stories/index.html">Stories</a> + </li> + </ul> + </li> + </ul> + </nav> + <!-- end navigation--> <?cs /if ?><?cs # end if/else !devsite ?> <?cs /if ?><?cs # end if/else preview ?><?cs /def ?> @@ -325,7 +235,7 @@ </a> </div> <div class="col-8" style="margin:0"><h1 style="margin: 4px 0 0 0px;padding:0;line-height:16px; -color:#666;font-weight:100;font-size:27px;">M Developer Preview</h1></div> +color:#666;font-weight:100;font-size:27px;">L Developer Preview</h1></div> <?cs # ADD SEARCH AND MENU ?> <?cs call:header_search_widget() ?> @@ -340,18 +250,6 @@ color:#666;font-weight:100;font-size:27px;">M Developer Preview</h1></div> </div> </div> <!--end header-wrapper --> -<div id="sticky-header"> - <div> - <a class="logo" href="#top"></a> - <a class="top" href="#top"></a> - <ul class="breadcrumb"> - <?cs # More <li> elements added here with javascript ?> - <?cs if:!section.landing ?><li class="current"><?cs var:page.title ?></li><?cs - /if ?> - </ul> - </div> -</div> - <?cs /def ?> @@ -365,11 +263,11 @@ color:#666;font-weight:100;font-size:27px;">M Developer Preview</h1></div> <div id="butterbar-wrapper"> <div id="butterbar"> <a href="http://googleblog.blogspot.com/" id="butterbar-message"> - The Android {version_number} SDK will be available on {Month} {Day}! + The Android 5.0 SDK will be available on October 17th! </a> </div> </div> -?> +?> <?cs /def ?> diff --git a/tools/droiddoc/templates-sdk/customizations.cs b/tools/droiddoc/templates-sdk/customizations.cs index c8c88cc46..15dc3af72 100644 --- a/tools/droiddoc/templates-sdk/customizations.cs +++ b/tools/droiddoc/templates-sdk/customizations.cs @@ -1,10 +1,11 @@ <?cs def:fullpage() ?> <div id="body-content"> + <div> <?cs /def ?> <?cs def:sdk_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -18,10 +19,11 @@ def:sdk_nav() ?> def:no_nav() ?> <div class="wrap clearfix" id="body-content"> + <div> <?cs /def ?><?cs def:tools_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs @@ -38,7 +40,7 @@ def:tools_nav() ?> <?cs /def ?> <?cs def:training_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -57,7 +59,7 @@ def:training_nav() ?> <?cs /def ?><?cs def:googleplay_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/googleplay/googleplay_toc.cs" ?> @@ -71,7 +73,7 @@ def:googleplay_nav() ?> <?cs /def ?><?cs def:essentials_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/essentials/essentials_toc.cs" ?> @@ -85,7 +87,7 @@ def:essentials_nav() ?> <?cs /def ?><?cs def:users_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/users/users_toc.cs" ?> @@ -99,7 +101,7 @@ def:users_nav() ?> <?cs /def ?><?cs def:engage_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/engage/engage_toc.cs" ?> @@ -113,7 +115,7 @@ def:engage_nav() ?> <?cs /def ?><?cs def:analyze_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/analyze/analyze_toc.cs" ?> @@ -127,7 +129,7 @@ def:analyze_nav() ?> <?cs /def ?><?cs def:monetize_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/monetize/monetize_toc.cs" ?> @@ -141,7 +143,7 @@ def:monetize_nav() ?> <?cs /def ?><?cs def:disttools_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/tools/disttools_toc.cs" ?> @@ -155,7 +157,7 @@ def:disttools_nav() ?> <?cs /def ?><?cs def:stories_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs include:"../../../../frameworks/base/docs/html/distribute/stories/stories_toc.cs" ?> @@ -169,7 +171,7 @@ def:stories_nav() ?> <?cs /def ?><?cs def:guide_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -187,7 +189,7 @@ def:guide_nav() ?> <?cs /def ?> <?cs def:design_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -206,7 +208,7 @@ def:design_nav() ?> <?cs /def ?> <?cs def:distribute_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -225,7 +227,7 @@ def:distribute_nav() ?> <?cs def:samples_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -244,7 +246,7 @@ def:samples_nav() ?> <?cs def:google_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -267,7 +269,7 @@ def:google_nav() ?> <?cs def:about_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-3" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -287,7 +289,7 @@ def:about_nav() ?> <?cs def:wear_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> @@ -306,7 +308,7 @@ def:wear_nav() ?> <?cs def:preview_nav() ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav" class="scroll-pane"> <?cs @@ -325,7 +327,7 @@ def:default_left_nav() ?> <?cs if:reference.gcm || reference.gms ?> <?cs call:google_nav() ?> <?cs else ?> - <div class="wrap clearfix" id="body-content"> + <div class="wrap clearfix" id="body-content"><div class="cols"> <div class="col-4" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement"> <div id="devdoc-nav"> <div id="api-nav-header"> @@ -433,78 +435,25 @@ def:default_left_nav() ?> <?cs def:header_search_widget() ?> -<div class="menu-container"> - <div class="moremenu"> - <div id="more-btn"></div> - </div> - <div class="morehover" id="moremenu"> - <div class="top"></div> - <div class="mid"> - <div class="header">Links</div> - <ul> - <li><a href="https://play.google.com/apps/publish/" target="_googleplay">Google Play Developer Console</a></li> - <li><a href="http://android-developers.blogspot.com/">Android Developers Blog</a></li> - <li><a href="<?cs var:toroot ?>about/index.html">About Android</a></li> - </ul> - <div class="header">Android Sites</div> - <ul> - <li><a href="http://www.android.com">Android.com</a></li> - <li class="active"><a>Android Developers</a></li> - <li><a href="http://source.android.com">Android Open Source Project</a></li> - </ul> - - <?cs # Include language switcher only in online docs ?> - <?cs if:android.whichdoc == "online" ?> - <div class="header">Language</div> - <div id="language" class="locales"> - <select name="language" onChange="changeLangPref(this.value, true)"> - <option value="en">English</option> - <option value="es">Español</option> - <option value="ja">日本語</option> - <option value="ko">한국어</option> - <option value="ru">Русский</option> - <option value="zh-cn">中文(简体)</option> - <option value="zh-tw">中文(繁體)</option> - </select> - </div> - <script type="text/javascript"> - <!-- - loadLangPref(); - //--> - </script> - <?cs /if ?> - <?cs # End of lang switcher ?> - <br class="clearfix" /> - </div><!-- end 'mid' --> - <div class="bottom"></div> - </div><!-- end 'moremenu' --> - - <div class="search" id="search-container"> - <div class="search-inner"> - <div id="search-btn"></div> - <div class="left"></div> - <form onsubmit="return submit_search()"> + <div class="dac-header-search" id="search-container"> + <div class="dac-header-search-inner"> + <div class="dac-header-search-btn" id="search-btn"></div> + <form class="dac-header-search-form" onsubmit="return submit_search()"> <input id="search_autocomplete" type="text" value="" autocomplete="off" name="q" onfocus="search_focus_changed(this, true)" onblur="search_focus_changed(this, false)" onkeydown="return search_changed(event, true, '<?cs var:toroot ?>')" - onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" /> + onkeyup="return search_changed(event, false, '<?cs var:toroot ?>')" + class="dac-header-search-input" placeholder="Search" /> + <a class="dac-header-search-close hide" id="search-close">close</a> </form> - <div class="right"></div> - <a class="close hide">close</a> - <div class="left"></div> - <div class="right"></div> - </div><!-- end search-inner --> - </div><!-- end search-container --> - - <div class="search_filtered_wrapper reference"> + </div><!-- end dac-header-search-inner --> + </div><!-- end dac-header-search --> + + <div class="search_filtered_wrapper"> <div class="suggest-card reference no-display"> <ul class="search_filtered"> </ul> </div> - </div> - - <div class="search_filtered_wrapper docs"> - <div class="suggest-card dummy no-display"> </div> <div class="suggest-card develop no-display"> <ul class="search_filtered"> </ul> @@ -524,7 +473,6 @@ def:header_search_widget() ?> </ul> </div> </div> -</div><!-- end menu-container (search and menu widget) --> <?cs /def ?> @@ -597,11 +545,12 @@ def:custom_copyright() ?> <?cs def:custom_footerlinks() ?> - <p> - <a href="<?cs var:toroot ?>about/index.html">About Android</a> | - <a href="<?cs var:toroot ?>legal.html">Legal</a> | - <a href="<?cs var:toroot ?>support.html">Support</a> - </p><?cs + <a href="<?cs var:toroot ?>about/index.html">About Android</a> + <a href="<?cs var:toroot ?>auto/index.html">Auto</a> + <a href="<?cs var:toroot ?>tv/index.html">TV</a> + <a href="<?cs var:toroot ?>wear/index.html">Wear</a> + <a href="<?cs var:toroot ?>legal.html">Legal</a> + <?cs /def ?> <?cs # appears on the right side of the blue bar at the bottom off every page ?><?cs diff --git a/tools/droiddoc/templates-sdk/designpage.cs b/tools/droiddoc/templates-sdk/designpage.cs index 2be179d4f..b945a1ce7 100644 --- a/tools/droiddoc/templates-sdk/designpage.cs +++ b/tools/droiddoc/templates-sdk/designpage.cs @@ -37,14 +37,12 @@ <?cs if:header.hide ?> <?cs else ?> -<div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> - <div class="layout-content-col span-9"> +<div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> <?cs if:header.justLinks ?> <?cs elif:header.title ?><h2><?cs var:header.title ?></h2> <?cs else ?><h2><?cs var:page.title ?></h2> <?cs /if ?> - </div> - <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="paging-links" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="prev-page-link">Previous</a> <a href="#" class="next-page-link">Next</a> </div> @@ -55,9 +53,9 @@ <?cs if:footer.hide ?> <?cs else ?> -<div class="layout-content-row content-footer" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="paging-links layout-content-col span-9"> </div> - <div class="paging-links layout-content-col span-4"> +<div class="cols content-footer" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="paging-links col-9"> </div> + <div class="paging-links col-4"> <a href="#" class="prev-page-link">Previous</a> <a href="#" class="next-page-link">Next</a> </div> diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs index 83b119935..fe8836b8e 100644 --- a/tools/droiddoc/templates-sdk/docpage.cs +++ b/tools/droiddoc/templates-sdk/docpage.cs @@ -6,7 +6,7 @@ <?cs if:(google || reference.gms || reference.gcm) ?>google<?cs /if ?><?cs - if:(guide||develop||training||reference||tools||sdk||samples) ?>develop<?cs + if:(guide||develop||training||reference||tools||google||sdk||samples) ?>develop<?cs if:guide ?> guide<?cs /if ?><?cs if:samples ?> samples<?cs /if ?><?cs elif:(distribute||googleplay||essentials||users||engage||monetize||disttools||stories) @@ -28,7 +28,7 @@ include:"header.cs" ?> <div <?cs if:fullpage ?>class="fullpage"<?cs - elif:(design||tools||about||sdk||googleplay||essentials||users||monetize||disttools) && !nonavpage + elif:(design||tools||about||sdk||googleplay||essentials||users||engage||monetize||disttools||stories) && !nonavpage ?>class="col-13" id="doc-col"<?cs elif:!nonavpage ?>class="col-12" id="doc-col"<?cs /if ?> > @@ -36,14 +36,12 @@ include:"header.cs" ?> <?cs if:(design||training||walkthru) && !page.trainingcourse && !page.article ?><?cs # header logic for docs that provide previous/next buttons ?> <?cs if:header.hide ?> <?cs else ?> - <div class="layout-content-row content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> - <div class="layout-content-col <?cs if:training ?>span-7<?cs else ?>span-9<?cs /if ?>"> + <div class="content-header <?cs if:header.justLinks ?>just-links<?cs /if ?>"> <?cs if:header.justLinks ?> <?cs else ?><h1 itemprop="name"><?cs var:page.title ?></h1> <?cs /if ?> - </div> <?cs if:training ?> - <div class="training-nav-top layout-content-col span-5" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="training-nav-top" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" zh-cn-lang="上一课" @@ -70,7 +68,7 @@ include:"header.cs" ?> >Get started</a> </div> <?cs elif:!page.trainingcourse ?> - <div class="paging-links layout-content-col span-4" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="paging-links" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" zh-cn-lang="上一课" @@ -116,16 +114,18 @@ include:"header.cs" ?> <?cs if:page.landing ?><?cs # header logic for docs that are landing pages ?> <div class="landing-banner"> <?cs if:page.landing.image ?><?cs # use two-column layout only if there is an image ?> - <div class="col-6"> - <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" /> - </div> - <div class="col-6"> + <div class="cols"> + <div class="col-6"> + <img src="<?cs var:toroot ?><?cs var:page.landing.image ?>" alt="" /> + </div> + <div class="col-6"> <?cs /if ?> <h1 itemprop="name" style="margin-bottom:0;"><?cs var:page.title ?></h1> <p itemprop="description"><?cs var:page.landing.intro ?></p> <p><a class="next-page-link topic-start-link"></a></p> <?cs if:page.landing.image ?> + </div> </div> <?cs /if ?> </div> @@ -153,13 +153,11 @@ include:"header.cs" ?> <?cs call:tag_list(root.descr) ?> </div> + <?cs if:!fullscreen && (design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <div class="content-footer <?cs - if:fullpage ?>wrap<?cs - else ?>layout-content-row<?cs /if ?>" + if:fullpage ?>wrap<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <?cs if:!fullscreen ?> - <div class="paging-links layout-content-col col-10"> - <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> + <div class="paging-links"> <a href="#" class="next-page-link hide" zh-tw-lang="下一堂課" zh-cn-lang="下一课" @@ -177,15 +175,9 @@ include:"header.cs" ?> es-lang="Empezar" >Get started</a> <a href="#" class="next-class-link hide">Next class</a> - <?cs /if ?> - </div> - <div class="layout-content-col plus-container col-2" > - <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right !important;}</style><?cs /if ?> - <div class="g-plusone" data-size="medium"></div> - <?cs /if ?> - </div> - <?cs /if ?> + </div> </div> + <?cs /if ?> </div> <!-- end jd-content --> @@ -194,9 +186,9 @@ include:"header.cs" ?> <?cs include:"trailer.cs" ?> <script src="https://developer.android.com/ytblogger_lists_unified.js" type="text/javascript"></script> - <script src="<?cs var:toroot ?>jd_lists_unified.js?v=9" type="text/javascript"></script> - <script src="<?cs var:toroot ?>jd_extras.js?v=11" type="text/javascript"></script> - <script src="<?cs var:toroot ?>jd_collections.js?v=12" type="text/javascript"></script> + <script src="<?cs var:toroot ?>jd_lists_unified.js?v=8" type="text/javascript"></script> + <script src="<?cs var:toroot ?>jd_extras.js?v=10" type="text/javascript"></script> + <script src="<?cs var:toroot ?>jd_collections.js?v=10" type="text/javascript"></script> <script src="<?cs var:toroot ?>jd_tag_helpers.js?v=5" type="text/javascript"></script> </body> diff --git a/tools/droiddoc/templates-sdk/footer.cs b/tools/droiddoc/templates-sdk/footer.cs index b609d3b8c..230930685 100644 --- a/tools/droiddoc/templates-sdk/footer.cs +++ b/tools/droiddoc/templates-sdk/footer.cs @@ -1,20 +1,152 @@ -<div id="footer" class="wrap" <?cs if:fullpage ?>style="width:940px"<?cs /if ?>> - -<?cs if:reference ?> - <div id="copyright"> - <?cs call:custom_copyright() ?> +<div class="dac-modal"> + <div class="dac-modal-dimmer" data-modal-toogle></div> + + <div class="dac-modal-container"> + <div class="dac-modal-window"> + <header class="dac-modal-header"> + <button class="dac-modal-header-close" data-modal-toogle><i class="dac-sprite dac-close"></i></button> + <h2 class="dac-modal-header-title">Sign-up for the newsletter to get the latest Android developer news and tips that will help you find success on Google Play.</h2> + <p class="dac-modal-header-subtitle">* Required Fields</p> + </header> + <iframe src="" class="dac-modal-iframe" name="dac-modal-iframe"></iframe> + <form action="https://docs.google.com/forms/d/1QgnkzbEJIDu9lMEea0mxqWrXUJu0oBCLD7ar23V0Yys/formResponse" class="dac-form" method="post" target="dac-modal-iframe" data-newsletter-form> + <section class="dac-modal-content"> + <fieldset class="dac-form-fieldset"> + <div class="cols"> + <div class="col-4of8"> + <div class="dac-form-input-group"> + <label for="newsletter-full-name" class="dac-form-floatlabel">Full name</label> + <input type="text" class="dac-form-input" name="entry.1357890476" id="newsletter-full-name" required> + <span class="dac-form-required">*</span> + </div> + <div class="dac-form-input-group"> + <label for="newsletter-email" class="dac-form-floatlabel">Email address</label> + <input type="email" class="dac-form-input" name="entry.472100832" id="newsletter-email" required> + <span class="dac-form-required">*</span> + </div> + </div> + <div class="col-4of8"> + <div class="dac-form-input-group"> + <label for="newsletter-company" class="dac-form-floatlabel">Company / developer name</label> + <input type="text" class="dac-form-input" name="entry.1664780309" id="newsletter-company"> + </div> + <div class="dac-form-input-group"> + <label for="newsletter-play-store" class="dac-form-floatlabel">One of your Play Store app URLs</label> + <input type="url" class="dac-form-input" name="entry.47013838" id="newsletter-play-store" required> + <span class="dac-form-required">*</span> + </div> + </div> + </div> + </fieldset> + <fieldset class="dac-form-fieldset"> + <div class="cols"> + <div class="col-4of8"> + <legend class="dac-form-legend">Which best describes your business:<span class="dac-form-required">*</span> + </legend> + <div class="dac-form-radio-group"> + <input type="radio" value="Apps" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-app" required> + <label for="newsletter-business-type-app" class="dac-form-radio-button"></label> + <label for="newsletter-business-type-app" class="dac-form-label">Apps</label> + </div> + <div class="dac-form-radio-group"> + <input type="radio" value="Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-games" required> + <label for="newsletter-business-type-games" class="dac-form-radio-button"></label> + <label for="newsletter-business-type-games" class="dac-form-label">Games</label> + </div> + <div class="dac-form-radio-group"> + <input type="radio" value="Apps and Games" class="dac-form-radio" name="entry.1796324055" id="newsletter-business-type-appsgames" required> + <label for="newsletter-business-type-appsgames" class="dac-form-radio-button"></label> + <label for="newsletter-business-type-appsgames" class="dac-form-label">Apps & Games</label> + </div> + </div> + <div class="col-4of8 newsletter-checkboxes"> + <div class="dac-form-radio-group"> + <div class="dac-media"> + <div class="dac-media-figure"> + <input type="checkbox" class="dac-form-checkbox" name="entry.732309842" id="newsletter-add" required value="Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities."> + <label for="newsletter-add" class="dac-form-checkbox-button"></label> + </div> + <div class="dac-media-body"> + <label for="newsletter-add" class="dac-form-label dac-form-aside">Add me to the mailing list for the monthly newsletter and occasional emails about development and Google Play opportunities.<span class="dac-form-required">*</span></label> + </div> + </div> + </div> + <div class="dac-form-radio-group"> + <div class="dac-media"> + <div class="dac-media-figure"> + <input type="checkbox" class="dac-form-checkbox" name="entry.2045036090" id="newsletter-terms" required value="I acknowledge that the information provided in this form will be subject to Google's privacy policy (https://www.google.com/policies/privacy/)."> + <label for="newsletter-terms" class="dac-form-checkbox-button"></label> + </div> + <div class="dac-media-body"> + <label for="newsletter-terms" class="dac-form-label dac-form-aside">I acknowledge that the information provided in this form will be subject to <a href="https://www.google.com/policies/privacy/">Google's privacy policy</a>.<span class="dac-form-required">*</span></label> + </div> + </div> + </div> + </div> + </div> + </fieldset> + </section> + <footer class="dac-modal-footer"> + <div class="cols"> + <div class="col-2of5"> + </div> + </div> + <button type="submit" value="Submit" class="dac-fab dac-primary dac-large dac-modal-action"><i class="dac-sprite dac-arrow-right"></i></button> + </footer> + </form> + </div> </div> - <div id="build_info"> - <?cs call:custom_buildinfo() ?> +</div> +<div class="dac-footer wrap"> + <div class="cols dac-footer-main"> + <div class="col-1of2"> + <a class="dac-footer-getnews" data-modal-toogle href="javascript:;">Get news & tips <span class="dac-fab dac-primary"><i class="dac-sprite dac-mail"></i></span></a> + </div> + <div class="col-1of2 dac-footer-reachout"> + <div class="dac-footer-contact"> + <a class="dac-footer-contact-link" href="http://android-developers.blogspot.com/">Blog</a> + <a class="dac-footer-contact-link" href="/support.html">Support</a> + </div> + <div class="dac-footer-social"> + <a class="dac-fab dac-footer-social-link" href="https://www.youtube.com/user/androiddevelopers"><i class="dac-sprite dac-youtube"></i></a> + <a class="dac-fab dac-footer-social-link" href="https://plus.google.com/+AndroidDevelopers"><i class="dac-sprite dac-gplus"></i></a> + <a class="dac-fab dac-footer-social-link" href="https://twitter.com/AndroidDev"><i class="dac-sprite dac-twitter"></i></a> + </div> + </div> </div> -<?cs elif:!hide_license_footer ?> - <div id="copyright"> - <?cs call:custom_cc_copyright() ?> - </div> -<?cs /if ?> -<?cs if:!no_footer_links ?> - <div id="footerlinks"> - <?cs call:custom_footerlinks() ?> - </div> -<?cs /if ?> -</div> <!-- end footer -->
\ No newline at end of file + + <hr class="dac-footer-separator"/> + + <?cs if:reference ?> + <p class="dac-footer-copyright"> + <?cs call:custom_copyright() ?> + </p> + <p class="dac-footer-build"> + <?cs call:custom_buildinfo() ?> + </p> + <?cs elif:!hide_license_footer ?> + <p class="dac-footer-copyright"> + <?cs call:custom_cc_copyright() ?> + </p> + <?cs /if ?> + + <p class="dac-footer-links"> + <a href="/about/index.html">About Android</a> + <a href="/auto/index.html">Auto</a> + <a href="/tv/index.html">TV</a> + <a href="/wear/index.html">Wear</a> + <a href="/legal.html">Legal</a> + + <span id="language" class="locales"> + <select name="language" onchange="changeLangPref(this.value, true)"> + <option value="en" selected="selected">English</option> + <option value="es">Español</option> + <option value="ja">日本語</option> + <option value="ko">한국어</option> + <option value="ru">Русский</option> + <option value="zh-cn">中文(简体)</option> + <option value="zh-tw">中文(繁體)</option> + </select> + </span> + </p> +</div> <!-- end footer --> diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs index 9f79f5479..b3239b525 100644 --- a/tools/droiddoc/templates-sdk/head_tag.cs +++ b/tools/droiddoc/templates-sdk/head_tag.cs @@ -15,10 +15,7 @@ ?><?cs # END if/else devsite ?> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="viewport" content="width=<?cs - if:page.viewport_width ?><?cs - var:page.viewport_width ?><?cs - else ?>device-width<?cs /if ?>" /> +<meta name="viewport" content="width=device-width" /> <?cs if:page.metaDescription ?> <meta name="Description" content="<?cs var:page.metaDescription ?>"><?cs diff --git a/tools/droiddoc/templates-sdk/nosidenavpage.cs b/tools/droiddoc/templates-sdk/nosidenavpage.cs index 8e5969361..61754f05b 100644 --- a/tools/droiddoc/templates-sdk/nosidenavpage.cs +++ b/tools/droiddoc/templates-sdk/nosidenavpage.cs @@ -11,6 +11,7 @@ <?cs call:custom_masthead() ?> <div id="body-content"> +<div> <div id="doc-content" style="position:relative;"> <?cs call:tag_list(root.descr) ?> diff --git a/tools/droiddoc/templates-sdk/sample.cs b/tools/droiddoc/templates-sdk/sample.cs index 32a0788ef..7b4bf0f88 100644 --- a/tools/droiddoc/templates-sdk/sample.cs +++ b/tools/droiddoc/templates-sdk/sample.cs @@ -92,9 +92,9 @@ <div class="content-footer <?cs if:fullpage ?>wrap<?cs - else ?>layout-content-row<?cs /if ?>" + else ?>cols<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="layout-content-col <?cs + <div class="<?cs if:fullpage ?>col-16<?cs elif:training||guide ?>col-8<?cs else ?>col-9<?cs /if ?>" style="padding-top:4px"> @@ -103,7 +103,7 @@ <?cs /if ?> </div> <?cs if:!fullscreen ?> - <div class="paging-links layout-content-col col-4"> + <div class="paging-links col-4"> <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" @@ -128,7 +128,7 @@ <?cs # for training classes, provide a different kind of link when the next page is a different class ?> <?cs if:training && !page.article ?> - <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="next-class-link hide">Next class: </a> </div> <?cs /if ?> diff --git a/tools/droiddoc/templates-sdk/sampleindex.cs b/tools/droiddoc/templates-sdk/sampleindex.cs index 1bacb53ad..e62d3fe9d 100644 --- a/tools/droiddoc/templates-sdk/sampleindex.cs +++ b/tools/droiddoc/templates-sdk/sampleindex.cs @@ -82,9 +82,9 @@ <?cs /if ?><?cs # end if/else online docs ?> <div class="content-footer <?cs if:fullpage ?>wrap<?cs - else ?>layout-content-row<?cs /if ?>" + else ?>cols<?cs /if ?>" itemscope itemtype="http://schema.org/SiteNavigationElement"> - <div class="layout-content-col <?cs + <div class="<?cs if:fullpage ?>col-16<?cs elif:training||guide ?>col-8<?cs else ?>col-9<?cs /if ?>" style="padding-top:4px"> @@ -93,7 +93,7 @@ <?cs /if ?> </div> <?cs if:!fullscreen ?> - <div class="paging-links layout-content-col col-4"> + <div class="paging-links col-4"> <?cs if:(design||training||walkthru) && !page.landing && !page.trainingcourse && !footer.hide ?> <a href="#" class="prev-page-link hide" zh-tw-lang="上一堂課" @@ -118,7 +118,7 @@ <?cs # for training classes, provide a different kind of link when the next page is a different class ?> <?cs if:training && !page.article ?> - <div class="layout-content-row content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> + <div class="content-footer next-class" style="display:none" itemscope itemtype="http://schema.org/SiteNavigationElement"> <a href="#" class="next-class-link hide">Next class: </a> </div> <?cs /if ?> diff --git a/tools/droiddoc/templates-sdk/trailer.cs b/tools/droiddoc/templates-sdk/trailer.cs index 337f8d346..225b2c169 100644 --- a/tools/droiddoc/templates-sdk/trailer.cs +++ b/tools/droiddoc/templates-sdk/trailer.cs @@ -1,3 +1,4 @@ +</div> <!-- end .cols --> <?cs # normally opened by header.cs ?> </div> <!-- end body-content --> <?cs # normally opened by header.cs ?> <?cs if:carousel ?> |