From 190e610df3f15c00d46e8ee5bec661363334a86e Mon Sep 17 00:00:00 2001 From: "smain@google.com" Date: Mon, 4 Apr 2016 16:47:28 -0700 Subject: [PATCH] new styles and tab-highlighting to support custom Android Studio site design Change-Id: I27d11f4526ba79bce8deb5102cc2afbe34a0e116 --- .../templates-sdk-dev/assets/css/default.css | 33 +++++++++++++++++++ .../templates-sdk-dev/assets/js/docs.js | 8 +++++ 2 files changed, 41 insertions(+) diff --git a/tools/droiddoc/templates-sdk-dev/assets/css/default.css b/tools/droiddoc/templates-sdk-dev/assets/css/default.css index 17a69c110..3c045ce86 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/css/default.css +++ b/tools/droiddoc/templates-sdk-dev/assets/css/default.css @@ -6573,6 +6573,10 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] background: #00bcd4; } +.dac-studio { + background: #424242; +} + .dac-search-mode .dac-header { background: #b0bec5; -webkit-transition: background 200ms; @@ -6712,6 +6716,18 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] outline: 0; } +.dac-studio .dac-header-console-btn { + color:#fff; + background:rgba(255, 255, 255, 0.3); +} +.dac-studio .dac-header-console-btn:hover { + background:rgba(255, 255, 255, 0.5); +} +.dac-studio .dac-header-console-btn:focus { + background:rgba(255, 255, 255, 0.7); + color:#000; +} + @media (max-width: 719px) { .dac-header { text-align: center; @@ -6823,6 +6839,10 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] transform-origin: right center; width: 64px; } + .dac-studio .dac-header-search-inner::after { + background: -webkit-linear-gradient(right, #424242, rgba(66, 66, 66, 0)); + background: linear-gradient(to left, #424242, rgba(66, 66, 66, 0)); + } .dac-search-mode .dac-header-search-inner::after { opacity: 0; @@ -6854,6 +6874,13 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] width: 100%; } +.dac-studio .dac-header-search { + right:150px; +} +.dac-studio .dac-header-search-input { + background: rgba(255, 255, 255, 0.3); +} + .dac-header-search-close, .dac-header-search-clear { background: none; border: none; @@ -7267,6 +7294,12 @@ div.jd-descr > .resource-widget[data-section=distribute\/tools] width: 100%; } +.dac-studio .dac-nav-hamburger-top, +.dac-studio .dac-nav-hamburger-mid, +.dac-studio .dac-nav-hamburger-bot { + background: rgba(256, 256, 256, 0.4); +} + .dac-nav-animating .dac-nav-hamburger-top, .dac-nav-animating .dac-nav-hamburger-mid, .dac-nav-animating .dac-nav-hamburger-bot { -webkit-transition: opacity .3s; transition: opacity .3s; diff --git a/tools/droiddoc/templates-sdk-dev/assets/js/docs.js b/tools/droiddoc/templates-sdk-dev/assets/js/docs.js index 18bcd67b2..60cb860d1 100644 --- a/tools/droiddoc/templates-sdk-dev/assets/js/docs.js +++ b/tools/droiddoc/templates-sdk-dev/assets/js/docs.js @@ -4388,6 +4388,14 @@ $.fn.scrollIntoView = function(target) { } else if (body.hasClass('downloads')) { selected = navEl.find('> li.downloads > a').addClass('selected'); } + } else if (body.hasClass('studio')) { + if (body.hasClass('features')) { + selected = navEl.find('> li.features > a').addClass('selected'); + } else if (body.hasClass('guide')) { + selected = navEl.find('> li.guide > a').addClass('selected'); + } else if (body.hasClass('preview')) { + selected = navEl.find('> li.preview > a').addClass('selected'); + } } else if (body.hasClass('design')) { selected = navEl.find('> li.design > a').addClass('selected'); // highlight Home nav