studio-variable/hecq-et-lesort
5
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

resolve conflicts
All checks were successful
Deploy / Deploy to Production (push) Successful in 5s
Details

Browse source
This commit is contained in:
isUnknown 2026-06-23 19:05:30 +02:00
parent 42da4e56dd
commit b8611f8de0
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/css/src/pages/_events.scss
View file

@ -34,8 +34,12 @@
main {
.events-grid {
box-sizing: border-box;
<<<<<<< HEAD
padding: 2rem;
padding-top: 4rem;
=======
padding: 4rem 2rem;
>>>>>>> f19532c (events : adjust grid paddings)
width: 100%;
display: grid;
grid-template-columns: repeat(3, 1fr);

4
assets/css/style.css
View file

@ -461,8 +461,12 @@ main {
}
[data-template=events] main .events-grid {
box-sizing: border-box;
<<<<<<< HEAD
padding: 2rem;
padding-top: 4rem;
=======
padding: 4rem 2rem;
>>>>>>> f19532c (events : adjust grid paddings)
width: 100%;
display: grid;
grid-template-columns: repeat(3, 1fr);