docs: bug fixing for fullscreen and sidenav issues

Change-Id: Iee5d81621b47e6bb8aa11d87d044e20fae63fbfa

12 files changed, 32 insertions, 24 deletions

diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index df27e7594e..80ab79cae9 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -23,7 +23,8 @@ body {
   color: #444;
   font: 14px/21px Roboto, sans-serif;
   font-weight: 400;
-  letter-spacing:.1; }
+  letter-spacing:.1;
+  padding:0 10px; }
 
 #page-container {
   width: 940px;
@@ -83,6 +84,7 @@ body {
 }
 #devdoc-nav {
   outline:none;
+  width:auto;
   margin: 20px 0 0; }
   
 #devdoc-nav h2 {
@@ -91,6 +93,7 @@ body {
 
 #devdoc-nav.fixed {
   position: fixed;
+  margin:0;
   top: 20px; }
 
 #content {
@@ -1125,7 +1128,7 @@ a {
 }
 .wrap {
 	margin: 0 auto;
-	width: 960px;
+	width: 940px;
 	clear: both;
 }
 .cols {
@@ -1918,6 +1921,7 @@ a:visited,
 #side-nav, #devdoc-nav, #swapper,
 #nav-tree, #tree-list {
   overflow:hidden;
+  margin-left:0;
 }
 
 #nav-tree ul {
@@ -1980,6 +1984,9 @@ a:visited,
 
 
 /* Content */
+#doc-col {
+  margin-right:0;
+}
 #doc-content-container {
 	margin-left: 291px	
 }
@@ -2005,7 +2012,6 @@ a:visited,
 }
 #api-nav-header {
   height:19px; /* plus 16px padding = 35; same as #nav li */
-  width:inherit;
   font-size:14px;
   padding: 8px 0;
   margin: 0;
@@ -2015,6 +2021,7 @@ a:visited,
 }
 #api-nav-title {
   padding:0 5px;
+  white-space:nowrap;
 }
 
 #api-level-toggle {
diff --git a/tools/droiddoc/templates-sdk/assets/css/fullscreen.css b/tools/droiddoc/templates-sdk/assets/css/fullscreen.css
index 4932b4c230..2159f084bd 100644
--- a/tools/droiddoc/templates-sdk/assets/css/fullscreen.css
+++ b/tools/droiddoc/templates-sdk/assets/css/fullscreen.css
@@ -157,7 +157,7 @@ body {
 }
 #body-content > .col-12 {
   width:77.9804965%;
-  margin:0 0 0 1.063829787234%;
+  margin:0 0 0 0.98%; /* this percentage chosen to make IE9 happy */
 }
 #side-nav {
   width: 19.9804965%;
@@ -177,7 +177,10 @@ body {
   margin:-2px 0 0 0;
 }
 
-
+#devdoc-nav.fixed,
+#devdoc-nav.fixed a.totop {
+  left:20px !important;
+}
 
 
 
diff --git a/tools/droiddoc/templates-sdk/assets/css/home.css b/tools/droiddoc/templates-sdk/assets/css/home.css
index 4fe496a74d..94d5862046 100644
--- a/tools/droiddoc/templates-sdk/assets/css/home.css
+++ b/tools/droiddoc/templates-sdk/assets/css/home.css
@@ -3,7 +3,7 @@
   width: 940px;
   border-bottom: 1px solid #CCC;
   position: relative;
-  margin: 0 10px 0 10px;
+  margin: 0;
 }
 .slideshow-home .frame {
   width: 940px;
@@ -28,7 +28,7 @@
 }
 .home-sections {
   padding: 40px 0 40px 0;
-  margin: 20px 10px;
+  margin: 20px 0;
 }
 .home-sections ul {
   margin: 0;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index 857829c8af..a5beb18e2f 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -333,10 +333,9 @@ false; // navigate across topic boundaries only in design docs
       if (navBarShouldBeFixed) {
         // make it fixed
         var width = $('#devdoc-nav').width();
-        var margin = $('#devdoc-nav').parent().css('margin');
         $('#devdoc-nav')
             .addClass('fixed')
-            .css({'width':width+'px','margin':margin})
+            .css({'width':width+'px'})
             .prependTo('#body-content');
         // add neato "back to top" button
         $('#devdoc-nav a.totop').css({'display':'block','width':$("#nav").innerWidth()+'px'});
@@ -347,7 +346,7 @@ false; // navigate across topic boundaries only in design docs
         // make it static again
         $('#devdoc-nav')
             .removeClass('fixed')
-            .css({'width':'auto','margin':''})
+            .css({'width':''})
             .prependTo('#side-nav');
         $('#devdoc-nav a.totop').hide();
       }
@@ -464,8 +463,8 @@ function toggleFullscreen(enable) {
     enabled = false;
   }
   writeCookie("fullscreen", enabled, null, null);
-  setNavBarLeftPos();
   resizeNav(delay);
+  setNavBarLeftPos();updateSideNavPosition();
   setTimeout(initSidenavHeightResize,delay);
 }
 
diff --git a/tools/droiddoc/templates-sdk/assets/js/droiddoc.js b/tools/droiddoc/templates-sdk/assets/js/droiddoc.js
index 39d9ff9786..5ebf5fe546 100644
--- a/tools/droiddoc/templates-sdk/assets/js/droiddoc.js
+++ b/tools/droiddoc/templates-sdk/assets/js/droiddoc.js
@@ -35,9 +35,6 @@ function updateSidenavFixedWidth() {
     'width' : $('#side-nav').css('width'),
     'margin' : $('#side-nav').css('margin')
   });
-  $('#api-nav-header').css({
-    'width' : $('#side-nav').css('width')
-  });
   $('#devdoc-nav a.totop').css({'display':'block','width':$("#nav").innerWidth()+'px'});
   
   initSidenavHeightResize();
diff --git a/tools/droiddoc/templates-sdk/class.cs b/tools/droiddoc/templates-sdk/class.cs
index 9c6795dbce..b8ed64d0b5 100644
--- a/tools/droiddoc/templates-sdk/class.cs
+++ b/tools/droiddoc/templates-sdk/class.cs
@@ -11,7 +11,7 @@
   <a name="top"></a>
 <?cs include:"header.cs" ?>
 
-<div class="col-12">
+<div class="col-12"  id="doc-col">
 
 <div id="api-info-block">
 
diff --git a/tools/droiddoc/templates-sdk/classes.cs b/tools/droiddoc/templates-sdk/classes.cs
index 9d680352cb..77624c5e0a 100644
--- a/tools/droiddoc/templates-sdk/classes.cs
+++ b/tools/droiddoc/templates-sdk/classes.cs
@@ -10,7 +10,7 @@
   <a name="top"></a>
 <?cs include:"header.cs" ?>
 
-<div class="col-12">
+<div class="col-12" id="doc-col">
 
 <div id="jd-header">
 <h1><?cs var:page.title ?></h1>
diff --git a/tools/droiddoc/templates-sdk/components/masthead.cs b/tools/droiddoc/templates-sdk/components/masthead.cs
index e70f697668..6587e17790 100644
--- a/tools/droiddoc/templates-sdk/components/masthead.cs
+++ b/tools/droiddoc/templates-sdk/components/masthead.cs
@@ -1,5 +1,5 @@
 <?cs def:custom_masthead() ?>
-    <div style="position:absolute;width:100%">
+    <div style="position:absolute;">
       <div style="width:940px;margin:0 auto;">
        <div
 style="width:200px;float:right;font-size:12px;font-weight:500;background-color:#CC3300;color:#fff;
diff --git a/tools/droiddoc/templates-sdk/docpage.cs b/tools/droiddoc/templates-sdk/docpage.cs
index f4a81e28e7..97277767b2 100644
--- a/tools/droiddoc/templates-sdk/docpage.cs
+++ b/tools/droiddoc/templates-sdk/docpage.cs
@@ -13,8 +13,8 @@
 
 <div <?cs if:fullpage
 ?><?cs elif:design||tools||about||sdk||distribute
-?>class="col-13"<?cs else 
-?>class="col-12"<?cs /if ?> >
+?>class="col-13" id="doc-col"<?cs else 
+?>class="col-12" id="doc-col"<?cs /if ?> >
 
 <?cs if:(design||training||walkthru) ?><?cs # header logic for docs that provide previous/next buttons ?>
   <?cs if:header.hide ?>
@@ -75,19 +75,21 @@
                     else ?>layout-content-row<?cs /if ?>" 
                     itemscope itemtype="http://schema.org/SiteNavigationElement">
         <div class="layout-content-col <?cs 
-                    if:fullpage ?>col-12<?cs 
+                    if:fullpage ?>col-16<?cs 
                     elif:training||guide ?>col-8<?cs 
                     else ?>col-9<?cs /if ?>" style="padding-top:4px">
-          <?cs if:!page.noplus ?>
+          <?cs if:!page.noplus ?><?cs if:fullpage ?><style>#___plusone_0 {float:right;}</style><?cs /if ?>
             <div class="g-plusone" data-size="medium"></div>
           <?cs /if ?>
         </div>
+        <?cs if:!fullscreen ?>
         <div class="paging-links layout-content-col col-4">
           <?cs if:(design||training||guide||walkthru) && !page.landing && !footer.hide ?>
             <a href="#" class="prev-page-link hide">Previous</a>
             <a href="#" class="next-page-link hide">Next</a>
           <?cs /if ?>
         </div>
+        <?cs /if ?>
       </div>
       
       <?cs # for training classes, provide a different kind of link when the next page is a different class ?>
diff --git a/tools/droiddoc/templates-sdk/package.cs b/tools/droiddoc/templates-sdk/package.cs
index fb7c210f76..e246e312e4 100644
--- a/tools/droiddoc/templates-sdk/package.cs
+++ b/tools/droiddoc/templates-sdk/package.cs
@@ -12,7 +12,7 @@
   <a name="top"></a>
 <?cs include:"header.cs" ?>
 
-<div class="col-12">
+<div class="col-12" id="doc-col">
 
 <div id="api-info-block">
 <div class="api-level">
diff --git a/tools/droiddoc/templates-sdk/packages.cs b/tools/droiddoc/templates-sdk/packages.cs
index a8c5c37449..1c3aa305d3 100644
--- a/tools/droiddoc/templates-sdk/packages.cs
+++ b/tools/droiddoc/templates-sdk/packages.cs
@@ -10,7 +10,7 @@
   <a name="top"></a>
 <?cs include:"header.cs" ?>
 
-<div class="col-12">
+<div class="col-12" id="doc-col">
 
 <div id="jd-header">
 <h1><?cs var:page.title ?></h1>
diff --git a/tools/droiddoc/templates-sdk/sdkpage.cs b/tools/droiddoc/templates-sdk/sdkpage.cs
index bcf704f256..38fb67b6b6 100644
--- a/tools/droiddoc/templates-sdk/sdkpage.cs
+++ b/tools/droiddoc/templates-sdk/sdkpage.cs
@@ -23,7 +23,7 @@
 
 <div <?cs if:fullpage
 ?><?cs else
-?>class="col-13"<?cs /if ?> >
+?>class="col-13" id="doc-col"<?cs /if ?> >
 
 <?cs if:sdk.redirect ?>