From f2280d048b706f5abd2acb3f1123dc6845f26b05 Mon Sep 17 00:00:00 2001
From: jenhadfield-dfe <119432491+jenhadfield-dfe@users.noreply.github.com>
Date: Wed, 10 Apr 2024 16:14:39 +0000
Subject: [PATCH 01/29] Initial go at trying header designers. Still wip.
Commiting so don't lose changes.
---
.../content/landing_hero_component.html.erb | 36 ++++++++
.../content/landing_hero_component.rb | 51 ++++++++++++
.../campus-mailing-list/_header.html.erb | 4 +-
.../content/landing/grow/_header.html.erb | 4 +-
app/webpacker/styles/sections/hero.scss | 83 +++++++++++++++++++
.../content/landing_hero_component_spec.rb | 44 ++++++++++
6 files changed, 218 insertions(+), 4 deletions(-)
create mode 100644 app/components/content/landing_hero_component.html.erb
create mode 100644 app/components/content/landing_hero_component.rb
create mode 100644 spec/components/content/landing_hero_component_spec.rb
diff --git a/app/components/content/landing_hero_component.html.erb b/app/components/content/landing_hero_component.html.erb
new file mode 100644
index 0000000000..acec302d21
--- /dev/null
+++ b/app/components/content/landing_hero_component.html.erb
@@ -0,0 +1,36 @@
+<%= tag.div(class: classes) do %>
+
+
+
<%= title %>
+
- <% if show_subtitle? %>
-
- <%= tag.div(subtitle, class: "landing_hero__subtitle__text") %>
+ <% if show_subtitle? %>
+
+ <%= tag.div(subtitle, class: "landing_hero__subtitle__text") %>
- <% if show_subtitle_button? %>
- <%= link_to(@subtitle_button, @subtitle_link, class: "landing_hero__subtitle__button button") %>
- <% end %>
-
+ <% if show_subtitle_button? %>
+ <%= link_to(@subtitle_button, @subtitle_link, class: "landing_hero__subtitle__button button") %>
<% end %>
+
+ <% end %>
+
+ <% if content.present? %>
+
+ <%= content %>
+
+ <% end %>
+
+ <% if paragraph.present? %>
+
+ <%= paragraph&.html_safe %>
+
+ <% end %>
+
+
- <% if content.present? %>
-
- <%= picture %>
+ <%= picture %>
-
-
-
-
<%= title %>
-
-
- <% if show_subtitle? %>
-
- <%= tag.div(subtitle, class: "landing_hero__subtitle__text") %>
-
- <% if show_subtitle_button? %>
- <%= link_to(@subtitle_button, @subtitle_link, class: "landing_hero__subtitle__button button") %>
- <% end %>
-
- <% end %>
-
- <% if content.present? %>
-
- <%= content %>
-
- <% end %>
+
- <% if paragraph.present? %>
-
- <%= paragraph&.html_safe %>
-
- <% end %>
-
-
+
+
<%= title %>
+
+
+ <% if show_subtitle? %>
+
+ <%= tag.div(subtitle, class: "landing_hero__subtitle__text") %>
+
+ <% if show_subtitle_button? %>
+ <%= link_to(@subtitle_button, @subtitle_link, class: "landing_hero__subtitle__button button") %>
+ <% end %>
+
+ <% end %>
+
+ <% if content.present? %>
+
+ <%= content %>
+
+ <% end %>
+
+ <% if paragraph.present? %>
+
+ <%= paragraph&.html_safe %>
+
+ <% end %>
+
+
diff --git a/app/webpacker/styles/sections/hero.scss b/app/webpacker/styles/sections/hero.scss
index ff4f73bf63..f7507ae301 100644
--- a/app/webpacker/styles/sections/hero.scss
+++ b/app/webpacker/styles/sections/hero.scss
@@ -333,9 +333,8 @@ $mobile-cutoff: 800px;
}
}
- picture {
- position: relative;
-
+ picture {
+
img {
-o-object-fit: cover;
object-fit: cover;
From ffcc264a4d99ed2dee9cb09a4239eb083922d644 Mon Sep 17 00:00:00 2001
From: jenhadfield-dfe <119432491+jenhadfield-dfe@users.noreply.github.com>
Date: Thu, 11 Apr 2024 13:15:41 +0000
Subject: [PATCH 05/29] Hopeful linting fix
---
app/webpacker/styles/sections/hero.scss | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/app/webpacker/styles/sections/hero.scss b/app/webpacker/styles/sections/hero.scss
index f7507ae301..f8117d68ef 100644
--- a/app/webpacker/styles/sections/hero.scss
+++ b/app/webpacker/styles/sections/hero.scss
@@ -333,17 +333,14 @@ $mobile-cutoff: 800px;
}
}
- picture {
-
- img {
- -o-object-fit: cover;
- object-fit: cover;
- -o-object-position: 100% 30%;
- object-position: 100% 30%;
- width: 100%;
- height: 100%;
- vertical-align: bottom;
- }
+ picture img {
+ -o-object-fit: cover;
+ object-fit: cover;
+ -o-object-position: 100% 30%;
+ object-position: 100% 30%;
+ width: 100%;
+ height: 100%;
+ vertical-align: bottom;
}
& > * {
From 9c7486df0a4287db46c2741b6702f4ab5d053cea Mon Sep 17 00:00:00 2001
From: jenhadfield-dfe <119432491+jenhadfield-dfe@users.noreply.github.com>
Date: Thu, 11 Apr 2024 13:39:17 +0000
Subject: [PATCH 06/29] More linting fixes
---
.../content/landing_hero_component.html.erb | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/app/components/content/landing_hero_component.html.erb b/app/components/content/landing_hero_component.html.erb
index 2b12d2ed10..35b492bedb 100644
--- a/app/components/content/landing_hero_component.html.erb
+++ b/app/components/content/landing_hero_component.html.erb
@@ -1,21 +1,17 @@
<%= tag.div(class: classes) do %>
-
<%= picture %>
-
-
<%= title %>
-
<% if show_subtitle? %>
<%= tag.div(subtitle, class: "landing_hero__subtitle__text") %>
- <% if show_subtitle_button? %>
- <%= link_to(@subtitle_button, @subtitle_link, class: "landing_hero__subtitle__button button") %>
- <% end %>
+ <% if show_subtitle_button? %>
+ <%= link_to(@subtitle_button, @subtitle_link, class: "landing_hero__subtitle__button button") %>
+ <% end %>
<% end %>
@@ -30,9 +26,6 @@
<%= paragraph&.html_safe %>
<% end %>
-
-
-
<% end %>
From 81bb6699862008525187b9cfd2a6a828ca16de62 Mon Sep 17 00:00:00 2001
From: jenhadfield-dfe <119432491+jenhadfield-dfe@users.noreply.github.com>
Date: Thu, 11 Apr 2024 14:12:23 +0000
Subject: [PATCH 07/29] updating image to larger hero sized image
---
.../content/landing/campus-mailing-list.md | 2 +-
.../content/hero-images/chemistry--mobile.jpg | Bin 0 -> 83361 bytes
.../content/hero-images/chemistry--tablet.jpg | Bin 0 -> 88356 bytes
.../images/content/hero-images/chemistry.jpg | Bin 0 -> 193904 bytes
config/images.yml | 7 +++++++
5 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 app/webpacker/images/content/hero-images/chemistry--mobile.jpg
create mode 100644 app/webpacker/images/content/hero-images/chemistry--tablet.jpg
create mode 100644 app/webpacker/images/content/hero-images/chemistry.jpg
diff --git a/app/views/content/landing/campus-mailing-list.md b/app/views/content/landing/campus-mailing-list.md
index 5847d14f32..ace348b690 100644
--- a/app/views/content/landing/campus-mailing-list.md
+++ b/app/views/content/landing/campus-mailing-list.md
@@ -4,7 +4,7 @@ description: Free advice and support on how to become a teacher. Get the latest
content:
- content/landing/campus-mailing-list/header
- content/landing/campus-mailing-list/mailing-list
-image: "static/images/content/landing/how-to-fund-your-teacher-training-1.jpg"
+image: "static/images/content/hero-images/chemistry.jpg"
colour: "pink"
layout: "layouts/minimal"
talk_to_us: false
diff --git a/app/webpacker/images/content/hero-images/chemistry--mobile.jpg b/app/webpacker/images/content/hero-images/chemistry--mobile.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8f5925e6ee8c050a070efa8327bcad547fd25a2c
GIT binary patch
literal 83361
zcmb5UbyOuk@Gp3A_lpefaB&;l-R0sk4DRj>?(XjH0|N{`gS!px?(Xi(_x<*q_x{-3
zbGFh+e>zo3CFyi`D%Bs0ADaMlSxFg500aaCK>9NPKDHqiWyHk3D}$9JW#lD382|vp
z5a5%bSpWcAI~OOglqji|whk%WCII3y{4X*zc6Rt5^#7QCO5M-@kL(QN|D(kJcP4^~
zsk8B?$mM6Gbox~O*(Ts82Acm5ru`2a{SW5<54*cKxO~be|A(E_z+#`+