StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Read sdk vars from centralized files. Fix a couple of issues in navigation labels and alignment.

Browse Source 
Change-Id: I71da51cd20ac68ad6bc82cf8d9507cda965ec88b
This commit is contained in:
Dirk Dougherty
2016-01-30 14:04:37 -08:00
parent 6857e477f5
commit 82e929d57c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/droiddoc/templates-sdk-dev/assets/css/default.css
View File

@@ -1854,10 +1854,11 @@ a:visited {
-webkit-appearance: none; -webkit-appearance: none;
background: transparent url(../images/arrows-up-down.png) 23px 5px no-repeat; background: transparent url(../images/arrows-up-down.png) 23px 5px no-repeat;
color: #222; color: #222;
/* remove the lines below after xp testing
height: 19px; height: 19px;
line-height: 19px; line-height: 19px; */
padding: 0; padding: 0;
margin:1px 0 0 0; margin: .5px 0 0 0;
width:150%; width:150%;
font-size:13px; font-size:13px;
vertical-align:top; vertical-align:top;

9
tools/droiddoc/templates-sdk-dev/assets/js/docs.js
View File

@@ -4166,13 +4166,12 @@ switch (window.getLangPref()) {
views.addClass('dac-active'); views.addClass('dac-active');
} else { } else {
// Activate back button and tier 2 nav. // Activate back button and tier 2 nav.
var langAttr = window.getLangPref();
console.log("langAttr is " + langAttr);
views.slice(0, 2).addClass('dac-active'); views.slice(0, 2).addClass('dac-active');
var selectedNav = views.eq(2).find('.selected').after(forwardLink); var selectedNav = views.eq(2).find('.selected').after(forwardLink);
//select the localized text if available else the selectedNav value var langAttr = selectedNav.attr(window.getLangPref() + '-lang');
if (langAttr!='en') { //form the label from locale attr if possible, else set to selectedNav text value
$('.dac-nav-back-title').text(selectedNav.attr(langAttr + '-lang')); if ((typeof langAttr !== typeof undefined && langAttr !== false) && (langAttr !== '')) {
$('.dac-nav-back-title').text(langAttr);
} else { } else {
$('.dac-nav-back-title').text(selectedNav.text()); $('.dac-nav-back-title').text(selectedNav.text());
} }

1
tools/droiddoc/templates-sdk-dev/sdkpage.cs
View File

@@ -1,5 +1,6 @@
<?cs include:"doctype.cs" ?> <?cs include:"doctype.cs" ?>
<?cs include:"macros.cs" ?> <?cs include:"macros.cs" ?>
<?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_vars.cs" ?>
<html<?cs if:devsite ?> devsite<?cs /if ?>> <html<?cs if:devsite ?> devsite<?cs /if ?>>
<?cs if:sdk.redirect ?> <?cs if:sdk.redirect ?>
<head> <head>