Skip to content

Commit b1eee02

Browse files
authored
Merge pull request #172 from PrestaShop/develop
Release 2025-07-07
2 parents df9a8c8 + 29bc035 commit b1eee02

File tree

7 files changed

+80
-31
lines changed

7 files changed

+80
-31
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest]
16-
node: [14]
16+
node: [20]
1717

1818
steps:
1919
- name: Checkout 🛎

.github/workflows/gh-pages.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup node env 🏗
2929
uses: actions/setup-node@v2.1.2
3030
with:
31-
node-version: 14
31+
node-version: 20
3232

3333
- name: Get Composer Cache Directory
3434
id: composer-cache
@@ -92,6 +92,10 @@ jobs:
9292
if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
9393
run: mv ./traces/topcompanies.json ./dist
9494

95+
- name: Move file (NewContributors) 📁
96+
if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }}
97+
run: mv ./traces/newcontributors.json ./dist
98+
9599
- name: Write CNAME file
96100
run: echo 'contributors.prestashop-project.org' > ./dist/CNAME
97101

assets/style/_footer.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ footer {
4545
font-weight: bold;
4646
color: #000000;
4747
margin: 8px 12px 8px 0;
48+
text-decoration: none;
4849

4950
&:after {
5051
padding-left: .3em;

components/Header.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
<div class="gradient">
44
<div id="header-section" class="container">
55
<div class="justify-content-md-center">
6-
<div class="row col-12 mt-2">
6+
<div class="col-12 mt-2">
77
<img
88
width="200px"
9-
class="img-fluid"
109
src="../static/img/prestashop-logo.png"
1110
alt="PrestaShop Project - Open Source e-Commerce platform"
1211
/>
@@ -22,7 +21,7 @@
2221
community, thanks to your involvement in open source.
2322
</p>
2423
</div>
25-
<div class="row align-items-start">
24+
<div class="align-items-start">
2625
<a
2726
href="https://github.com/PrestaShop/PrestaShop"
2827
class="btn large-padding"

components/TopContributors.vue

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@
55
<h2 class="text-center">Top contributors:</h2>
66
<div class="text-center date">Last update: {{ today }}</div>
77
</div>
8-
<div class="col-5 left-column">
9-
<top-avatar
10-
v-for="contributor in leftContributors"
11-
:key="contributor.login"
12-
:contributor="contributor"
13-
></top-avatar>
14-
</div>
15-
<div class="contributors-center">
16-
<arrow :counts="counts"></arrow>
17-
</div>
18-
<div class="col-md-5 right-column">
19-
<top-avatar
20-
v-for="contributor in rightContributors"
21-
:key="contributor.login"
22-
:contributor="contributor"
23-
></top-avatar>
8+
<div class="row">
9+
<div class="col-5 left-column">
10+
<top-avatar
11+
v-for="contributor in leftContributors"
12+
:key="contributor.login"
13+
:contributor="contributor"
14+
></top-avatar>
15+
</div>
16+
<div class="col contributors-center">
17+
<arrow :counts="counts"></arrow>
18+
</div>
19+
<div class="col-md-5 right-column">
20+
<top-avatar
21+
v-for="contributor in rightContributors"
22+
:key="contributor.login"
23+
:contributor="contributor"
24+
></top-avatar>
25+
</div>
2426
</div>
2527
</div>
2628
<all-contributors

package-lock.json

Lines changed: 52 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"dependencies": {
1616
"@nuxt/typescript-runtime": "^2.0.0",
17-
"bootstrap": "^4.5.2",
17+
"bootstrap": "^5.0.0",
1818
"bootstrap-vue": "^2.17.3",
1919
"core-js": "^3.6.5",
2020
"nuxt": "^2.17.1"

0 commit comments

Comments
 (0)