Merge branch 'master' of https://github.com/brentthorne/posterdown
diff --git a/inst/rmarkdown/templates/posterdown_betterland/resources/template.html b/inst/rmarkdown/templates/posterdown_betterland/resources/template.html
index ff17b86..44aafcd 100644
--- a/inst/rmarkdown/templates/posterdown_betterland/resources/template.html
+++ b/inst/rmarkdown/templates/posterdown_betterland/resources/template.html
@@ -72,25 +72,31 @@
width: 100%;
}
pre.sourceCode.r {
-background-color: #dddddd40;
-border-radius: 4mm;
+background-color: #ffffff20;
+border: solid $if(secondary_colour)$$secondary_colour$$else$#008080$endif$ 1mm;
+border-radius: 0.5em;
padding: 4mm;
-width: 75%;
margin: auto;
margin-top: 1em;
margin-bottom: 1em;
/* align-items: center; */
}
+div.sourceCode {
+background-color: transparent;
+width: 85%;
+margin-left: auto;
+margin-right: auto;
+}
code.sourceCode.r{
background-color: transparent;
-font-size: 20pt;
+font-size: $if(codechunk_fontsize)$$codechunk_fontsize$$else$20pt$endif$;
border-radius: 2mm;
}
code {
font-size: 25pt;
font-family: monospace;
background-color: $if(secondary_colour)$$secondary_colour$24$else$#00808024$endif$;
-color: $if(primary_colour)$$primary_colour$$else$#0b4545$endif$;
+color: $if(secondary_colour)$$secondary_colour$$else$#008080$endif$;
padding: 1.2mm;
line-height: 1;
border-radius: 2mm;
@@ -180,7 +186,8 @@
#author {
color: $if(author_textcol)$$author_textcol$$else$$if(primary_colour)$$primary_colour$$else$#0b4545$endif$$endif$;
margin: 0;
-line-height: 90%;
+text-align: left;
+line-height: 65%;
font-size: $if(author_textsize)$$author_textsize$$else$1.17em$endif$;
}
#affiliation {
@@ -279,6 +286,21 @@
font-size: 5px;
text-decoration: none;
}
+.globe {
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
+font-size: 5px;
+text-decoration: none;
+}
+.github > .fab {
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
+font-size: 40px;
+text-decoration: none;
+}
+.globetext {
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
+font-size: 35px;
+text-decoration: none;
+}
.poster_wrap {
width: $if(poster_width)$$poster_width$$else$46in$endif$;
height: $if(poster_height)$$poster_height$$else$32in$endif$;
@@ -330,11 +352,17 @@
$for(author)$
$if(author.main)$
$author.name$<sup> $author.affil$$if(author.orcid)$, <a class="orcid" href="https://orcid.org/$author.orcid$"><img src="https://raw.githubusercontent.com/brentthorne/posterdown/master/images/orcid.jpg"></a>$else$$endif$</sup><br>
-$if(author.twitter)$<a class="twitter" href="https://mobile.twitter.com/$author.twitter$"><i class="fab fa-twitter"></i> @$author.twitter$</a><br>
+$if(author.twitter)$<a class="twitter" href="https://mobile.twitter.com/$author.twitter$"><i class="fab fa-twitter"></i> @$author.twitter$</a> <br>
$else$$endif$
$if(author.email)$
<a class='envelope'><i class="fas fa-envelope"></i></a> $author.email$ <br>
$else$$endif$
+$if(author.website)$
+<a class='globe'><i class="fas fa-globe"></i></a> <a class='globetext'> $author.website$</a> <br>
+$else$$endif$
+$if(author.github)$
+<a class='github'><i class="fab fa-github"></i></a><a class='globetext' href="https://github.com/$author.github$"> @$author.github$</a>
+$else$$endif$
$else$$endif$
$sep$ $endfor$
</h3>
diff --git a/inst/rmarkdown/templates/posterdown_betterport/resources/template.html b/inst/rmarkdown/templates/posterdown_betterport/resources/template.html
index da34ac1..a6a549e 100644
--- a/inst/rmarkdown/templates/posterdown_betterport/resources/template.html
+++ b/inst/rmarkdown/templates/posterdown_betterport/resources/template.html
@@ -81,7 +81,7 @@
}
code.sourceCode.r{
background-color: transparent;
-font-size: 20pt;
+font-size: $if(codechunk_fontsize)$$codechunk_fontsize$$else$20pt$endif$;
border-radius: 2mm;
}
code {
@@ -295,24 +295,34 @@
margin-left: 1em;
}
.fab {
-color: #00000030;
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
font-size: 25px;
}
.twitter, i {
-color: #00000030;
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
font-size: 35px;
text-decoration: none;
}
a.email {
text-decoration: none;
-color: #00000030;
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
font-size: 35px;
}
.envelope {
-color: #00000030;
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
font-size: 5px;
text-decoration: none;
}
+.globe {
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
+font-size: 5px;
+text-decoration: none;
+}
+.globetext {
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#00000060$endif$;
+font-size: 35px;
+text-decoration: none;
+}
.poster_wrap {
width: $if(poster_width)$$poster_width$$else$36in$endif$;
height: $if(poster_height)$$poster_height$$else$48in$endif$;
@@ -392,6 +402,9 @@
$if(author.email)$
<a class='envelope'><i class="fas fa-envelope"></i></a> $author.email$ <br>
$else$$endif$
+$if(author.website)$
+<a class='globe'><i class="fas fa-globe"></i></a> <a class='globetext' href="$author.website$">$author.website$</a> <br>
+$else$$endif$
$else$$endif$
$sep$ $endfor$
</h3>
diff --git a/inst/rmarkdown/templates/posterdown_html/resources/template.html b/inst/rmarkdown/templates/posterdown_html/resources/template.html
index 05ca479..bbf7ad8 100644
--- a/inst/rmarkdown/templates/posterdown_html/resources/template.html
+++ b/inst/rmarkdown/templates/posterdown_html/resources/template.html
@@ -237,6 +237,7 @@
}
code.sourceCode.r{
background-color: transparent;
+font-size: $if(codechunk_fontsize)$$codechunk_fontsize$$else$20pt$endif$;
color: $if(body_textcol)$$body_textcol$$else$#000000$endif$
}
.caption {