diff options
Diffstat (limited to 'lib/rdoc/generator')
7 files changed, 23 insertions, 29 deletions
diff --git a/lib/rdoc/generator/template/darkfish/class.rhtml b/lib/rdoc/generator/template/darkfish/class.rhtml index 915b2f9c9f..6c64ba6c98 100644 --- a/lib/rdoc/generator/template/darkfish/class.rhtml +++ b/lib/rdoc/generator/template/darkfish/class.rhtml @@ -8,14 +8,13 @@ </div> <%= render '_sidebar_table_of_contents.rhtml' %> + <%= render '_sidebar_sections.rhtml' %> + <%= render '_sidebar_parent.rhtml' %> + <%= render '_sidebar_includes.rhtml' %> + <%= render '_sidebar_extends.rhtml' %> + <%= render '_sidebar_methods.rhtml' %> - <div id="class-metadata"> - <%= render '_sidebar_sections.rhtml' %> - <%= render '_sidebar_parent.rhtml' %> - <%= render '_sidebar_includes.rhtml' %> - <%= render '_sidebar_extends.rhtml' %> - <%= render '_sidebar_methods.rhtml' %> - </div> + <%= render '_footer.rhtml' %> </nav> <main role="main" aria-labelledby="<%=h klass.aref %>"> diff --git a/lib/rdoc/generator/template/darkfish/css/rdoc.css b/lib/rdoc/generator/template/darkfish/css/rdoc.css index 877e9bf0a9..35e70f9e39 100644 --- a/lib/rdoc/generator/template/darkfish/css/rdoc.css +++ b/lib/rdoc/generator/template/darkfish/css/rdoc.css @@ -212,7 +212,7 @@ nav { position: fixed; top: 0; bottom: 0; - overflow: hidden; + overflow: auto; z-index: 10; /* Layout */ @@ -228,11 +228,6 @@ nav[hidden] { display: none; } -nav #project-metadata { - overflow: auto; /* Make the content scrollable */ - flex: 1; /* Take up remaining space */ -} - nav footer { padding: 1em; border-top: 1px solid #ccc; @@ -286,7 +281,7 @@ nav .nav-section { margin-top: 2em; border-top: 2px solid #aaa; font-size: 90%; - overflow: hidden; + flex: 1; } nav h2 { diff --git a/lib/rdoc/generator/template/darkfish/index.rhtml b/lib/rdoc/generator/template/darkfish/index.rhtml index daaa0b5c54..a5c0dd54da 100644 --- a/lib/rdoc/generator/template/darkfish/index.rhtml +++ b/lib/rdoc/generator/template/darkfish/index.rhtml @@ -4,14 +4,11 @@ <nav id="navigation" role="navigation"> <div id="project-navigation"> <%= render '_sidebar_navigation.rhtml' %> - <%= render '_sidebar_search.rhtml' %> </div> - <div id="project-metadata"> - <%= render '_sidebar_pages.rhtml' %> - <%= render '_sidebar_classes.rhtml' %> - </div> + <%= render '_sidebar_pages.rhtml' %> + <%= render '_sidebar_classes.rhtml' %> <%= render '_footer.rhtml' %> </nav> diff --git a/lib/rdoc/generator/template/darkfish/page.rhtml b/lib/rdoc/generator/template/darkfish/page.rhtml index 90b9e4ee3b..fb33eba6fd 100644 --- a/lib/rdoc/generator/template/darkfish/page.rhtml +++ b/lib/rdoc/generator/template/darkfish/page.rhtml @@ -8,10 +8,9 @@ </div> <%= render '_sidebar_table_of_contents.rhtml' %> + <%= render '_sidebar_pages.rhtml' %> - <div id="project-metadata"> - <%= render '_sidebar_pages.rhtml' %> - </div> + <%= render '_footer.rhtml' %> </nav> <main role="main" aria-label="Page <%=h file.full_name%>"> diff --git a/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml b/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml index b30e64eec5..098b589add 100644 --- a/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml +++ b/lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml @@ -2,14 +2,15 @@ <%= render '_sidebar_toggle.rhtml' %> <nav id="navigation" role="navigation"> - <%= render '_sidebar_navigation.rhtml' %> + <div id="project-navigation"> + <%= render '_sidebar_navigation.rhtml' %> + <%= render '_sidebar_search.rhtml' %> + </div> - <%= render '_sidebar_search.rhtml' %> + <%= render '_sidebar_pages.rhtml' %> + <%= render '_sidebar_classes.rhtml' %> - <div id="project-metadata"> - <%= render '_sidebar_pages.rhtml' %> - <%= render '_sidebar_classes.rhtml' %> - </div> + <%= render '_footer.rhtml' %> </nav> <main role="main"> diff --git a/lib/rdoc/generator/template/darkfish/servlet_root.rhtml b/lib/rdoc/generator/template/darkfish/servlet_root.rhtml index 859ce2930b..373e0006d9 100644 --- a/lib/rdoc/generator/template/darkfish/servlet_root.rhtml +++ b/lib/rdoc/generator/template/darkfish/servlet_root.rhtml @@ -12,7 +12,8 @@ <%= render '_sidebar_search.rhtml' %> </div> -<%= render '_sidebar_installed.rhtml' %> + <%= render '_sidebar_installed.rhtml' %> + <%= render '_footer.rhtml' %> </nav> <main role="main"> diff --git a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml index 5869873775..2cd2207836 100644 --- a/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml +++ b/lib/rdoc/generator/template/darkfish/table_of_contents.rhtml @@ -7,6 +7,8 @@ <%= render '_sidebar_search.rhtml' %> </div> + + <%= render '_footer.rhtml' %> </nav> <main role="main"> <h1 class="class"><%= h @title %></h1> |