Skip to content

Commit

Permalink
Merge branch 'main' into test
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanbutura committed May 1, 2024
2 parents dc4a232 + 69d43ac commit 7107e77
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ jobs:
run: >
curl -X POST -F
"content=:octagonal_sign: ${{ github.repository }} failed to deploy release **${{ github.ref_name }}** on <https://devel.eu-parc.eu>.
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>"
${{ secrets.DISCORD_WEBHOOK }}
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,5 @@ jobs:
run: >
curl -X POST -F
"content=:octagonal_sign: **${{ github.repository }}** failed to deploy release **${{ github.ref_name }}** on PROD: <https://eu-parc.eu>.
${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>"
${{ secrets.DISCORD_WEBHOOK }}
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@
},
"drupal/core": {
"#3322402 - Add 'Is empty (NULL)' and 'Is not empty (NOT NULL)' operators to boolean field filtering": "https://www.drupal.org/files/issues/2022-11-21/3322402-9.patch"
},
"drupal/conditional_fields": {
"#3344587 - Support for field hidden by condition loosing its required status": "https://www.drupal.org/files/issues/2024-03-27/3344587-required-fields-that-59-with-fix.patch"
}
},
"drupal-lenient" : {
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
*/
#}

{% set interval = 4000 %}
{% set interval = 3000 %}
{% if hero_carousel %}
{% set interval = 900000 %}
{% endif %}

<div id="{{ carousel_id }}" data-bs-ride="{% if hero_carousel %}true{% else %}true{% endif %}" class="carousel slide" data-interval="{{ interval }}">
<div id="{{ carousel_id }}" data-bs-ride="{% if hero_carousel %}true{% else %}carousel{% endif %}" class="carousel slide" data-bs-interval="{{ interval }}">

<div class="carousel-indicators">
{% for item in items %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1528,12 +1528,16 @@
&:not(.hero-carousel) {
--min-height: 578px;

.text-uppercase {
font-size: 16px;
@media (--md) {
--min-height: 650px;
}

@media (--md) {
--min-height: 731px;
.text-uppercase {
font-size: 14px;

@media (--md) {
font-size: 16px;
}
}

.carousel-inner {
Expand Down Expand Up @@ -1579,7 +1583,7 @@
.svg-title {
padding: 0;
margin: 0;
font-size: 40px;
font-size: 36px;
line-height: 44px;

@media (--sm) {
Expand All @@ -1600,6 +1604,10 @@

a {
color: #FFF;

&:hover {
color: #e6e6e6;
}
}
}

Expand Down

0 comments on commit 7107e77

Please sign in to comment.