From d21dbc6b83d22b6bbc9b1ef637c21b66eab0022b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Fri, 15 Jul 2022 17:43:40 +0200 Subject: [PATCH] [Doc] Clean up footer and header for WebDoc --- src/Doc/templates/customdoxygen.css | 136 ++++++++++------------------ src/Doc/templates/doxy-boot.js | 6 +- src/Doc/templates/footer.html | 8 +- src/Doc/templates/header.html | 28 +++--- 4 files changed, 65 insertions(+), 113 deletions(-) diff --git a/src/Doc/templates/customdoxygen.css b/src/Doc/templates/customdoxygen.css index 753938007b..b0bd574339 100644 --- a/src/Doc/templates/customdoxygen.css +++ b/src/Doc/templates/customdoxygen.css @@ -27,7 +27,7 @@ margin-left: 30px !important; font-size: 1.15em !important; } .navbar{ - border: 0px solid #222 !important; + background-color: #222; } table{ white-space:pre-wrap !important; @@ -36,81 +36,6 @@ table{ =========================== */ - -/* Sticky footer styles --------------------------------------------------- */ -html, -body { - height: 100%; - /* The html and body elements cannot have any padding or margin. */ -} - -/* Wrapper for page content to push down footer */ -#wrap { - min-height: 100%; - height: auto; - /* Negative indent footer by its height */ - margin: 0 auto -60px; - /* Pad bottom by footer height */ - padding: 0 0 60px; -} - -/* Set the fixed height of the footer here */ -#footer { - font-size: 0.9em; - padding: 8px 0px; - background-color: #f5f5f5; -} - -.footer-row { - line-height: 44px; -} - -#footer > .container { - padding-left: 15px; - padding-right: 15px; -} - -.footer-follow-icon { - margin-left: 3px; - text-decoration: none !important; -} - -.footer-follow-icon img { - width: 20px; -} - -.footer-link { - padding-top: 5px; - display: inline-block; - color: #999999; - text-decoration: none; -} - -.footer-copyright { - text-align: center; -} - - -@media (min-width: 992px) { - .footer-row { - text-align: left; - } - - .footer-icons { - text-align: right; - } -} -@media (max-width: 991px) { - .footer-row { - text-align: center; - } - - .footer-icons { - text-align: center; - } -} - /* DOXYGEN Code Styles ----------------------------------- */ @@ -371,9 +296,6 @@ span.SRScope { .summary { margin-top: 25px; } -.page-header { - margin: 20px 0px !important; -} .page-header .title { display: inline-block; } @@ -386,13 +308,6 @@ span.SRScope { } /* FreeCAD-specific */ -.maincontents { - margin-top: 50px; -} -address.footer { - text-align: center; - margin-bottom: 50px; -} .directory td.entry { max-width: 400px; } @@ -405,6 +320,51 @@ pre.fragment { .memdoc p { text-align: left; } -body, table, div, p, dl { - font: 400 16px/22px Fira Sans,sans-serif; +.maincontents { + display: none; +} +body { + display: flex; + min-height: 100vh; + flex-direction: column; + justify-content: space-between; +} +body, table, div, p, dl { + font: 400 16px/22px 'Fira Sans' ,sans-serif; +} +#main-nav { + display: none; +} +.navbar { + font-family: 'Roboto', sans-serif; + text-transform: uppercase; + list-style-type: none; + margin: 0; + padding: 0; + overflow: hidden; + background-color: #222; + display: flex; + gap: 20px; + align-items: center; + height: 72px; + padding: 0 10px; +} +.navbar li { + float: left; +} +.navbar li a { + color: #fff; + display: block; +} +.navbar logo { + height: 140px +} +.footer { + background-color: #222; + padding: 25px 0; + color: #eee; + text-align: center !important; +} +.sm.sm-dox { + display: none; } diff --git a/src/Doc/templates/doxy-boot.js b/src/Doc/templates/doxy-boot.js index bdb8689f4c..e5d7e894fe 100644 --- a/src/Doc/templates/doxy-boot.js +++ b/src/Doc/templates/doxy-boot.js @@ -151,9 +151,9 @@ $( document ).ready(function() { searchBox.CloseResultsWindow(); }); - $('body').append('
'); - $('body').append('
'); - $('body').append('
'); + $('wrapper').append('
'); + $('wrapper').append('
'); + $('wrapper').append('
'); searchBox.searchLabel = ''; searchBox.DOMSearchField = function() { diff --git a/src/Doc/templates/footer.html b/src/Doc/templates/footer.html index 3a8b73e03d..8e62d09085 100644 --- a/src/Doc/templates/footer.html +++ b/src/Doc/templates/footer.html @@ -1,10 +1,6 @@ + - - - - - -
+
$generatedby doxygen $doxygenversion
diff --git a/src/Doc/templates/header.html b/src/Doc/templates/header.html index 54efc02af6..6cf526d782 100644 --- a/src/Doc/templates/header.html +++ b/src/Doc/templates/header.html @@ -26,21 +26,17 @@ - +
+ -
-
-
-
-
-
+