Skip to content

Commit

Permalink
Merge tag '1.6.0' into develop
Browse files Browse the repository at this point in the history
1.6.0
  • Loading branch information
AlexSkrypnyk committed Nov 10, 2023
2 parents 184982b + 6365037 commit d5c1ee0
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 1 deletion.
15 changes: 15 additions & 0 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,21 @@ commands:
echo "Copy .ahoy.local.example.yml to .ahoy.local.yml and rerun this command.";
fi
export-config:
usage: Export theme config.
cmd: |
ahoy cli "./scripts/update-theme-config.sh"
ahoy drush cde civictheme_dev || true
if ahoy drush pm:list --status=Enabled --field=name | grep -q 'cs_generated_content'; then
ahoy drush cde cs_generated_content || true
fi
export-content:
usage: Export content (run with CIVICTHEME_CONTENT_PROFILE=corporate ahoy install-site) .
cmd: |
ahoy confirm "This will uninstall several modules and users. Proceed?" \
&& ahoy cli "CIVICTHEME_CONTENT_PROFILE=${CIVICTHEME_CONTENT_PROFILE:-default} ./scripts/update-default-content.sh" || echo "The operation was canceled."
# ----------------------------------------------------------------------------
# Utilities.
# ----------------------------------------------------------------------------
Expand Down
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ DRUPAL_PROFILE=minimal
# Drupal theme name.
DRUPAL_THEME=civictheme

# Drupal site name.
DRUPAL_SITE_NAME="CivicTheme Source"

# Drupal site email.
DRUPAL_SITE_EMAIL="[email protected]"

# Shield print message.
DRUPAL_SHIELD_PRINT="Restricted access."

Expand Down
1 change: 1 addition & 0 deletions .lagoon.env.release-1-6-0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CIVICTHEME_CONTENT_PROFILE=default
1 change: 0 additions & 1 deletion scripts/custom/provision-10-enable-theme-modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ if [ "${DRUPAL_PROFILE}" = "govcms" ]; then
drush config-set system.theme default stable9

# Remove other themes.
drush theme-uninstall claro || true
drush theme-uninstall govcms_bartik || true
drush theme-uninstall bartik || true
elif [ "${DRUPAL_PROFILE}" = "minimal" ]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ echo "[INFO] Adjusting site settings."

drush config:set user.settings register admin_only

drush config:set pathauto.settings max_length 255
drush config:set pathauto.settings max_component_length 255

echo "[ OK ] Finished adjusting site settings."
3 changes: 3 additions & 0 deletions web/themes/contrib/civictheme/src/CivicthemeColorManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,9 @@ public function invalidateCache(): static {

$this->cacheTagsInvalidator->invalidateTags(['library_info']);

// Force browser reload by changing the dummy query string.
_drupal_flush_css_js();

return $this;
}

Expand Down

0 comments on commit d5c1ee0

Please sign in to comment.