From 5d43a377b61757a9c677cef23a0c69c7ca669f38 Mon Sep 17 00:00:00 2001 From: Vladimir Marchenko Date: Thu, 28 Jul 2022 11:37:58 +0200 Subject: [PATCH] Extended new doxygen layout with version dropdown + minor cleanup. (#34) * Extended new doxygen layout with version dropdown + minor cleanup. * Removed unnecessary reference to printComponentTabs.js --- Documentation/dropdown.png | Bin 159 -> 0 bytes Doxygen/dsp.dxy.in | 3 +- Doxygen/templates/dropdown.png | Bin 0 -> 359 bytes Doxygen/templates/header.html | 20 +++++----- Doxygen/templates/printComponentTabs.js | 28 -------------- .../templates}/version.css | 36 +++++++++++++----- 6 files changed, 38 insertions(+), 49 deletions(-) delete mode 100644 Documentation/dropdown.png create mode 100644 Doxygen/templates/dropdown.png delete mode 100644 Doxygen/templates/printComponentTabs.js rename {Documentation => Doxygen/templates}/version.css (55%) diff --git a/Documentation/dropdown.png b/Documentation/dropdown.png deleted file mode 100644 index 1a8a9ed59f5cabf517986adbaa5b7c6277bd03a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1|%O$WD@{VjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCf`#@Q5sCVBk9p!i>lBSEK+1O*~y3Lo|YuC0ZIbW_`N&KfuiI0Ef~C&79L) y(^#~b7<0HBxg1Pl1UVG6TQm=F8Th6oFfc4<6kMKjhesNypTX1B&t;ucLK6T+vM8hg diff --git a/Doxygen/dsp.dxy.in b/Doxygen/dsp.dxy.in index 86e92a5d..f8d0bb66 100644 --- a/Doxygen/dsp.dxy.in +++ b/Doxygen/dsp.dxy.in @@ -1324,8 +1324,9 @@ HTML_EXTRA_FILES = templates/tabs.css \ templates/search.css \ templates/navtree.css \ templates/tab_b.png \ - templates/printComponentTabs.js \ templates/navtree.js \ + templates/version.css \ + templates/dropdown.png \ ../LICENSE.txt # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen diff --git a/Doxygen/templates/dropdown.png b/Doxygen/templates/dropdown.png new file mode 100644 index 0000000000000000000000000000000000000000..6ff29b588f6f5741ec9dd67ff6906cb5f4973a0f GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1SIo6Pjm-TY$ZW{!9W@a@|Lkr1X7#@9+AZi z417mGm~pB$pELslBfF=IV+e;V;~xg*|6s**Bp9E*d5z0DMxX>%X=xErkQ}BoPy#3j il|z<>NPu)812n^(68LJb%FS2{QsU|A=d#Wzp$P!L%_NBc literal 0 HcmV?d00001 diff --git a/Doxygen/templates/header.html b/Doxygen/templates/header.html index 8d075281..3491cbfb 100644 --- a/Doxygen/templates/header.html +++ b/Doxygen/templates/header.html @@ -16,13 +16,14 @@ - $treeview $search $mathjax $extrastylesheet + + @@ -43,7 +44,13 @@ $extrastylesheet
$projectname -  $projectnumber +  +
$projectbrief
@@ -67,12 +74,3 @@ $extrastylesheet -
- -
diff --git a/Doxygen/templates/printComponentTabs.js b/Doxygen/templates/printComponentTabs.js deleted file mode 100644 index 46b80661..00000000 --- a/Doxygen/templates/printComponentTabs.js +++ /dev/null @@ -1,28 +0,0 @@ -var strgURL = location.pathname; // path of current component - -// constuctor for the array of objects -function tabElement(id, folderName, tabTxt ) { - this.id = id; // elementID as needed in html; - this.folderName = folderName; // folder name of the component - this.tabTxt = tabTxt; // Text displayed as menu on the web - this.currentListItem = '
  • ' + this.tabTxt + '
    • '; - this.listItem = '
  • ' + this.tabTxt + '
    • '; -}; - -// array of objects -var arr = []; - -// fill array -// arr.push( new tabElement( "GEN", "/General/html/", "General")); - -// write tabs -// called from the header file. -function writeComponentTabs() { - for ( var i=0; i < arr.length; i++ ) { - if (strgURL.search(arr[i].folderName) > 0) { // if this is the current folder - document.write(arr[i].currentListItem); // then print and highlight the tab - } else { - document.write(arr[i].listItem); // else, print the tab - } - } -}; diff --git a/Documentation/version.css b/Doxygen/templates/version.css similarity index 55% rename from Documentation/version.css rename to Doxygen/templates/version.css index 941eafdf..8013bede 100644 --- a/Documentation/version.css +++ b/Doxygen/templates/version.css @@ -1,17 +1,33 @@ +:root { + --arm_light_blue: #00C1DE; + --arm_blue: #11809F; + --arm_blue1: #0091BD; + --arm_dark_blue: #002B49; + --arm_light_gray: #E5ECEB; + --arm_light_gray1: #EFF5F4; + --arm_light_gray2: #EBEBEB; + --arm_light_gray3: #F7F7F7; + --arm_dark_gray: #7D868C; + --arm_black: #333E48; + --arm_orange: #FF6B00; + --arm_yellow: #FFC700; +} + /* Dropdown Button */ .dropbtn { margin: 0px; - padding: 0px 0px 0px 1em; - background-image: url(dropdown.png); + padding: 0px 20px 0px 0em; + background-image: url("dropdown.png"); background-repeat: no-repeat; - background-size: 0.75em; - background-position: left center; + background-size: 0.5em; + background-position: right center; + cursor: pointer; } /* Dropdown button on hover & focus */ -.dropbtn:hover, .dropbtn:focus { - background-size: 0.8em; -} +#.dropbtn:hover, .dropbtn:focus { +# background-size: 0.7em; +#} /* The container
    - needed to position the dropdown content */ .dropdown { @@ -23,16 +39,18 @@ .dropdown-content { display: none; position: absolute; - background-color: #f1f1f1; + background-color: var(--arm_light_gray3); min-width: 160px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.4); + white-space: nowrap; + cursor: pointer; z-index: 1; } /* Links inside the dropdown */ .dropdown-content a { # color: black; - color: #3A568E; + color: var(--arm_dark_gray); padding: 4px 6px; text-decoration: none; display: block;