Doc: Cosmetic fixes in doxygen output

FreeCAD · Jan 8, 2017 · 59ef8d8 · 59ef8d8
1 parent 81e9228
commit 59ef8d8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/src/Doc/BuildWebDoc.cfg.in b/src/Doc/BuildWebDoc.cfg.in
@@ -500,7 +500,7 @@ SHOW_FILES             = NO
 # This will remove the Namespaces entry from the Quick Index
 # and from the Folder Tree View (if specified). The default is YES.
 
-SHOW_NAMESPACES        = NO
+SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from

diff --git a/src/Doc/templates/customdoxygen.css b/src/Doc/templates/customdoxygen.css
@@ -1,3 +1,19 @@
+@font-face {
+    font-family: 'Fira Sans';
+    src: url('/fonts/FiraSans-Regular.eot');
+    src: local('☺'), url('/fonts/FiraSans-Regular.woff') format('woff'), url('/fonts/FiraSans-Regular.ttf') format('truetype'), url('/fonts/FiraSans-Regular.svg') format('svg');
+    font-weight: 400;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'Roboto';
+    src: url('/fonts/Roboto.eot');
+    src: local('☺'), url('/fonts/Roboto.woff') format('woff'), url('/fonts/Roboto.ttf') format('truetype'), url('/fonts/Roboto.svg') format('svg');
+    font-weight: 400;
+    font-style: normal;
+}
+
 h1, .h1, h2, .h2, h3, .h3{
     font-weight: 200 !important;
 }
@@ -389,3 +405,6 @@ pre.fragment {
 .memdoc p {
     text-align: left;
 }
+body, table, div, p, dl {
+    font: 400 16px/22px Fira Sans,sans-serif;
+}
diff --git a/src/Doc/templates/header.html b/src/Doc/templates/header.html
@@ -43,10 +43,18 @@
                 <div class="collapse navbar-collapse">
                     <ul class="nav navbar-nav">
                         <li><a href="/api/index.html" title="Welcome page">API Home</a></li>
-                        <li><a href="modules.html" title="List of FreeCAD Modules">Modules</a></li>
-                        <!-- <li><a href="namespaces.html" title="Namespaces">Namespaces</a></li> -->
-                        <li><a href="annotated.html" title="List of namespaces and classes">Class list</a></li>
-                        <!-- <li><a href="hierarchy.html" title="Tree view of classes">Class hierarchy</a></li> -->
+                        <li><a href="/api/modules.html" title="List of FreeCAD Modules">Modules</a></li>
+                        <li class="dropdown">
+                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contents <span class="caret"></span></a>
+                            <ul class="dropdown-menu">
+                                <li><a href="/api/annotated.html" title="Annotated list">Annotated list</a></li>
+                                <li><a href="/api/namespaces.html" title="Namespaces">Namespaces</a></li>
+                                <li><a href="/api/classes.html" title="Classes">Classes</a></li>
+                                <li><a href="/api/functions.html" title="Functions">Functions</a></li>
+                                <li><a href="/api/hierarchy.html" title="Tree view of classes">Class hierarchy</a></li>
+                                <li><a href="/api/page.html" title="Related pages">Related pages</a></li>
+                            </ul>
+                        </li>
                         <li><a href="https://github.com/FreeCAD/FreeCAD" title="Browse the source code on GitHub">Source code</a></li>
                     </ul>
                     <ul class="nav navbar-nav navbar-right">