diff --git a/DESCRIPTION b/DESCRIPTION index a81e23c..a545c69 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: certestyle Title: A Certe R Package for Applying Certe Organisational Style -Version: 1.6.0 +Version: 1.6.1 Authors@R: c( person(given = c("Matthijs", "S."), family = "Berends", diff --git a/inst/rmarkdown/latextemplate/certe-tekst-blauw-links.pdf b/inst/rmarkdown/latextemplate/certe-tekst-blauw-links.pdf index 81ef1df..3a689d4 100644 Binary files a/inst/rmarkdown/latextemplate/certe-tekst-blauw-links.pdf and b/inst/rmarkdown/latextemplate/certe-tekst-blauw-links.pdf differ diff --git a/inst/rmarkdown/latextemplate/certe-tekst-blauw-midden.pdf b/inst/rmarkdown/latextemplate/certe-tekst-blauw-midden.pdf index d7ce06d..a95f746 100644 Binary files a/inst/rmarkdown/latextemplate/certe-tekst-blauw-midden.pdf and b/inst/rmarkdown/latextemplate/certe-tekst-blauw-midden.pdf differ diff --git a/inst/rmarkdown/latextemplate/certe.docx b/inst/rmarkdown/latextemplate/certe.docx index 0325f4c..ffee5e8 100644 Binary files a/inst/rmarkdown/latextemplate/certe.docx and b/inst/rmarkdown/latextemplate/certe.docx differ diff --git a/inst/rmarkdown/latextemplate/certe.pdf b/inst/rmarkdown/latextemplate/certe.pdf index 01ab1dd..0a7d86c 100644 Binary files a/inst/rmarkdown/latextemplate/certe.pdf and b/inst/rmarkdown/latextemplate/certe.pdf differ diff --git a/inst/rmarkdown/latextemplate/certe.tex b/inst/rmarkdown/latextemplate/certe.tex index e997393..bafddcf 100644 --- a/inst/rmarkdown/latextemplate/certe.tex +++ b/inst/rmarkdown/latextemplate/certe.tex @@ -474,20 +474,20 @@ $if(colour-author-date)$\renewcommand{\colourAuthorDate}{$colour-author-date$}$endif$ $if(colour-heading1)$\renewcommand{\colourHeadingOne}{$colour-heading1$}$endif$ $else$ -\newcommand{\colourTitlepageTitlebanner}{$if(colour-titlepage-titlebanner)$$colour-titlepage-titlebanner$$else$01617E$endif$} % standaard certeblauw -\newcommand{\colourVerticalbars}{$if(colour-verticalbars)$$colour-verticalbars$$else$01617E$endif$} % standaard certeblauw -\newcommand{\colourSubtitle}{$if(colour-subtitle)$$colour-subtitle$$else$01617E$endif$} % standaard certeblauw +\newcommand{\colourTitlepageTitlebanner}{$if(colour-titlepage-titlebanner)$$colour-titlepage-titlebanner$$else$4A647D$endif$} % standaard certeblauw +\newcommand{\colourVerticalbars}{$if(colour-verticalbars)$$colour-verticalbars$$else$4A647D$endif$} % standaard certeblauw +\newcommand{\colourSubtitle}{$if(colour-subtitle)$$colour-subtitle$$else$4A647D$endif$} % standaard certeblauw \newcommand{\colourSubtitleTwo}{$if(colour-subtitle2)$$colour-subtitle2$$else$\colourSubtitle$endif$} % standaard colour-subtitle -\newcommand{\colourAuthorDate}{$if(colour-author-date)$$colour-author-date$$else$01617E$endif$} % standaard certeblauw -\newcommand{\colourHeadingOne}{$if(colour-heading1)$$colour-heading1$$else$01617E$endif$} % standaard certeblauw +\newcommand{\colourAuthorDate}{$if(colour-author-date)$$colour-author-date$$else$4A647D$endif$} % standaard certeblauw +\newcommand{\colourHeadingOne}{$if(colour-heading1)$$colour-heading1$$else$4A647D$endif$} % standaard certeblauw $endif$ % overige elementen: \newcommand{\colourTitlepageFull}{$if(colour-titlepage-full)$$colour-titlepage-full$$else$FFFFFF$endif$} % standaard wit \newcommand{\colourTitle}{$if(colour-title)$$colour-title$$else$FFFFFF$endif$} % standaard wit \newcommand{\colourIdentifier}{$if(colour-identifier)$$colour-identifier$$else$CBCBCB$endif$} % standaard grijs -\newcommand{\colourHeadingTwo}{$if(colour-heading2)$$colour-heading2$$else$E04883$endif$} % standaard certeroze -\newcommand{\colourHeadingThree}{$if(colour-heading3)$$colour-heading3$$else$01617E$endif$} % standaard certeblauw -\newcommand{\colourUrl}{$if(colour-url)$$colour-url$$else$E04883$endif$} % standaard certeroze +\newcommand{\colourHeadingTwo}{$if(colour-heading2)$$colour-heading2$$else$B4527F$endif$} % standaard certeroze +\newcommand{\colourHeadingThree}{$if(colour-heading3)$$colour-heading3$$else$4A647D$endif$} % standaard certeblauw +\newcommand{\colourUrl}{$if(colour-url)$$colour-url$$else$B4527F$endif$} % standaard certeroze % hastags verwijderen uit HTML \StrSubstitute{\colourTitlepageTitlebanner}{\#}{}[\colourTitlepageTitlebanner] \StrSubstitute{\colourTitlepageFull}{\#}{}[\colourTitlepageFull] diff --git a/inst/rmarkdown/latextemplate/certefooter.pdf b/inst/rmarkdown/latextemplate/certefooter.pdf index e0779bb..c462e6e 100644 Binary files a/inst/rmarkdown/latextemplate/certefooter.pdf and b/inst/rmarkdown/latextemplate/certefooter.pdf differ diff --git a/inst/rmarkdown/latextemplate/certeroze.docx b/inst/rmarkdown/latextemplate/certeroze.docx index 17a0eaf..89b35bf 100644 Binary files a/inst/rmarkdown/latextemplate/certeroze.docx and b/inst/rmarkdown/latextemplate/certeroze.docx differ diff --git a/inst/rstudio/certe_dark.tmTheme b/inst/rstudio/certe_dark.tmTheme index 20d41a1..f2c8ec6 100644 --- a/inst/rstudio/certe_dark.tmTheme +++ b/inst/rstudio/certe_dark.tmTheme @@ -35,7 +35,7 @@ settings foreground - #8B9934 + #93984C @@ -46,7 +46,7 @@ settings foreground - #1691B6 + #69849C @@ -57,7 +57,7 @@ settings foreground - #E192B1 + #C794AC @@ -68,7 +68,7 @@ settings foreground - #E192B1 + #C794AC @@ -90,7 +90,7 @@ settings foreground - #E192B1 + #C794AC @@ -114,7 +114,7 @@ settings foreground - #E192B1 + #C794AC @@ -125,7 +125,7 @@ settings foreground - #8B9934 + #93984C @@ -136,7 +136,7 @@ settings foreground - #8B9934 + #93984C @@ -158,7 +158,7 @@ settings foreground - #1691B6 + #69849C fontStyle italic @@ -184,7 +184,7 @@ fontStyle foreground - #8B9934 + #93984C @@ -195,7 +195,7 @@ settings foreground - #1691B6 + #69849C fontStyle bold @@ -208,7 +208,7 @@ settings foreground - #E192B1 + #C794AC fontStyle bold @@ -221,7 +221,7 @@ settings foreground - #E192B1 + #C794AC fontStyle bold @@ -234,7 +234,7 @@ settings foreground - #E192B1 + #C794AC fontStyle bold @@ -249,7 +249,7 @@ background foreground - #E192B1 + #C794AC @@ -262,7 +262,7 @@ background foreground - #E192B1 + #C794AC @@ -284,7 +284,7 @@ settings foreground - #E192B1 + #C794AC fontStyle bold @@ -297,7 +297,7 @@ settings foreground - #E192B1 + #C794AC fontStyle italic @@ -310,7 +310,7 @@ settings foreground - #E192B1 + #C794AC fontStyle bold @@ -323,7 +323,7 @@ settings foreground - #E192B1 + #C794AC @@ -334,7 +334,7 @@ settings foreground - #1691B6 + #69849C @@ -345,7 +345,7 @@ settings foreground - #E192B1 + #C794AC fontStyle underline @@ -358,7 +358,7 @@ settings foreground - #E192B1 + #C794AC fontStyle underline @@ -371,7 +371,7 @@ settings foreground - #E192B1 + #C794AC @@ -382,7 +382,7 @@ settings foreground - #E192B1 + #C794AC @@ -393,7 +393,7 @@ settings foreground - #E192B1 + #C794AC @@ -404,7 +404,7 @@ settings foreground - #1691B6 + #69849C @@ -417,4 +417,4 @@ author Matthijs Berends - \ No newline at end of file + diff --git a/inst/rstudio/certe_light.tmTheme b/inst/rstudio/certe_light.tmTheme index 9b8b968..164da1a 100644 --- a/inst/rstudio/certe_light.tmTheme +++ b/inst/rstudio/certe_light.tmTheme @@ -35,7 +35,7 @@ settings foreground - #8B9934 + #93984C @@ -46,7 +46,7 @@ settings foreground - #01617E + #4A647D @@ -57,7 +57,7 @@ settings foreground - #E04883 + #B4527F @@ -68,7 +68,7 @@ settings foreground - #E04883 + #B4527F @@ -90,7 +90,7 @@ settings foreground - #E04883 + #B4527F @@ -114,7 +114,7 @@ settings foreground - #E04883 + #B4527F @@ -125,7 +125,7 @@ settings foreground - #8B9934 + #93984C @@ -136,7 +136,7 @@ settings foreground - #8B9934 + #93984C @@ -158,7 +158,7 @@ settings foreground - #01617E + #4A647D fontStyle italic @@ -184,7 +184,7 @@ fontStyle foreground - #8B9934 + #93984C @@ -195,7 +195,7 @@ settings foreground - #01617E + #4A647D fontStyle bold @@ -208,7 +208,7 @@ settings foreground - #E04883 + #B4527F fontStyle bold @@ -221,7 +221,7 @@ settings foreground - #E04883 + #B4527F fontStyle bold @@ -234,7 +234,7 @@ settings foreground - #E04883 + #B4527F fontStyle bold @@ -249,7 +249,7 @@ background foreground - #E04883 + #B4527F @@ -262,7 +262,7 @@ background foreground - #E04883 + #B4527F @@ -284,7 +284,7 @@ settings foreground - #E04883 + #B4527F fontStyle bold @@ -297,7 +297,7 @@ settings foreground - #E04883 + #B4527F fontStyle italic @@ -310,7 +310,7 @@ settings foreground - #E04883 + #B4527F fontStyle bold @@ -323,7 +323,7 @@ settings foreground - #E04883 + #B4527F @@ -334,7 +334,7 @@ settings foreground - #01617E + #4A647D @@ -345,7 +345,7 @@ settings foreground - #E04883 + #B4527F fontStyle underline @@ -358,7 +358,7 @@ settings foreground - #E04883 + #B4527F fontStyle underline @@ -371,7 +371,7 @@ settings foreground - #E04883 + #B4527F @@ -382,7 +382,7 @@ settings foreground - #E04883 + #B4527F @@ -393,7 +393,7 @@ settings foreground - #E04883 + #B4527F @@ -404,7 +404,7 @@ settings foreground - #01617E + #4A647D @@ -417,4 +417,4 @@ author Matthijs Berends - \ No newline at end of file + diff --git a/pkgdown/extra.css b/pkgdown/extra.css index 1e81d67..92d574e 100644 --- a/pkgdown/extra.css +++ b/pkgdown/extra.css @@ -1,14 +1,14 @@ /* Certe colours, check with certestyle::colourpicker("certe", 3) -#01617E - certeblauw -#8B9934 - certegroen -#E04883 - certeroze +#4A647D - certeblauw +#93984C - certegroen +#B4527F - certeroze */ /* import fonts from Google */ -@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;700&family=Fira+Sans:ital,wght@0,400;0,700;1,400;1,700&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Fira+Code:wght@400;700&family=Source+Sans+3:ital,wght@0,400;0,700;1,400;1,700&display=swap'); body { - font-family: 'Fira Sans', sans-serif !important; + font-family: 'Source Sans 3', sans-serif !important; } pre code { font-family: 'Fira Code', monospace !important; @@ -29,11 +29,11 @@ h1, h1 code, h2, h2 code, h3, h3 code, a, a code { - color: #01617E !important; + color: #4A647D !important; } .navbar-default { background-color: white; - border-color: #01617E; + border-color: #4A647D; } .navbar-brand .navbar-link { background-image: url("/certestyle/logo.svg"); @@ -45,7 +45,7 @@ a, a code { padding-left: 44px; } .label-default { - background-color: #01617E !important; + background-color: #4A647D !important; } .navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, @@ -56,8 +56,8 @@ a, a code { background: #EEEEEE !important; } .btn-primary { - background-color: #E04883 !important; - border-color: #E04883 !important; + background-color: #B4527F !important; + border-color: #B4527F !important; } /* syntax colours: */ @@ -68,20 +68,20 @@ a, a code { } .cn,.ch { /* values such as TRUE and NULL */ - color: #E04883; + color: #B4527F; font-style: italic; } .fl { /* numbers */ - color: #E04883; + color: #B4527F; } .sc { /* $ operator */ - color: #E04883; + color: #B4527F; } .st { /* text strings */ - color: #8B9934; + color: #93984C; } diff --git a/vignettes/tex-template.Rmd b/vignettes/tex-template.Rmd index c98bb86..df0cbc4 100644 --- a/vignettes/tex-template.Rmd +++ b/vignettes/tex-template.Rmd @@ -164,18 +164,18 @@ All colours can be set separately, greatly influencing the look and feel of the These are the defaults and what they mean: ```{yaml, eval = FALSE} -colour-titlepage-titlebanner: "#01617E" # horizontal banner colour for the title +colour-titlepage-titlebanner: "#4A647D" # horizontal banner colour for the title colour-titlepage-full: "#FFFFFF" # full page colour for title page -colour-verticalbars: "#01617E" # 1 cm wide vertical bar to left (odd) and right (even) page edges +colour-verticalbars: "#4A647D" # 1 cm wide vertical bar to left (odd) and right (even) page edges colour-title: "#FFFFFF" # colour of title -colour-subtitle: "#01617E" # colour of subtitle +colour-subtitle: "#4A647D" # colour of subtitle colour-subtitle2: `colour-subtitle` # exception - this is the same as `colour-subtitle` at default -colour-author-date: "#01617E" # colour of author name and date on title page +colour-author-date: "#4A647D" # colour of author name and date on title page colour-identifier: "#CBCBCB" # colour of project identifier on title page -colour-heading1: "#01617E" # colour of heading 1 -colour-heading2: "#E04883" # colour of heading 2 -colour-heading3: "#01617E" # colour of heading 3 -colour-url: "#E04883" # colour of for URL's and href, so [text](www.site.com) and +colour-heading1: "#4A647D" # colour of heading 1 +colour-heading2: "#B4527F" # colour of heading 2 +colour-heading3: "#4A647D" # colour of heading 3 +colour-url: "#B4527F" # colour of for URL's and href, so [text](www.site.com) and ``` You can set these using a function as well: