Merge branch 'source-upstream' into source

# Conflicts: # Gemfile.lock
JLESC · Jul 4, 2024 · 5a4635f · 5a4635f
2 parents fa7ec30 + ad971c6
commit 5a4635f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/_sass/framework/zerostatic/blocks/sections/_hero.scss b/_sass/framework/zerostatic/blocks/sections/_hero.scss
@@ -10,7 +10,7 @@
   // min-height: 300px;
 
   // Is hardcoded, because the hero image won't be changed
-  aspect-ratio: 37 / 7;
+  aspect-ratio: 3616 / 681;
   &.hero-gradient {
     background-image: linear-gradient(to right, var(--color-primary), var(--color-secondary));
   }

diff --git a/assets/images/jlesc_logo_hires.jpg b/assets/images/jlesc_logo_hires.jpg
diff --git a/bin/report_generator.rb b/bin/report_generator.rb
@@ -518,8 +518,8 @@ def run
       end
 
       # copy the JLESC logo to the LaTeX directory
-      FileUtils.cp(File.join(@site.source, 'assets', 'images', 'jlesc-header_180910.jpg'),
-                   File.join(@latex_path, 'jlesc_logo.png'))
+      FileUtils.cp(File.join(@site.source, 'assets', 'images', 'jlesc_logo_hires.jpg'),
+                   File.join(@latex_path, 'jlesc_logo_hires.jpg'))
 
     end
   end

diff --git a/pages/home.md b/pages/home.md
@@ -12,7 +12,7 @@ hero:
 
   # The aspect ratio of the picture is hardcoded in the corresponding scss file.
   # You should also change the aspect ratio if you change the background image!
-  background_image: "/assets/images/jlesc_logo.jpg"
+  background_image: "/assets/images/jlesc_logo_hires.jpg"
   fullscreen_mobile: false
   fullscreen_desktop: false
   height: "auto"