Skip to content

Commit

Permalink
Merge branch 'release/3.10'
Browse files Browse the repository at this point in the history
  • Loading branch information
janhenckens committed May 17, 2024
2 parents 4f649dc + 0907e0f commit ee3d412
Show file tree
Hide file tree
Showing 16 changed files with 1,119 additions and 172 deletions.
4 changes: 3 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,6 @@ FRONTEND_DEV=false

ALGOLIA_APP_ID=""
ALGOLIA_API_KEY=""
ALGOLIA_SEARCH_KEY=""
ALGOLIA_SEARCH_KEY=""

SITE_PASSWORD=""
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
"verbb/expanded-singles": "2.0.5",
"verbb/formie": "2.1.7",
"verbb/hyper": "1.1.25",
"verbb/knock-knock": "^2.0.11",
"verbb/image-resizer": "^3",
"verbb/super-table": "3.0.12",
"verbb/tablemaker": "4.0.9",
Expand Down
360 changes: 209 additions & 151 deletions composer.lock

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions config/knock-knock.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

return [
'*' => [
'enabled' => false,
'enableCpProtection' => false,
'loginPath' => 'restricted-access',
// 'template' => '_knock-knock.twig',
'siteSettings' => [],
'checkInvalidLogins' => false,
'invalidLoginWindowDuration' => '3600',
'maxInvalidLogins' => 10,
'allowIps' => ['81.82.199.174', '127.0.0.1'],
'denyIps' => [],
'useRemoteIp' => true,
'protectedUrls' => [],
'unprotectedUrls' => ['/frontend/img/site/logo.png'],
],
'production' => [
'enabled' => true,
'password' => getenv('SITE_PASSWORD'),
],
'staging' => [
'enabled' => true,
'password' => getenv('SITE_PASSWORD'),

],
'dev' => [
'enabled' => false,
'password' => getenv('SITE_PASSWORD'),
]
];
6 changes: 5 additions & 1 deletion config/project/project.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dateModified: 1713447123
dateModified: 1715784060
elementSources:
craft\elements\Entry:
- defaultSort:
Expand Down Expand Up @@ -564,6 +564,10 @@ plugins:
enabled: true
licenseKey: AHGXAP0SS5F2TGP0ZHPRQIOC
schemaVersion: 1.0.0
knock-knock:
edition: standard
enabled: true
schemaVersion: 1.1.1
image-resizer:
edition: standard
enabled: true
Expand Down
4 changes: 4 additions & 0 deletions tailoff/css/site/base/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@
}
}

.preload-transitions * {
transition: none !important;
}

/* .lazyload,
.lazyloading {
opacity: 0;
Expand Down
Loading

0 comments on commit ee3d412

Please sign in to comment.