Allow for second logo again
Change-Id: I060ca1544f4695bbf1d5e61cf4fd481404fde711
diff --git a/inst/rmarkdown/templates/posterdown_html/resources/template.html b/inst/rmarkdown/templates/posterdown_html/resources/template.html
index 3bc055c..aaa073b 100644
--- a/inst/rmarkdown/templates/posterdown_html/resources/template.html
+++ b/inst/rmarkdown/templates/posterdown_html/resources/template.html
@@ -43,6 +43,9 @@
$endfor$
<style>
+@import url('//code.cdn.mozilla.net/fonts/fira.css');
+@import url('//korap.ids-mannheim.de/font/libertinus.css');
+@import url('//korap.ids-mannheim.de/font/fira-condensed.css');
@page {
size: $if(poster_width)$$poster_width$$else$841mm$endif$ $if(poster_height)$$poster_height$$else$1189mm$endif$;
margin: 0;
@@ -52,14 +55,14 @@
margin: 0;
margin-right: 2cm;
font-size: $if(body_textsize)$$body_textsize$$else$28pt$endif$;
-width: $if(poster_width)$$poster_width$$else$841mm$endif$;
+width: $if(poster_width)$$poster_width$$else$801mm$endif$;
height: $if(poster_height)$$poster_height$$else$1189mm$endif$;
padding: 0;
text-align: justify;
font-family: $if(font_family)$$font_family$$else$Fira Sans$endif$;
}
.poster_wrap {
-width: $if(poster_width)$$poster_width$$else$841mm$endif$;
+width: $if(poster_width)$$poster_width$$else$801mm$endif$;
height: $if(poster_height)$$poster_height$$else$1189mm$endif$;
padding: 0cm;
}
@@ -67,14 +70,23 @@
width: $if(titlebox_borderwidth)$calc(100% - $titlebox_borderwidth$ - $titlebox_borderwidth$)$else$100%$endif$;
height: $if(titlebox_borderwidth)$calc($if(titlebox_height)$$titlebox_height$$else$10%$endif$ - $titlebox_borderwidth$ - $titlebox_borderwidth$)$else$$if(titlebox_height)$$titlebox_height$$else$10%$endif$$endif$;
overflow: hidden;
-border: $if(titlebox_borderwidth)$$titlebox_borderwidth$$else$0$endif$ solid $if(titlebox_bordercol)$$titlebox_bordercol$$else$$if(primary_colour)$$primary_colour$$else$#0b4545$endif$
+border: $if(titlebox_borderwidth)$$titlebox_borderwidth$$else$0$endif$ solid $if(titlebox_bordercol)$$titlebox_bordercol$$else$$if(primary_colour)$$primary_colour$$else$#f18700$endif$
$endif$;
}
-.logo_left {
+.orange_bar {
float: left;
width: 13.5%;
height: 90%;
-background-color: $if(primary_colour)$$primary_colour$$else$#0b4545$endif$;
+background-color: $if(primary_colour)$$primary_colour$$else$#f18700$endif$;
+display: flex;
+align-items: left;
+border-right: 5%;
+justify-content: left;
+}
+.logo_left {
+margin-left: 2cm;
+float: left;
+height: 100%;
display: flex;
align-items: left;
border-right: 5%;
@@ -94,7 +106,7 @@
float: left;
width: 86.5%;
height: 100%;
-color: $if(title_textcol)$$title_textcol$$else$#FFFFFF$endif$;
+color: $if(title_textcol)$$title_textcol$$else$#000000$endif$;
top: 50%;
transform: translateY(-50%);
-webkit-transform: translateY(-50%);
@@ -129,9 +141,9 @@
}
.poster_body {
--webkit-column-count: $if(column_numbers)$$column_numbers$$else$3$endif$; /* Chrome, Safari, Opera */
--moz-column-count: $if(column_numbers)$$column_numbers$$else$3$endif$; /* Firefox */
-column-count: $if(column_numbers)$$column_numbers$$else$3$endif$;
+-webkit-column-count: $if(column_numbers)$$column_numbers$$else$2$endif$; /* Chrome, Safari, Opera */
+-moz-column-count: $if(column_numbers)$$column_numbers$$else$2$endif$; /* Firefox */
+column-count: $if(column_numbers)$$column_numbers$$else$2$endif$;
-webkit-column-fill: auto;
-moz-column-fill: auto;
column-fill: auto;
@@ -141,15 +153,19 @@
-webkit-column-rule-style: $if(columnline_style)$$columnline_style$$else$dashed$endif$;
-moz-column-rule-style: $if(columnline_style)$$columnline_style$$else$dashed$endif$;
column-rule-style: $if(columnline_style)$$columnline_style$$else$dashed$endif$;
--webkit-column-rule-color: $if(columnline_col)$$columnline_col$$else$$if(primary_colour)$$primary_colour$$else$#0b4545$endif$$endif$;
--moz-column-rule-color: $if(columnline_col)$$columnline_col$$else$$if(primary_colour)$$primary_colour$$else$#0b4545$endif$$endif$;
-column-rule-color: $if(columnline_col)$$columnline_col$$else$$if(primary_colour)$$primary_colour$$else$#0b4545$endif$$endif$;
+-webkit-column-rule-color: $if(columnline_col)$$columnline_col$$else$$if(primary_colour)$$primary_colour$$else$#f18700$endif$$endif$;
+-moz-column-rule-color: $if(columnline_col)$$columnline_col$$else$$if(primary_colour)$$primary_colour$$else$#f18700$endif$$endif$;
+column-rule-color: $if(columnline_col)$$columnline_col$$else$$if(primary_colour)$$primary_colour$$else$#f18700$endif$$endif$;
column-gap: 1em;
margin-left: 16.5%;
-width=85.4%
+/*width=82.4%*/
+margin-right: 2cm;
padding-right: 0.5em;
-height: 100%;
-color: $if(body_textcol)$$body_textcol$$else$#000000$endif$
+margin-bottom: 2.54cm;
+height: -webkit-fill-available;
+height: -moz-available;
+height: fill-available;
+color: $if(body_textcol)$$body_textcol$$else$#000000$endif$;
background-color: $if(body_bgcol)$$body_bgcol$$else$#ffffff$endif$;
}
.poster_title h1 {
@@ -159,33 +175,45 @@
border: 0;
font-weight: bold;
}
+.poster_title h2 {
+font-size: 36pt;
+margin: inherit;
+margin-left: 3.5%;
+border: 0;
+font-weight: bold;
+}
.poster_body_wrap{
-width: $if(poster_width)$$poster_width$$else$841mm$endif$;
+width: $if(poster_width)$$poster_width$$else$801mm$endif$;
height: calc(100% - $if(titlebox_height)$$titlebox_height$$else$17%$endif$);
padding-top: calc($if(poster_height)$$poster_height$$else$841mm$endif$ * 0.01);
padding-bottom: calc($if(poster_height)$$poster_height$$else$841mm$endif$ * 0.01);
background-color: $if(body_bgcol)$$body_bgcol$$else$#ffffff$endif$;
}
.poster_title h3 {
-color: $if(author_textcol)$$author_textcol$$else$$if(secondary_colour)$$secondary_colour$$else$#ffffff$endif$$endif$;
+color: $if(author_textcol)$$author_textcol$$else$$if(secondaryX_colour)$$secondary_colour$$else$#000000$endif$$endif$;
font-size: $if(author_textsize)$$author_textsize$$else$36pt$endif$;
margin-top: 20px;
margin-left: 3.5%;
border: 0;
font-family: 'Fira Sans Light';
font-weight: normal;
+margin-block-end: 0.25em;
}
.poster_title h3 > sup {
- font-size: 24pt;
+ font-size: 60%;
margin-left: 0.02em;
}
+.poster_title h5 > sup {
+ font-size: 60%;
+}
.poster_title h5 {
-color: $if(affiliation_textcol)$$affiliation_textcol$$else$#FFFFFF$endif$;
+color: $if(affiliation_textcol)$$affiliation_textcol$$else$#000000$endif$;
font-size: $if(affiliation_textsize)$$affiliation_texsize$$else$24pt$endif$;
margin: 0;
margin-left: 3.5%;
border: 0;
font-weight: normal;
+margin-block-start: 0.2em;
}
img {
margin-top: 0;
@@ -222,8 +250,19 @@
.poster_body h2 {
color: $if(sectitle2_textcol)$$sectitle2_textcol$$else$#000000$endif$;
font-size: $if(sectitle2_textsize)$$sectitle2_textsize$$else$40pt$endif$;
-font-weight: normal;
+font-weight: bold;
+margin-block-start: 0.5em;
+margin-block-end: 0.25em;
}
+
+.poster_body h3 {
+color: $if(sectitle3_textcol)$$sectitle3_textcol$$else$#000000$endif$;
+font-size: $if(sectitle3_textsize)$$sectitle3_textsize$$else$32pt$endif$;
+font-weight: medium;
+margin-block-start: 0.5em;
+margin-block-end: 0.25em;
+}
+
.span {
width: 200%;
}
@@ -291,7 +330,7 @@
font-size: 1em;
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(primary_colour)$$primary_colour$$else$#f18700$endif$;
padding: 1.2mm;
border-radius: 2mm;
}
@@ -352,8 +391,16 @@
$endfor$
<div class="poster_wrap">
-<!-- Right Logo -->
<div class="title_container">
+<!-- Left Logo -->
+<div class="logo_left">
+$if(logoleft_name)$
+<img src=$logoleft_name$ style="margin-top: auto;
+ margin-bottom: auto;
+ height: 60%;">
+$endif$
+</div>
+<!-- Right Logo -->
<div class="logo_right">
$if(logoright_name)$
<img src=$logoright_name$ style="width: 80%">
@@ -554,8 +601,9 @@
<!-- Poster Title -->
<div class= "poster_title">
$if(title)$<h1 id="title">$title$</h1>$endif$
+$if(subtitle)$<h2 id="subtitle">$subtitle$</h2>$endif$
$if(author)$<h3 id="author">$for(author)$$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>$sep$, $endfor$</h3>$endif$
-$if(affiliation)$<h5 id="affiliation">$for(affiliation)$<sup>$affiliation.num$</sup> $affiliation.address$$sep$; $endfor$</h5>$endif$
+$if(affiliation)$<h5 id="affiliation">$for(affiliation)$<sup>$affiliation.num$</sup> $affiliation.address$$sep$; $endfor$</h5>$endif$
</div>
</div>