Merge "4.1.1" into jb-dev
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index 43f20f9..2513e69 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -2033,6 +2033,9 @@
#jd-content img.toggle-content-img {
margin:0 5px 5px 0;
}
+div.toggle-content > p {
+ padding:0 0 5px;
+}
/* API LEVEL FILTERED MEMBERS */
@@ -2758,6 +2761,7 @@
.jd-tagtable {
margin:0;
background-color:transparent;
+ width:auto;
}
.jd-tagtable td,
diff --git a/tools/droiddoc/templates-sdk/assets/css/fullscreen.css b/tools/droiddoc/templates-sdk/assets/css/fullscreen.css
index 248409f..7503924 100644
--- a/tools/droiddoc/templates-sdk/assets/css/fullscreen.css
+++ b/tools/droiddoc/templates-sdk/assets/css/fullscreen.css
@@ -179,7 +179,7 @@
#devdoc-nav.fixed,
#devdoc-nav.fixed a.totop {
- left:20px !important;
+ left:20px; /* !important ... for IE i think */
}
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index 17c1354..c0f3be7 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -210,11 +210,12 @@
}
if (os) {
- $('#download-button').text("Download the SDK for " + os).removeClass("disabled");
+ $('#not-supported').hide();
+ $('#download-button').show();
+ $('#download-button').text("Download the SDK for " + os);
$('#download-button').click(function() {onDownload($link.get());}).attr('href', $link.attr('href'));
} else {
$('.pax').show();
- $('#download-button').css({'font-size':'14px'});
}
</script>