diff --git a/.gitignore b/.gitignore index c6348106..3d582222 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ ehthumbs.db Thumbs.db extras/codeToRun.R output/ +ddl/ diff --git a/DESCRIPTION b/DESCRIPTION index 9e8b93e4..5ec34b2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -24,5 +24,5 @@ Suggests: RSQLite, withr NeedsCompilation: no -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.1 Config/testthat/edition: 3 diff --git a/docs/background.html b/docs/background.html index 56faabae..fab210ce 100644 --- a/docs/background.html +++ b/docs/background.html @@ -11,9 +11,9 @@ -background.knit + OMOP CDM Background - + @@ -148,11 +148,15 @@ href = "index.html"; var menuAnchor = $('a[href="' + href + '"]'); - // mark it active - menuAnchor.tab('show'); - - // if it's got a parent navbar menu mark it active as well - menuAnchor.closest('li.dropdown').addClass('active'); + // mark the anchor link active (and if it's in a dropdown, also mark that active) + var dropdown = menuAnchor.closest('li.dropdown'); + if (window.bootstrap) { // Bootstrap 4+ + menuAnchor.addClass('active'); + dropdown.find('> .dropdown-toggle').addClass('active'); + } else { // Bootstrap 3 + menuAnchor.parent().addClass('active'); + dropdown.addClass('active'); + } // Navbar adjustments var navHeight = $(".navbar").first().height() + 15; @@ -327,7 +331,7 @@