Skip to content

Commit

Permalink
Merge pull request #200 from City-of-Helsinki/renovate/stylelint-conf…
Browse files Browse the repository at this point in the history
…ig-standard-scss-7.x

Update dependency stylelint-config-standard-scss to v7
  • Loading branch information
khalima authored Feb 13, 2023
2 parents 9e062a8 + 5c36484 commit 3720ea9
Show file tree
Hide file tree
Showing 8 changed files with 1,489 additions and 618 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ['8.0', '8.1']
php-versions: ['8.1']
container:
image: ghcr.io/city-of-helsinki/drupal-php-docker:${{ matrix.php-versions }}-alpine

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
cleanup:
runs-on: ubuntu-latest
steps:
- uses: dev-drprasad/delete-older-releases@v0.2.0
- uses: dev-drprasad/delete-older-releases@v0.2.1
with:
keep_latest: 20
env:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12.1
18.14.0
2 changes: 1 addition & 1 deletion dist/css/styles.min.css

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions modules/hdbt_admin_editorial/hdbt_admin_editorial.api.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* Hooks provided by the HDBT Admin editorial module.
*/

use Drupal\Core\Form\FormStateInterface;

/**
* Modify the image list items for the field preview images.
*
Expand All @@ -20,3 +22,14 @@
*/
function hook_hdbt_admin_editorial_design_selection_images_alter(array &$images, string $field_name) {
}

/**
* Alter the CKEditor link dialog form validation.
*
* @param array $form
* The form.
* @param Drupal\Core\Form\FormStateInterface $form_state
* The form state.
*/
function hook_helfi_form_editor_link_dialog_alter(array &$form, FormStateInterface &$form_state) {
}
6 changes: 6 additions & 0 deletions modules/hdbt_admin_editorial/hdbt_admin_editorial.module
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,12 @@ function hdbt_admin_editorial_form_linkit_editor_dialog_form_alter(&$form, FormS
function _hdbt_admin_editorial_attributes_validate(array &$form, FormStateInterface $form_state) {
$attributes = $form_state->getValue('attributes');

/** @var \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler */
$moduleHandler = Drupal::service('module_handler');

// Let other modules alter the CKEditor link dialog form validation.
$moduleHandler->alter('helfi_form_editor_link_dialog', $form, $form_state);

// Allow icons only for the links with button design.
if (isset($attributes['data-selected-icon'])) {
if ($attributes['data-design'] === 'link' || empty($attributes['data-selected-icon'])) {
Expand Down
Loading

0 comments on commit 3720ea9

Please sign in to comment.