diff --git a/DESCRIPTION b/DESCRIPTION index 3e362ca..49d7bab 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: NEFSCspatial Title: Spatial data package for regions in the northeast atlantic -Version: 0.1.0 +Version: 0.1.1 Authors@R: c(person("Andy", "Beet", email = "andrew.beet@noaa.gov", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-8270-7090")), person("Joshua", "Hatch", email = "joshua.hatch@noaa.gov", role = "aut"), person("Kimberly", "Bastille", email = "kimberly.bastille@noaa.gov", role = "aut")) diff --git a/NEWS.md b/NEWS.md index a894f64..d9631b1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +# NEFSCspatial 0.1.1 + +## Minor fixes + +- Migrated to Bootstrap 5 +- Updated Team Members vignette + # NEFSCspatial 0.1.0 ## Data set additions/removals @@ -13,7 +20,6 @@ - Removed leaflet documentation - Standardized data set documentation with added examples - # NEFSCspatial 0.0.1 Initial release of sf objects diff --git a/README.md b/README.md index 3fad141..b62b4ee 100644 --- a/README.md +++ b/README.md @@ -20,4 +20,4 @@ This repository is a scientific product and is not official communication of the NOAA Fisheries -[U.S. Department of Commerce](https://www.commerce.gov/) | [National Oceanographic and Atmospheric Administration](https://www.noaa.gov) | [NOAA Fisheries](https://www.fisheries.noaa.gov/) | [NEFSC](https://www.fisheries.noaa.gov/about/northeast-fisheries-science-center) +[U.S. Department of Commerce](https://www.commerce.gov/) | [NOAA](https://www.noaa.gov) | [NOAA Fisheries](https://www.fisheries.noaa.gov/) | [NEFSC](https://www.fisheries.noaa.gov/about/northeast-fisheries-science-center) diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml index 0a008df..c14c944 100644 --- a/pkgdown/_pkgdown.yml +++ b/pkgdown/_pkgdown.yml @@ -1,47 +1,52 @@ url: https://nefsc.github.io/NEFSC-Spatial/ +home: + title: NEFSC Spatial Data for R + +authors: + Andy Beet: + href: https://andybeet.com + Joshua Hatch: + href: https://github.com/jmhatch-NOAA + Kimberly Bastille: + href: https://github.com/kimberly-bastille + template: - bootstrap: 3 + bootstrap: 5 + math-rendering: mathjax + light-switch: false + bslib: + primary: "#004391" + danger: "#0085CA" + border-radius: 0.5rem + btn-border-radius: 0.25rem deploy: install_metadata: true navbar: + bg: primary structure: - left: - - home - - getting started - - reference - - issue - - articles - right: - - search - - github + left: [getting started, reference, issue, articles, news] + right: [search, github] components: - home: - icon: fas fa-home fa-lg - href: index.html - aria-label: Home getting started: text: Getting Started - icon: fas fa-solid fa-play href: articles/NEFSCspatial.html reference: text: Data - icon: fas fa-database fa-lg href: reference/index.html issue: text: Issues - icon: fas fa-question-circle fa-lg href: https://github.com/NEFSC/NEFSC-Spatial/issues articles: text: Articles - icon: fas fa-file-contract fa-lg menu: - - text: MDEB datasets + - text: MDEB Datasets href: articles/mdeb_datasets.html - text: Team Members href: articles/teamMembers.html + reference: - title: Fishing Areas / Management Areas desc: Areas in which fishing is reported @@ -75,12 +80,3 @@ reference: desc: Areas defining model boundaries - contents: - "Neus_atlantis" - - -authors: - Andy Beet: - href: https://andybeet.com - Kimberly Bastille: - href: https://github.com/kimberly-bastille - Joshua Hatch: - href: https://github.com/jmhatch-NOAA diff --git a/pkgdown/extra.css b/pkgdown/extra.css index 5d3630a..1b8694a 100644 --- a/pkgdown/extra.css +++ b/pkgdown/extra.css @@ -1,203 +1,12 @@ -/*---Use template from: https://ocsdata.ncd.noaa.gov/HSRP/css/ocs-fonts.css---*/ -/*---Use template from: https://www.legislative.noaa.gov/noaa-web/css/contentFormatting.css---*/ -body { - font-family: "Open Sans", sans-serif; - font-size: 14px; - line-height: 1.42857143; - color: #000000; - background-color: #FFFFFF; +h1, h2, h3, h4, h5, h6 { + color: #004391 !important; } -.fas fa-home fa-lg{ - background-color: #FFFFFF; +.form-inline .form-control { + background-color: #f0f0f0; } -h1, h2, h3, h4, h5, h6, p { - font-family: "Open Sans", sans-serif; - color: #00467f; -} - - -h1 { - font-size: 36px; -} - -h2 { - font-size: 20px; -} - -h3 { - font-size: 18px -} - -h4 { - font-size: 16px -} - -h5 { - font-size: 14px; - line-height: 22px; - margin-bottom: 10px; -} - -h6 { - font-size: 14px; -} - -p { - margin-top: 0px; - line-height: 19px; - margin-bottom: .9em; - text-align: left; - color: #000000; -} - -h1.title { - font-family: "Open Sans", sans-serif; - font-size: 40px; - line-height: 40px; - margin-bottom: 25px; - letter-spacing: 0px; - font-weight: 700; - color: #00467f; -} - -h1.mobile { - font-family: "Open Sans", sans-serif; - font-size: 40px; - line-height: 40px; - margin-bottom: 25px; - letter-spacing: 0px; - font-weight: 700; - color: #00467f; -} - -a { font-weight: bold; } -a:link { color: #007eb2; } -a:visited { color: #007eb2; } -a:hover { color: #007eb2; } - -.leftAlignImage img, .rightAlignImage img { - width: 200px; - border: none; -} - -.leftAlignImage, .rightAlignImage { - padding: 4px; - border: none; - width: 200px; - height: auto; -} - -.leftAlignImage { - float: left; - margin-right: 10px; -} - -.rightAlignImage { - float: right; - margin-left: 10px; -} - -.rightAlignImage p:first-child, .leftAlignImage p:first-child { - margin-left: 0px; - margin-top: 0px; -} - -.rightAlignImage p, .leftAlignImage p { - margin-bottom: 0px; - margin-top: 6px; -} - -/*---navbar ---*/ -.navbar { - margin-bottom: 0px; - border-radius: 0px; - color: #FFFFFF; - background-color: #054698; - width: auto; -} - -.navbar-default .navbar-nav>li>a { - color: #FFFFFF; - background-color: #054698; -} /*navbar text*/ - - -.navbar-default .navbar-link { - color: #FFFFFF; -} /*navbar link*/ - -.navbar-default .navbar-link:focus, .navbar-default .navbar-link:hover { - color: #FFFFFF; - text-decoration: underline; -} - -.nav>li { - position: relative; - color: #054698; -} - -.navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover { - color: #FFFFFF; - text-decoration: underline; -} - -.navbar-default .navbar-nav>.open>a, .navbar-default .navbar-nav>.open>a:focus, .navbar-default .navbar-nav>.open>a:hover { - color: #FFFFFF; - text-decoration: underline; - background-color: #054698; -} - -.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>.active>a:hover { - color: #FFFFFF; - background-color: #054698; - text-decoration: underline; -} /*Home button*/ - -nav[data-toggle='toc'] .nav > li > a { - padding: 4px 20px 4px 6px; - font-size: 1.5rem; - font-weight: 400; - color: #00467f; - background-color: #FFFFFF; -} /*Table of content in the vignettes*/ - -nav[data-toggle='toc'] .nav > li > a:focus, nav[data-toggle='toc'] .nav > li > a:hover{ - color: #00467f; - background-color: #FFFFFF; -} - -nav[data-toggle='toc'] .nav > .active > a, nav[data-toggle='toc'] .nav > .active:hover > a, nav[data-toggle='toc'] .nav > .active:focus > a { - color: #FFFFFF; -} - -/*---footer---*/ -footer { - font-size: 14px; - color: #00467f; - background-color: #FFFFFF; - padding-top: 15px; - margin-bottom: 0px; - border-radius: 0px; - width: auto; -} - -footer p { - margin-left: 3px; - margin-right: 3px; - color: #00467f; -} - -footer a:link { color: #00467f; text-decoration: none; } -footer a:visited { color: #00467f; text-decoration: none; } -footer a:hover { color: #00467f; text-decoration: none; } - -/*---fix footer txt alignment---*/ -footer .pkgdown p { - text-align: right; -} - -footer .copyright p { - text-align: left; -} +.form-inline .form-control::placeholder { + color: #004391; + opacity: 0.5; +} \ No newline at end of file diff --git a/vignettes/teamMembers.Rmd b/vignettes/teamMembers.Rmd index bcb305e..6bb31c8 100644 --- a/vignettes/teamMembers.Rmd +++ b/vignettes/teamMembers.Rmd @@ -17,4 +17,4 @@ knitr::opts_chunk$set(echo = TRUE) |---|---|---|---| | Kimberly Bastille | [kimberly-bastille](https://github.com/kimberly-bastille) | READ | SSB | | Andy Beet| [andybeet](https://github.com/andybeet) | READ | EDAB | -| Joshua Hatch | [jmhatch](https://github.com/jmhatch) | PEMAD | OWEB | +| Joshua Hatch | [jmhatch](https://github.com/jmhatch) | PEMAD | MDEB |