Skip to content

Commit a8ff753

Browse files
committed
Merge branch 'development'
2 parents 6fd8c86 + 54a4098 commit a8ff753

4 files changed

Lines changed: 21 additions & 7 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
#
1818

1919
name: Build and Deploy
20+
21+
env:
22+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
23+
2024
on:
2125
push:
2226
branches:
@@ -39,7 +43,7 @@ jobs:
3943
outputs:
4044
release-tag: ${{ steps.create_release.outputs.tag_name }}
4145
steps:
42-
- uses: actions/checkout@v4
46+
- uses: actions/checkout@v5
4347
with:
4448
fetch-depth: 0 # Fetch all history for proper versioning
4549

@@ -151,7 +155,7 @@ jobs:
151155
environment: production
152156
if: "github.ref == 'refs/heads/main' && !contains(github.event.head_commit.message, '[skip deploy]') && !contains(github.event.head_commit.message, '[no deploy]')"
153157
steps:
154-
- uses: actions/checkout@v4
158+
- uses: actions/checkout@v5
155159
- name: Get Runner IP
156160
id: ip
157161
uses: haythem/public-ip@v1.3
@@ -250,7 +254,7 @@ jobs:
250254
# Skip deployment if commit message contains [skip deploy] or [no deploy]
251255
if: "github.ref == 'refs/heads/development' && !contains(github.event.head_commit.message, '[skip deploy]') && !contains(github.event.head_commit.message, '[no deploy]')"
252256
steps:
253-
- uses: actions/checkout@v4
257+
- uses: actions/checkout@v5
254258
- name: Get Runner IP
255259
id: ip
256260
uses: haythem/public-ip@v1.3

resources/css/components/_cards.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
}
7676

7777
.expedition-card-title {
78-
color: #ffffff;
78+
color: #ffffff !important;
7979
}
8080

8181
.bingo-card-meta,

resources/css/pages/_home.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,16 @@ h1.project-wide {
208208
text-rendering: optimizeLegibility;
209209
}
210210

211+
.home-card-heading {
212+
margin-top: 0;
213+
margin-bottom: 0.5rem;
214+
font-family: Raleway, sans-serif;
215+
font-size: 1.5rem;
216+
font-weight: 700;
217+
line-height: 1.2;
218+
color: #333;
219+
}
220+
211221
.a11y-target-link {
212222
display: inline-flex;
213223
align-items: center;

resources/views/front/home.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class="carousel-step-button"
139139

140140
@if($expedition)
141141
<div class="card mb-5 px-4 box-shadow">
142-
<h2 class="text-center pt-4">{{ $expedition->project->title }}</h2>
142+
<h3 class="text-center pt-4 home-card-heading">{{ $expedition->project->title }}</h3>
143143
<hr>
144144
<div class="row card-body pb-2">
145145
<div class="col-12">
@@ -177,7 +177,7 @@ class="carousel-step-button"
177177
<h2>{{ t('The Progress') }}</h2>
178178

179179
<div class="card mb-4 px-4 box-shadow">
180-
<h2 class="text-center pt-4">{{ t('BIOSPEX Stats') }}</h2>
180+
<h3 class="text-center pt-4 home-card-heading">{{ t('BIOSPEX Stats') }}</h3>
181181
<hr>
182182
<div class="row card-body pb-5">
183183
<div class="col-12">
@@ -199,7 +199,7 @@ class="carousel-step-button"
199199
src="{{ $expedition->present()->show_medium_logo }}"
200200
alt="{{ $expedition->present()->logo_alt }}">
201201
<div class="card-img-overlay">
202-
<h2 class="card-title text-center pt-4">{{ $expedition->title }}</h2>
202+
<h3 class="card-title text-center pt-4 expedition-card-title">{{ $expedition->title }}</h3>
203203
<i class="card-info fas fa-info-circle fa-2x float-right"
204204
style="top: 20rem; left: 31.25rem;"></i>
205205
<p>{{ $expedition->description }}</p>

0 commit comments

Comments
 (0)