From d81ef161f1487ba7a564879d8cf333b3d83ca5cb Mon Sep 17 00:00:00 2001 From: Diego H Date: Sun, 17 Mar 2024 23:13:38 +0100 Subject: [PATCH] Update pkg --- DESCRIPTION | 2 +- codemeta.json | 2 +- inst/pkgdown/assets/BS5/rostemplate.css | 571 ++++++++++++++------ inst/pkgdown/assets/BS5/rostemplate.min.css | 1 + inst/pkgdown/templates/in-header.html | 2 +- vignettes/articles/descargas.Rmd | 14 +- 6 files changed, 421 insertions(+), 171 deletions(-) create mode 100644 inst/pkgdown/assets/BS5/rostemplate.min.css diff --git a/DESCRIPTION b/DESCRIPTION index 06b6c5e..0f03eff 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -25,7 +25,7 @@ Suggests: VignetteBuilder: knitr Config/Needs/website: ropenspain/rostemplate, ggplot2, devtools, remotes, - pkgsearch + pkgsearch, htmltools Config/testthat/edition: 3 Encoding: UTF-8 Language: es_ES diff --git a/codemeta.json b/codemeta.json index cd3e0d8..129773b 100644 --- a/codemeta.json +++ b/codemeta.json @@ -146,7 +146,7 @@ "SystemRequirements": null }, "isPartOf": "https://ropenspain.es/", - "fileSize": "216.581KB", + "fileSize": "220.017KB", "citation": [ { "@type": "SoftwareSourceCode", diff --git a/inst/pkgdown/assets/BS5/rostemplate.css b/inst/pkgdown/assets/BS5/rostemplate.css index d75cc8c..363cfe0 100644 --- a/inst/pkgdown/assets/BS5/rostemplate.css +++ b/inst/pkgdown/assets/BS5/rostemplate.css @@ -1,207 +1,446 @@ -/* https://www.cleancss.com/css-beautify/ */ - h1 code, h2 code, h3 code, h4 code, h5 code, h6 code { - background-color: transparent; +/* https://www.freeformatter.com/css-beautifier.html */ +h1 code, +h2 code, +h3 code, +h4 code, +h5 code, +h6 code { + background-color: transparent; } + pre a { - color: inherit; - font-weight: inherit; - text-decoration: underline; + color: inherit; + font-weight: inherit; + text-decoration: underline; } + code a { - text-decoration: underline; + text-decoration: underline; } .pkg { - font-weight: bold; - } + font-weight: bold; +} /* Section: Syntax highlighter emacs (como en la web de rOpenSpain) */ pre { display: block; - padding: 9.5px; - margin: 0 0 10px; - font-size: 13px; - line-height: 1.42857143; - color: #333; - word-break: break-all; - word-wrap: break-word; - background-color: #f5f5f5; - border: 1px solid #ccc; - border-radius: 4px; -} -pre code /* Normal */ {color:#333} -pre code span.al /* Alert */ {border: 1px solid #FF0000} -pre code span.an /* Annotation */ {color: #008800; font-style: italic } -pre code span.at /* Attribute */ {color:#BB4444} -pre code span.bn /* BaseN */ {color:#880000} -pre code span.bu /* BuiltIn */ {color:#BB4444} -pre code span.cf /* ControlFlow */ {color:#BB4444} -pre code span.ch /* Char */ {color:#BB4444} -pre code span.cn /* Constant */ {color:#880000} -pre code span.co /* Comment */ {color: #008800; font-style: italic } -pre code span.cv /* CommentVar */ {color: #008800; font-style: italic } -pre code span.do /* Documentation */ {color: #008800; font-style: italic } -pre code span.dt /* DataType */ {color:#BB4444} -pre code span.dv /* DecVal */ {color:#666666} -pre code span.er /* Error */ {border: 1px solid #FF0000} -pre code span.ex /* Extension */ {color:#BB4444; font-weight: bold} -pre code span.fl /* Float */ {color:#666666} -pre code span.fu /* Function */ {color:#00A000} -pre code span.im /* Import */ {color:#BB4444} -pre code span.in /* Information */ {color: #008800; font-style: italic } -pre code span.kw /* Keyword */ {color: #AA22FF; font-weight: bold } -pre code span.op /* Operator */ {color:#666666} -pre code span.ot /* Others */ {color:#008000} -pre code span.pp /* Preprocessor */ {color:#008800} -pre code span.re /* RegionMarker */ {color: #008800; font-style: italic } -pre code span.sc /* SpecialChar */ {color:#666666} -pre code span.ss /* SpecialString */ {color:#008000} -pre code span.st /* String */ {color:#BB4444} -pre code span.va /* Variable */ {color:#B8860B} -pre code span.vs /* VerbatimString */ {color:#BB4444} -pre code span.wa /* Warning */ {border: 1px solid #FF0000} + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 1.42857143; + color: #333; + word-break: break-all; + word-wrap: break-word; + background-color: #f5f5f5; + border: 1px solid #ccc; + border-radius: 4px; +} + +pre code + +/* Normal */ + { + color: #333 +} + +pre code span.al + +/* Alert */ + { + border: 1px solid #FF0000 +} + +pre code span.an + +/* Annotation */ + { + color: #008800; + font-style: italic +} + +pre code span.at + +/* Attribute */ + { + color: #BB4444 +} + +pre code span.bn + +/* BaseN */ + { + color: #880000 +} + +pre code span.bu + +/* BuiltIn */ + { + color: #BB4444 +} + +pre code span.cf + +/* ControlFlow */ + { + color: #BB4444 +} + +pre code span.ch + +/* Char */ + { + color: #BB4444 +} + +pre code span.cn + +/* Constant */ + { + color: #880000 +} + +pre code span.co + +/* Comment */ + { + color: #008800; + font-style: italic +} + +pre code span.cv + +/* CommentVar */ + { + color: #008800; + font-style: italic +} + +pre code span.do + +/* Documentation */ + { + color: #008800; + font-style: italic +} + +pre code span.dt + +/* DataType */ + { + color: #BB4444 +} + +pre code span.dv + +/* DecVal */ + { + color: #666666 +} + +pre code span.er + +/* Error */ + { + border: 1px solid #FF0000 +} + +pre code span.ex + +/* Extension */ + { + color: #BB4444; + font-weight: bold +} + +pre code span.fl + +/* Float */ + { + color: #666666 +} + +pre code span.fu + +/* Function */ + { + color: #00A000 +} + +pre code span.im + +/* Import */ + { + color: #BB4444 +} + +pre code span.in + +/* Information */ + { + color: #008800; + font-style: italic +} + +pre code span.kw + +/* Keyword */ + { + color: #AA22FF; + font-weight: bold +} + +pre code span.op + +/* Operator */ + { + color: #666666 +} + +pre code span.ot + +/* Others */ + { + color: #008000 +} + +pre code span.pp + +/* Preprocessor */ + { + color: #008800 +} + +pre code span.re + +/* RegionMarker */ + { + color: #008800; + font-style: italic +} + +pre code span.sc + +/* SpecialChar */ + { + color: #666666 +} + +pre code span.ss + +/* SpecialString */ + { + color: #008000 +} + +pre code span.st + +/* String */ + { + color: #BB4444 +} + +pre code span.va + +/* Variable */ + { + color: #B8860B +} + +pre code span.vs + +/* VerbatimString */ + { + color: #BB4444 +} + +pre code span.wa + +/* Warning */ + { + border: 1px solid #FF0000 +} /* Section: Navbar */ - .navbar-light .navbar-brand { - font-weight: 300; +.navbar-light .navbar-brand { + font-weight: 300; } - .navbar-light .navbar-brand:hover, .navbar-light .navbar-brand:focus { - color: #555555; + +.navbar-light .navbar-brand:hover, +.navbar-light .navbar-brand:focus { + color: #555555; } - .navbar-light .nav-item { - text-transform: uppercase; - text-decoration: underline; - font-weight: bold; - letter-spacing: 0.04em; + +.navbar-light .nav-item { + text-transform: uppercase; + text-decoration: underline; + font-weight: bold; + letter-spacing: 0.04em; } - .navbar-light .navbar-nav .active>.nav-link { - background-color: #986dbd; - color: white; + +.navbar-light .navbar-nav .active>.nav-link { + background-color: #986dbd; + color: white; } - .navbar-light .navbar-nav .active>.nav-link:hover, .navbar-light .navbar-nav .active>.nav-link:focus { - background-color: #cab3dd; + +.navbar-light .navbar-nav .active>.nav-link:hover, +.navbar-light .navbar-nav .active>.nav-link:focus { + background-color: #cab3dd; } - .navbar-light .navbar-nav .nav-item>.nav-link:hover, .navbar-light .navbar-nav .nav-item>.nav-link:focus { - background-color: #cab3dd; + +.navbar-light .navbar-nav .nav-item>.nav-link:hover, +.navbar-light .navbar-nav .nav-item>.nav-link:focus { + background-color: #cab3dd; } - .navbar small { - font-size: 0.75rem; - padding-top: 0.65rem; - padding-right: 1rem; + +.navbar small { + font-size: 0.75rem; + padding-top: 0.65rem; + padding-right: 1rem; } - .navbar small.text-muted { - color: #986dbd !important; + +.navbar small.text-muted { + color: #986dbd !important; } - .navbar-nav .active.nav-item { - text-decoration: none; + +.navbar-nav .active.nav-item { + text-decoration: none; } - @media ((min-width: 992px)) { - .navbar-nav .nav-item>.nav-link { - border-top: solid 5px transparent; - } + +@media ((min-width: 992px)) { + .navbar-nav .nav-item>.nav-link { + border-top: solid 5px transparent; + } } - @media ((min-width: 992px)) { - .navbar-light .navbar-nav .active>.nav-link { - border-top: solid 5px #653d87; - } + +@media ((min-width: 992px)) { + .navbar-light .navbar-nav .active>.nav-link { + border-top: solid 5px #653d87; + } } - @media ((min-width: 992px)) { - .navbar-light .navbar-nav .nav-item>.nav-link:hover, .navbar-light .navbar-nav .nav-item>.nav-link:focus { - border-top: solid 5px #986dbd; - } + +@media ((min-width: 992px)) { + + .navbar-light .navbar-nav .nav-item>.nav-link:hover, + .navbar-light .navbar-nav .nav-item>.nav-link:focus { + border-top: solid 5px #986dbd; + } } - @media ((max-width: 992px)) { - #navbar { - padding-top:0.75rem; - } + +@media ((max-width: 992px)) { + #navbar { + padding-top: 0.75rem; + } } - @media ((max-width: 992px)) { - #navbar ul:first-of-type { - border-top: solid 1px #cccccc; - } + +@media ((max-width: 992px)) { + #navbar ul:first-of-type { + border-top: solid 1px #cccccc; + } } - .navbar-toggler:focus { - box-shadow: 0 0 0 0.25rem rgba(152, 109, 189, 0.3); + +.navbar-toggler:focus { + box-shadow: 0 0 0 0.25rem rgba(152, 109, 189, 0.3); } + /* Section: Misc */ - #toc>.nav a.nav-link.active { - color: white; - background-color: #986dbd; +#toc>.nav a.nav-link.active { + color: white; + background-color: #986dbd; } - .logo { - display: none; + +.logo { + display: none; } + /* Section: specific ros elements and classes */ - .ROSh1 { - background: url('texture-bw.png') center center repeat; - padding: 20px 0; - color: #333333; - text-transform: uppercase; - font-size: 30px; - font-weight: 700; - letter-spacing: 0.08em; - text-align: center; -} - .ROSh1 img { - display: none; -} - #homelogoxs { - height: 24px; - display: inline; -} - #ROS-heading-breadcrumbs { - padding-top: 10px; - padding-bottom: 1px; - font-size: 14px; - text-decoration: none; - text-transform: none; - letter-spacing: 0; -} - #ROS-partof { - font-weight: 300; - color: black; -} - .ROS-light { - font-weight: 300; +.ROSh1 { + background: url('texture-bw.png') center center repeat; + padding: 20px 0; + color: #333333; + text-transform: uppercase; + font-size: 30px; + font-weight: 700; + letter-spacing: 0.08em; + text-align: center; +} + +.ROSh1 img { + display: none; } + +#homelogoxs { + height: 24px; + display: inline; +} + +#ROS-heading-breadcrumbs { + padding-top: 10px; + padding-bottom: 1px; + font-size: 14px; + text-decoration: none; + text-transform: none; + letter-spacing: 0; +} + +#ROS-partof { + font-weight: 300; + color: black; +} + +.ROS-light { + font-weight: 300; +} + /* Section: Footer */ /* Position hack to get full width footer even though pkgdown puts it inside a container * See: https://css-tricks.com/full-width-containers-limited-width-parents/ */ - #footer { - background: #555555; - padding: 50px 0; - color: #999999; - margin-top: 1rem; - margin-bottom: 0; -} - #footer h1, #footer h2, #footer h3, #footer h4, #footer h5, #footer h6 { - color: #eeeeee; -} - #footer h4 { - font-size: 14px; - font-weight: 800; - text-transform: uppercase; - letter-spacing: 0.08em; -} - #copyright { - margin: 0; - background: #333; - color: #ccc; - padding: 50px 0; - font-size: 12px; - line-height: 28px; +#footer { + background: #555555; + padding: 50px 0; + color: #999999; + margin-top: 1rem; + margin-bottom: 0; +} + +#footer h1, +#footer h2, +#footer h3, +#footer h4, +#footer h5, +#footer h6 { + color: #eeeeee; +} + +#footer h4 { + font-size: 14px; + font-weight: 800; + text-transform: uppercase; + letter-spacing: 0.08em; +} + +#copyright { + margin: 0; + background: #333; + color: #ccc; + padding: 50px 0; + font-size: 12px; + line-height: 28px; } + /* ---Caption figure--- */ - .caption, .figure { - color: #6c757d; - margin-left: auto; - margin-right: auto; - margin-top: 0.5rem; - font-size: 85%; - width: 100%; +.caption, +.figure { + color: #6c757d; + margin-left: auto; + margin-right: auto; + margin-top: 0.5rem; + font-size: 85%; + width: 100%; } blockquote { - padding: 10px 20px; - margin: 0 0 20px; - border-left: 5px solid #986dbd; + padding: 10px 20px; + margin: 0 0 20px; + border-left: 5px solid #986dbd; } diff --git a/inst/pkgdown/assets/BS5/rostemplate.min.css b/inst/pkgdown/assets/BS5/rostemplate.min.css new file mode 100644 index 0000000..938241e --- /dev/null +++ b/inst/pkgdown/assets/BS5/rostemplate.min.css @@ -0,0 +1 @@ +h1 code,h2 code,h3 code,h4 code,h5 code,h6 code{background-color:transparent}pre a{color:inherit;font-weight:inherit;text-decoration:underline}code a{text-decoration:underline}.pkg{font-weight:bold}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{color:#333}pre code span.al{border:1px solid red}pre code span.an{color:#080;font-style:italic}pre code span.at{color:#b44}pre code span.bn{color:#800}pre code span.bu{color:#b44}pre code span.cf{color:#b44}pre code span.ch{color:#b44}pre code span.cn{color:#800}pre code span.co{color:#080;font-style:italic}pre code span.cv{color:#080;font-style:italic}pre code span.do{color:#080;font-style:italic}pre code span.dt{color:#b44}pre code span.dv{color:#666}pre code span.er{border:1px solid red}pre code span.ex{color:#b44;font-weight:bold}pre code span.fl{color:#666}pre code span.fu{color:#00a000}pre code span.im{color:#b44}pre code span.in{color:#080;font-style:italic}pre code span.kw{color:#a2f;font-weight:bold}pre code span.op{color:#666}pre code span.ot{color:#008000}pre code span.pp{color:#080}pre code span.re{color:#080;font-style:italic}pre code span.sc{color:#666}pre code span.ss{color:#008000}pre code span.st{color:#b44}pre code span.va{color:#b8860b}pre code span.vs{color:#b44}pre code span.wa{border:1px solid red}.navbar-light .navbar-brand{font-weight:300}.navbar-light .navbar-brand:hover,.navbar-light .navbar-brand:focus{color:#555}.navbar-light .nav-item{text-transform:uppercase;text-decoration:underline;font-weight:bold;letter-spacing:.04em}.navbar-light .navbar-nav .active>.nav-link{background-color:#986dbd;color:white}.navbar-light .navbar-nav .active>.nav-link:hover,.navbar-light .navbar-nav .active>.nav-link:focus{background-color:#cab3dd}.navbar-light .navbar-nav .nav-item>.nav-link:hover,.navbar-light .navbar-nav .nav-item>.nav-link:focus{background-color:#cab3dd}.navbar small{font-size:.75rem;padding-top:.65rem;padding-right:1rem}.navbar small.text-muted{color:#986dbd !important}.navbar-nav .active.nav-item{text-decoration:none}@media((min-width:992px)){.navbar-nav .nav-item>.nav-link{border-top:solid 5px transparent}}@media((min-width:992px)){.navbar-light .navbar-nav .active>.nav-link{border-top:solid 5px #653d87}}@media((min-width:992px)){.navbar-light .navbar-nav .nav-item>.nav-link:hover,.navbar-light .navbar-nav .nav-item>.nav-link:focus{border-top:solid 5px #986dbd}}@media((max-width:992px)){#navbar{padding-top:.75rem}}@media((max-width:992px)){#navbar ul:first-of-type{border-top:solid 1px #ccc}}.navbar-toggler:focus{box-shadow:0 0 0 .25rem rgba(152,109,189,0.3)}#toc>.nav a.nav-link.active{color:white;background-color:#986dbd}.logo{display:none}.ROSh1{background:url('texture-bw.png') center center repeat;padding:20px 0;color:#333;text-transform:uppercase;font-size:30px;font-weight:700;letter-spacing:.08em;text-align:center}.ROSh1 img{display:none}#homelogoxs{height:24px;display:inline}#ROS-heading-breadcrumbs{padding-top:10px;padding-bottom:1px;font-size:14px;text-decoration:none;text-transform:none;letter-spacing:0}#ROS-partof{font-weight:300;color:black}.ROS-light{font-weight:300}#footer{background:#555;padding:50px 0;color:#999;margin-top:1rem;margin-bottom:0}#footer h1,#footer h2,#footer h3,#footer h4,#footer h5,#footer h6{color:#eee}#footer h4{font-size:14px;font-weight:800;text-transform:uppercase;letter-spacing:.08em}#copyright{margin:0;background:#333;color:#ccc;padding:50px 0;font-size:12px;line-height:28px}.caption,.figure{color:#6c757d;margin-left:auto;margin-right:auto;margin-top:.5rem;font-size:85%;width:100%}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #986dbd} diff --git a/inst/pkgdown/templates/in-header.html b/inst/pkgdown/templates/in-header.html index 554421d..65d58f7 100644 --- a/inst/pkgdown/templates/in-header.html +++ b/inst/pkgdown/templates/in-header.html @@ -2,4 +2,4 @@ - + diff --git a/vignettes/articles/descargas.Rmd b/vignettes/articles/descargas.Rmd index 571f55d..31263b8 100644 --- a/vignettes/articles/descargas.Rmd +++ b/vignettes/articles/descargas.Rmd @@ -211,7 +211,12 @@ reactable( striped = TRUE, paginationType = "jump", elementId = "cran-dwn", - defaultPageSize = 25 + defaultPageSize = 25, + columns = list(paquete = colDef(cell = function(value) { + # Render as a link + url <- paste0("https://CRAN.R-project.org/package=", value) + htmltools::tags$a(href = url, target = "_blank", as.character(value)) + })) ) ``` @@ -274,6 +279,11 @@ reactable( striped = TRUE, paginationType = "jump", elementId = "posit-dwn", - defaultPageSize = 25 + defaultPageSize = 25, + columns = list(paquete = colDef(cell = function(value) { + # Render as a link + url <- paste0("https://CRAN.R-project.org/package=", value) + htmltools::tags$a(href = url, target = "_blank", as.character(value)) + })) ) ```