Skip to content

Commit

Permalink
Merge pull request #51 from eliansoutu/master
Browse files Browse the repository at this point in the history
actualizo comunicacion
  • Loading branch information
eliansoutu authored Aug 13, 2024
2 parents 712a008 + a4c5cc2 commit 8cb4223
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 26 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: comunicacion
Title: DNMyE - Comunicación
Version: 0.0.0.9010
Version: 0.0.0.9011
Authors@R: c(
person("Pablo", "Tiscornia", , "ptiscornia@turismo.gob.ar", role = c("aut")),
person("Juan", "Juara", , "jgjuara@turismo.gob.ar", role = c("aut")),
Expand All @@ -10,7 +10,7 @@ Authors@R: c(
person("Dirección Nacional de Mercados y Estadísticas", "Ministerio de Turismo y Deportes", , "estadisticas@turismo.gob.ar", role = "cph")
)
Description: Herramientas para la comunicación de la Dirección Nacional de
Mercados y Estadística del Ministerio de Turismo y Deportes de Argentina.
Mercados y Estadística de la Subsecretaría de Turismo de Argentina.
License: GPL (>= 3)
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# comunicacion 0.0.0.9011

* Actualizo logos y colores institucionales

# comunicacion 0.0.0.9010

* Elimino espacio entre signos `$/U$S`y numero en `lbl_money`
Expand Down
4 changes: 2 additions & 2 deletions R/zzz.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.onLoad <- function(libname, pkgname){

sysfonts::font_add_google("Roboto", "Roboto")
sysfonts::font_add_google("Encode Sans", "Encode Sans Normal")
sysfonts::font_add_google("Montserrat", "Montserrat")
sysfonts::font_add_google("Lora", "Lora")
}
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ knitr::opts_chunk$set(
<!-- badges: end -->


`{comunicacion}` ofrece herramientas que facilitan la visualización de datos en la [Dirección Nacional de Mercados y Estadísticas](https://www.yvera.tur.ar/sinta/) del [Ministerio de Turismo y Deportes de la Nación](https://www.argentina.gob.ar/turismoydeportes).
`{comunicacion}` ofrece herramientas que facilitan la visualización de datos en la [Dirección Nacional de Mercados y Estadísticas](https://www.yvera.tur.ar/sinta/) de la [Subsecretaría de Turismo de la Nación](https://www.argentina.gob.ar/interior/turismo).



Expand Down
11 changes: 5 additions & 6 deletions inst/resources/css/dnmye_theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,20 @@
* Version: 0.4.2
*
* ------------------------------------------------------- */
@import url(https://fonts.googleapis.com/css?family=Roboto&display=swap);
@import url(https://fonts.googleapis.com/css?family=Encode+Sans&display=swap);
@import url(https://fonts.googleapis.com/css?family=Montserrat&display=swap);
@import url(https://fonts.googleapis.com/css?family=Lora&display=swap);
@import url(https://fonts.googleapis.com/css?family=IBM+Plex+Mono&display=swap);


:root {
/* Fonts */
--text-font-family: Roboto;
--text-font-family: Montserrat;
--text-font-is-google: 1;
--text-font-family-fallback: -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, helvetica, Ubuntu, roboto, noto, segoe ui, arial;
--text-font-family-fallback: -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, helvetica, Ubuntu, Montserrat, noto, segoe ui, arial;
--text-font-base: sans-serif;
--header-font-family: 'Encode Sans';
--header-font-family: Lora;
--header-font-is-google: 1;
--header-font-family-fallback: Georgia, serif;
--code-font-family: 'IBM Plex Mono';
--code-font-is-google: 1;
--base-font-size: 20px;
--text-font-size: 1rem;
Expand Down
10 changes: 5 additions & 5 deletions inst/resources/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
--color-mbox: rgba(0, 0, 0, 0.2);
--running-title-width: 2in;
--screen-pages-spacing: 5mm;
--main-color: #37BBED;
--main-color: #252C4F;
--second-color: #50535C;
--third-color: #AAAAAA;
--forth-color: #50535C;
--main-font: "Roboto";
--header-font: "Encode Sans Normal";
--toc-font: "Roboto";
--main-font: "Montserrat";
--header-font: "Lora";
--toc-font: "Montserrat";
}

/* ---------------------- For debugging -------------------- */
Expand Down Expand Up @@ -129,7 +129,7 @@
background-repeat: no-repeat, no-repeat;
/*background-position: 8cm 25cm, 0cm 0cm;*/
background-position: 50% 90%, 0cm 0cm;
background-size: 15cm, cover;
background-size: 15cm, cover; /*tamaño logo tapa*/

@top-left-corner {
display: none;
Expand Down
Binary file modified inst/resources/img/portada_hoja1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion inst/rmarkdown/templates/paged/skeleton/skeleton.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: "Título del informe"
#subtitle: "Subtítulo del informe"
author: |
| Dirección Nacional de Mercados y Estadística
| Subsecretaría de Turismo
date: "acalafecha"
output:
comunicacion::template_informe
Expand Down
15 changes: 7 additions & 8 deletions inst/rmarkdown/templates/xaringan/skeleton/skeleton.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ output:

class:inverse, middle

background-image: url(https://tableros.yvera.tur.ar/recursos/logos_institucionales/escudo_interior_blanco.png)
background-image: url(https://tableros.yvera.tur.ar/recursos/logos_institucionales/sec_turismo_blanco.png)
background-position: 95% 95%
background-size: 20%
background-size: 30%

# Acá va un título

Expand All @@ -32,17 +32,16 @@ background-size: 20%
<br>
<br>
<br>
<br>

### Dirección Nacional de Mercados y Estadística<br>Subsecretaría de Turismo
### Dirección Nacional de Mercados y Estadística




```{r, echo=FALSE}
library(xaringanExtra)
# LOGO COLOR EN PAGs INTERNAS
xaringanExtra::use_logo(image_url = "https://tableros.yvera.tur.ar/recursos/logos_institucionales/escudo_interior_negro.png",
xaringanExtra::use_logo(image_url = "https://tableros.yvera.tur.ar/recursos/logos_institucionales/sec_turismo_azul.png",
position = css_position(top = "1em", right = "1em"),
height = "15%", width = "15%")
# BARRA DE PROGRESO DE PRESENTACION
Expand All @@ -61,15 +60,15 @@ library(xaringanthemer) #EVAL FALSE
library(comunicacion)
style_mono_light(outfile = "dnmye_theme.css", # CSS FILE
# FONTS
header_font_google = google_font('Encode Sans'),
text_font_google = google_font('Roboto'),
header_font_google = google_font('Lora'),
text_font_google = google_font('Montserrat'),
code_font_google = google_font('IBM Plex Mono'),
# COLORES
base_color = "#252C4F",
code_inline_color = dnmye_colores("rosa"),
inverse_link_color = "#3B4449",
background_color = "#FFFFFF",
title_slide_background_image = "escudo_mintur_blanco.png",
title_slide_background_image = "sec_turismo_blanco.png",
title_slide_background_position = "95% 5%",
title_slide_background_size = "200px", footnote_color = "#3B4449", link_color = "3B4449",text_slide_number_font_size = "16px"
Expand Down
2 changes: 1 addition & 1 deletion inst/rmarkdown/templates/xaringan/template.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Xaringan DNMyE
description: >
Plantilla de presentaciones de la Dirección Nacional de Mercados y Estadísticas (DNMyE) del Ministerio de Turismo y Deportes de la Nación
Plantilla de presentaciones de la Dirección Nacional de Mercados y Estadísticas (DNMyE) de la Subsecretaría de Turismo de la Nación
create_dir: FALSE

0 comments on commit 8cb4223

Please sign in to comment.