Skip to content

Commit

Permalink
Merge pull request #268 from royfrancis/update-graphics
Browse files Browse the repository at this point in the history
Added new graphics, Updated image format to webp
  • Loading branch information
fasterius authored Oct 29, 2024
2 parents 290708a + 7fe1194 commit ea82066
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 27 deletions.
12 changes: 6 additions & 6 deletions _quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project:
- "!lectures/wrapups/"

website:
image: "assets/images/featured.jpg"
image: "assets/images/featured.webp"
favicon: "assets/favicon.png"
navbar:
logo: "assets/logos/nbis-scilifelab.png"
Expand Down Expand Up @@ -54,12 +54,12 @@ format:
df-print: paged
standalone: false
fig-align: left
title-block-banner: "assets/images/banner.jpg"
title-block-banner: "assets/images/banner.webp"
subtitle: ""
callout-icon: true
date: last-modified
date-format: "DD-MMM-YYYY"
image: "assets/images/featured.png"
image: "assets/images/featured.webp"
revealjs:
quarto-required: ">=1.4.0"
include-in-header: "assets/include_head.html"
Expand All @@ -82,10 +82,10 @@ format:
fig-align: left
chalkboard: true
callout-icon: true
image: "/assets/images/featured.jpg"
hero: "/assets/images/slide-hero.png"
image: "/assets/images/featured.webp"
hero: "/assets/images/slide-hero.webp"
title-slide-attributes:
data-background-image: "/assets/images/cover.jpg"
data-background-image: "/assets/images/cover.webp"
data-background-size: "cover"
data-background-opacity: "1"
subtitle: ""
Expand Down
12 changes: 7 additions & 5 deletions assets/_child-info.qmd
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
```{r}
#| echo: false
htmltools::tagList(leaflet(height = 450, width = "auto", elementId=paste0("leaflet-",p)) %>%
addTiles(urlTemplate = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png") %>%
addAwesomeMarkers(lat = dfr1$lat, lng = dfr1$lon, label = dfr1$label, popup = dfr1$address, icon = icons) %>%
setView(lat = dfr1$lat[1], lng = dfr1$lon[1], zoom = 13))
htmltools::div(
style = "margin-bottom:1em;",
htmltools::tagList(leaflet(height = 450, width = "auto", elementId=paste0("leaflet-",p)) %>%
addTiles(urlTemplate = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png") %>%
addAwesomeMarkers(lat = dfr1$lat, lng = dfr1$lon, label = dfr1$label, popup = dfr1$address, icon = icons) %>%
setView(lat = dfr1$lat[1], lng = dfr1$lon[1], zoom = 13))
)
```
2 changes: 1 addition & 1 deletion assets/css/home.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
background-image: url("../images/home.jpg");
background-image: url("../images/home.webp");
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
Expand Down
Binary file removed assets/images/banner.jpg
Binary file not shown.
Binary file added assets/images/banner.webp
Binary file not shown.
Binary file removed assets/images/cover.jpg
Binary file not shown.
Binary file added assets/images/cover.webp
Binary file not shown.
Binary file removed assets/images/featured.jpg
Binary file not shown.
Binary file added assets/images/featured.webp
Binary file not shown.
Binary file removed assets/images/hero.png
Binary file not shown.
Binary file added assets/images/hero.webp
Binary file not shown.
Binary file removed assets/images/home.jpg
Binary file not shown.
Binary file added assets/images/home.webp
Binary file not shown.
Binary file removed assets/images/slide-hero.png
Binary file not shown.
Binary file added assets/images/slide-hero.webp
Binary file not shown.
28 changes: 14 additions & 14 deletions home_contents.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ themselves contain all of the material covered by the workshop.

<br>

| Topic | Lecture | Tutorial |
| ----------------------- | ------------------------------------------------------------------------------ | ------------------------------------------------ |
| Introduction | [{{< fa file-lines >}}](lectures/introduction/introduction.html) | [{{< fa file-lines >}}](pages/introduction.html) |
| Data management | [{{< fa file-lines >}}](lectures/data-management/data-management.html) | |
| Git | [{{< fa file-lines >}}](lectures/git/git.html) | [{{< fa file-lines >}}](pages/git.html) |
| Conda | [{{< fa file-lines >}}](lectures/conda/conda.html) | [{{< fa file-lines >}}](pages/conda.html) |
| Snakemake | [{{< fa file-lines >}}](lectures/snakemake/snakemake.html) | [{{< fa file-lines >}}](pages/snakemake.html) |
| Nextflow | [{{< fa file-lines >}}](lectures/nextflow/nextflow.html) | [{{< fa file-lines >}}](pages/nextflow.html) |
| Quarto | [{{< fa file-lines >}}](lectures/quarto/quarto.html) | [{{< fa file-lines >}}](pages/quarto.html) |
| Jupyter | [{{< fa file-lines >}}](lectures/jupyter/jupyter.html) | [{{< fa file-lines >}}](pages/jupyter.html) |
| Containers | [{{< fa file-lines >}}](lectures/containers/containers.html) | [{{< fa file-lines >}}](pages/containers.html) |
| Putting it all together | [{{< fa file-lines >}}](lectures/putting-it-together/putting-it-together.html) | |
| Markdown | | [{{< fa file-lines >}}](pages/markdown.html) |
| Take-down | | [{{< fa file-lines >}}](pages/take-down.html) |
| Topic | Lecture | Tutorial |
| ----------------------- | :------------------------------------------------------------------------------: | :------------------------------------------------: |
| Introduction | [{{< fa file-lines >}}](lectures/introduction/introduction.html) | [{{< fa file-lines >}}](pages/introduction.html) |
| Data management | [{{< fa file-lines >}}](lectures/data-management/data-management.html) | |
| Git | [{{< fa file-lines >}}](lectures/git/git.html) | [{{< fa file-lines >}}](pages/git.html) |
| Conda | [{{< fa file-lines >}}](lectures/conda/conda.html) | [{{< fa file-lines >}}](pages/conda.html) |
| Snakemake | [{{< fa file-lines >}}](lectures/snakemake/snakemake.html) | [{{< fa file-lines >}}](pages/snakemake.html) |
| Nextflow | [{{< fa file-lines >}}](lectures/nextflow/nextflow.html) | [{{< fa file-lines >}}](pages/nextflow.html) |
| Quarto | [{{< fa file-lines >}}](lectures/quarto/quarto.html) | [{{< fa file-lines >}}](pages/quarto.html) |
| Jupyter | [{{< fa file-lines >}}](lectures/jupyter/jupyter.html) | [{{< fa file-lines >}}](pages/jupyter.html) |
| Containers | [{{< fa file-lines >}}](lectures/containers/containers.html) | [{{< fa file-lines >}}](pages/containers.html) |
| Putting it all together | [{{< fa file-lines >}}](lectures/putting-it-together/putting-it-together.html) | |
| Markdown | | [{{< fa file-lines >}}](pages/markdown.html) |
| Take-down | | [{{< fa file-lines >}}](pages/take-down.html) |
3 changes: 2 additions & 1 deletion index.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ format:
css: "assets/css/home.css"
number-sections: false
title-block-banner: false
anchor-sections: false
page-layout: full
execute:
freeze: false
Expand All @@ -32,7 +33,7 @@ Updated: {{< meta current_date >}} at {{< meta current_time >}} .
:::
:::{.home-grid-child-right}

![](assets/images/hero.png){.nolightbox}
![](assets/images/hero.webp){.nolightbox}

:::
:::
Expand Down

0 comments on commit ea82066

Please sign in to comment.