From def641b2ae82869271fa1cb03e9ac73c142a9958 Mon Sep 17 00:00:00 2001 From: Stephen Mulvihill Date: Fri, 3 Mar 2023 13:24:21 -0800 Subject: [PATCH 01/15] Update info file to allow install on D10 --- wxt_bootstrap.info.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wxt_bootstrap.info.yml b/wxt_bootstrap.info.yml index 8c3aea3..4ea6126 100644 --- a/wxt_bootstrap.info.yml +++ b/wxt_bootstrap.info.yml @@ -1,7 +1,7 @@ name: WxT Bootstrap description: WxT theme(s) support leveraging Bootstrap. type: theme -core_version_requirement: ^8 || ^9 +core_version_requirement: ^8 || ^9 || ^10 package: 'WxT' base theme: bootstrap ckeditor_stylesheets: From 4a391987fef1313d9d4f7b7535c0dcf51502d7d4 Mon Sep 17 00:00:00 2001 From: Stephen Mulvihill Date: Fri, 10 Mar 2023 11:13:14 -0800 Subject: [PATCH 02/15] Update composer.json to allow drupal/core 10.* --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f4765b5..235957f 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ "require": { "cweagans/composer-patches": "^1.6.0", "oomphinc/composer-installers-extender": "^1.1 || ^2", - "drupal/core": "8.* || 9.*", + "drupal/core": "8.* || 9.* || 10.*", "drupal/bootstrap": "3.25" }, "minimum-stability": "dev", From 392264e0e899c8eb3b57fce0fc7a119cc99245b3 Mon Sep 17 00:00:00 2001 From: sylus Date: Sat, 11 Mar 2023 10:01:16 -0500 Subject: [PATCH 03/15] feat(bootstrap): Update Bootstrap to v3.27 ; Conflicts: ; composer.json --- composer.json | 4 ++-- wxt_bootstrap.info.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 235957f..976d10a 100644 --- a/composer.json +++ b/composer.json @@ -12,8 +12,8 @@ "require": { "cweagans/composer-patches": "^1.6.0", "oomphinc/composer-installers-extender": "^1.1 || ^2", - "drupal/core": "8.* || 9.* || 10.*", - "drupal/bootstrap": "3.25" + "drupal/core": "9.* || 10.*", + "drupal/bootstrap": "3.27" }, "minimum-stability": "dev", "prefer-stable": true, diff --git a/wxt_bootstrap.info.yml b/wxt_bootstrap.info.yml index 4ea6126..72cd397 100644 --- a/wxt_bootstrap.info.yml +++ b/wxt_bootstrap.info.yml @@ -1,7 +1,7 @@ name: WxT Bootstrap description: WxT theme(s) support leveraging Bootstrap. type: theme -core_version_requirement: ^8 || ^9 || ^10 +core_version_requirement: '^9 || ^10' package: 'WxT' base theme: bootstrap ckeditor_stylesheets: From 912dbd9f4c6eb8b97c20126effe99421bdb5fd4e Mon Sep 17 00:00:00 2001 From: Stephen Mulvihill Date: Mon, 13 Mar 2023 13:21:16 -0700 Subject: [PATCH 04/15] Fix reference to deprecated node_type plugin in optional config --- config/optional/block.block.sidebar.yml | 2 +- config/optional/block.block.sidebar_fr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/optional/block.block.sidebar.yml b/config/optional/block.block.sidebar.yml index 2fa65a7..a5d681e 100644 --- a/config/optional/block.block.sidebar.yml +++ b/config/optional/block.block.sidebar.yml @@ -33,7 +33,7 @@ settings: render_parent: false visibility: node_type: - id: node_type + id: 'entity_bundle:node' bundles: page: page negate: false diff --git a/config/optional/block.block.sidebar_fr.yml b/config/optional/block.block.sidebar_fr.yml index 166dc76..aa53165 100644 --- a/config/optional/block.block.sidebar_fr.yml +++ b/config/optional/block.block.sidebar_fr.yml @@ -29,7 +29,7 @@ settings: suggestion: sidebar_fr visibility: node_type: - id: node_type + id: 'entity_bundle:node' bundles: page: page negate: false From 39d4d754fe292487a278665a8cce37463fd31867 Mon Sep 17 00:00:00 2001 From: Stephen Mulvihill Date: Tue, 14 Mar 2023 07:42:05 -0700 Subject: [PATCH 05/15] Fix twig errors with input template and it's extensions --- .../input/input--button--submit.html.twig | 23 ++++++++++--------- templates/input/input--form-control.html.twig | 8 +++---- templates/input/input.html.twig | 4 ++-- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/templates/input/input--button--submit.html.twig b/templates/input/input--button--submit.html.twig index b339f48..05deec9 100644 --- a/templates/input/input--button--submit.html.twig +++ b/templates/input/input--button--submit.html.twig @@ -22,15 +22,16 @@ * @see template_preprocess_input() */ #} -{% spaceless %} - {% - set classes = [ - 'btn', - type == 'submit' ? 'js-form-submit', - icon and icon_position and not icon_only ? 'icon-' ~ icon_position, - ] - %} - {% block input %} +{% block input %} + {% apply spaceless %} + {% + set classes = [ + 'btn', + type == 'submit' ? 'js-form-submit', + icon and icon_position and not icon_only ? 'icon-' ~ icon_position, + ] + %} + {% if search_submit == 'true' %} {% if wxt_theme == 'gcweb' %} {{ icon }}{{ 'Search'|t }}{{ children }} @@ -52,5 +53,5 @@ {% endif %} {% endif %} {{ children }} - {% endblock %} -{% endspaceless %} + {% endapply %} +{% endblock %} diff --git a/templates/input/input--form-control.html.twig b/templates/input/input--form-control.html.twig index 5694480..216de83 100644 --- a/templates/input/input--form-control.html.twig +++ b/templates/input/input--form-control.html.twig @@ -20,13 +20,13 @@ * @see template_preprocess_input() */ #} -{% spaceless %} +{% block input %} {% set classes = [ 'form-control', ] %} - {% block input %} + {% apply spaceless %} - {% endblock %} -{% endspaceless %} + {% endapply %} +{% endblock %} diff --git a/templates/input/input.html.twig b/templates/input/input.html.twig index 662a6ab..7ecf9ed 100644 --- a/templates/input/input.html.twig +++ b/templates/input/input.html.twig @@ -19,7 +19,7 @@ * @see template_preprocess_input() */ #} -{% spaceless %} +{% apply spaceless %} {% if input_group %}
{% endif %} @@ -41,4 +41,4 @@ {% endif %} {{ children }} -{% endspaceless %} +{% endapply %} From db6d2ccf25ce2c241aaa4b70005bf44d1c76af38 Mon Sep 17 00:00:00 2001 From: Stephen Mulvihill Date: Tue, 23 May 2023 13:32:50 -0700 Subject: [PATCH 06/15] Replace ckeditor-stylesheets with ckeditor5 version --- css/ckeditor.css | 17 ----------------- css/ckeditor5.css | 5 +++++ sass/ckeditor.scss | 19 ------------------- sass/ckeditor5.scss | 3 +++ wxt_bootstrap.info.yml | 4 ++-- 5 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 css/ckeditor.css create mode 100644 css/ckeditor5.css delete mode 100644 sass/ckeditor.scss create mode 100644 sass/ckeditor5.scss diff --git a/css/ckeditor.css b/css/ckeditor.css deleted file mode 100644 index 4fe412e..0000000 --- a/css/ckeditor.css +++ /dev/null @@ -1,17 +0,0 @@ -@charset "UTF-8"; -/** - * CKEditor styles. - */ -table { - width: 100%; } - -table th { - padding: 8px; - line-height: 1.4375; - font-weight: 700; - border-color: #8d8d8d !important; } - -table td { - padding: 8px; - line-height: 1.4375; - border-color: #8d8d8d !important; } diff --git a/css/ckeditor5.css b/css/ckeditor5.css new file mode 100644 index 0000000..ba0b647 --- /dev/null +++ b/css/ckeditor5.css @@ -0,0 +1,5 @@ +/** + * CKEditor5 styles. + */ + +/*# sourceMappingURL=ckeditor5.css.map */ diff --git a/sass/ckeditor.scss b/sass/ckeditor.scss deleted file mode 100644 index 6281639..0000000 --- a/sass/ckeditor.scss +++ /dev/null @@ -1,19 +0,0 @@ -/** - * CKEditor styles. - */ -table { - width: 100%; - - th { - padding: 8px; - line-height: 1.4375; - font-weight: 700; - border-color: #8d8d8d !important; - } - - td { - padding: 8px; - line-height: 1.4375; - border-color: #8d8d8d !important; - } -} diff --git a/sass/ckeditor5.scss b/sass/ckeditor5.scss new file mode 100644 index 0000000..031bffb --- /dev/null +++ b/sass/ckeditor5.scss @@ -0,0 +1,3 @@ +/** + * CKEditor5 styles. + */ diff --git a/wxt_bootstrap.info.yml b/wxt_bootstrap.info.yml index 72cd397..6d994c3 100644 --- a/wxt_bootstrap.info.yml +++ b/wxt_bootstrap.info.yml @@ -4,8 +4,8 @@ type: theme core_version_requirement: '^9 || ^10' package: 'WxT' base theme: bootstrap -ckeditor_stylesheets: - - css/ckeditor.css +ckeditor5-stylesheets: + - css/ckeditor5.css regions: branding: 'Branding' From 38b8260f22209fa2f3cd4a14067c0fb475a00e91 Mon Sep 17 00:00:00 2001 From: "joseph.olstad" <20895-joseph.olstad@users.noreply.drupalcode.org> Date: Thu, 25 May 2023 08:08:34 -0700 Subject: [PATCH 07/15] Issue #3362712 by joseph.olstad: [D10] Twig deprecation fix for wxt_bootstrap spaceless --- templates/file/file-link.html.twig | 4 ++-- templates/input/input--button--split.html.twig | 4 ++-- templates/input/input--button.html.twig | 4 ++-- templates/input/select.html.twig | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/file/file-link.html.twig b/templates/file/file-link.html.twig index 54ae38b..e5c87aa 100644 --- a/templates/file/file-link.html.twig +++ b/templates/file/file-link.html.twig @@ -15,7 +15,7 @@ * @see \Drupal\bootstrap\Plugin\Preprocess\FileLink::preprocessVariables */ #} -{% spaceless %} +{% apply spaceless %} {% set classes = [ icon_only ? 'icon-only', @@ -37,4 +37,4 @@ {% endif %} {% endif %} -{% endspaceless %} +{% endapply %} diff --git a/templates/input/input--button--split.html.twig b/templates/input/input--button--split.html.twig index c7d6f01..43b71b4 100644 --- a/templates/input/input--button--split.html.twig +++ b/templates/input/input--button--split.html.twig @@ -22,7 +22,7 @@ * @see template_preprocess_input() */ #} -{% spaceless %} +{% apply spaceless %} {% set classes = [ 'btn', @@ -55,4 +55,4 @@ {{ children }} {% endblock %} -{% endspaceless %} +{% endapply %} diff --git a/templates/input/input--button.html.twig b/templates/input/input--button.html.twig index 7166b1a..60829fe 100644 --- a/templates/input/input--button.html.twig +++ b/templates/input/input--button.html.twig @@ -22,7 +22,7 @@ * @see template_preprocess_input() */ #} -{% spaceless %} +{% apply spaceless %} {% set classes = [ 'btn', @@ -45,4 +45,4 @@ {% endif %} {{ children }} {% endblock %} -{% endspaceless %} +{% endapply %} diff --git a/templates/input/select.html.twig b/templates/input/select.html.twig index 8d75f0e..99e14b3 100644 --- a/templates/input/select.html.twig +++ b/templates/input/select.html.twig @@ -15,7 +15,7 @@ * @see template_preprocess_select() */ #} -{% spaceless %} +{% apply spaceless %} {% if input_group %}
{% endif %} @@ -58,4 +58,4 @@ {% if input_group %}
{% endif %} -{% endspaceless %} +{% endapply %} From ca62888e46474a6422285e9e53aef203f7845bd3 Mon Sep 17 00:00:00 2001 From: Joseph Olstad <20895-joseph.olstad@users.noreply.drupalcode.org> Date: Fri, 23 Jun 2023 14:12:26 -0400 Subject: [PATCH 08/15] Issue #3362764 by joseph.olstad: [D10] - Bootstrap requires underscore.js but it was removed from D10 core --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 976d10a..72d4f3d 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "cweagans/composer-patches": "^1.6.0", "oomphinc/composer-installers-extender": "^1.1 || ^2", "drupal/core": "9.* || 10.*", - "drupal/bootstrap": "3.27" + "drupal/bootstrap": "3.28" }, "minimum-stability": "dev", "prefer-stable": true, From 6796621406ecacdad1042f034afcf63c48e38f94 Mon Sep 17 00:00:00 2001 From: Joseph Olstad <20895-joseph.olstad@users.noreply.drupalcode.org> Date: Fri, 23 Jun 2023 14:16:05 -0400 Subject: [PATCH 09/15] Issue #3367309 by joseph.olstad: wxt_ext_blog - Firstname Lastname - Date --- src/Plugin/Preprocess/Comment.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/Plugin/Preprocess/Comment.php b/src/Plugin/Preprocess/Comment.php index d8b36a6..a6ece26 100644 --- a/src/Plugin/Preprocess/Comment.php +++ b/src/Plugin/Preprocess/Comment.php @@ -19,6 +19,22 @@ class Comment extends PreprocessBase { */ public function preprocessVariables(Variables $variables) { $variables['author'] = \Drupal::service('renderer')->render($elements); + $owner = $variables['comment']->getOwner(); + if (empty($variables['author']) && $owner->id() === 0) { + $variables['author'] = $this->t('Anonymous'); + } + if (empty($variables['author']) && $owner->isAuthenticated()) { + if ($owner->hasField('field_first_name') && $owner->hasField('field_last_name')) { + $first_name = $owner->get('field_first_name')->getString(); + $last_name = $owner->get('field_last_name')->getString(); + if (!empty($first_name) && !empty($last_name)) { + $variables['author'] = $first_name . ' ' . $last_name; + } + } + } + if (empty($variables['author'])) { + $variables['author'] = $variables['comment']->getAuthorName(); + } // Getting the node creation time stamp from the comment object. $date = $variables['comment']->getCreatedTime(); From 46f00505cea402847b8ceae64a96faa41a7b3e7e Mon Sep 17 00:00:00 2001 From: sylus Date: Tue, 27 Jun 2023 08:49:39 -0400 Subject: [PATCH 10/15] feat(templates): Support for Drupal 10 and updated Twig --- templates/input/input--button--split.html.twig | 14 +++++++------- templates/input/input--button--submit.html.twig | 15 ++++++--------- templates/input/input--button.html.twig | 12 +++++------- templates/input/input--form-control.html.twig | 14 +++++++------- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/templates/input/input--button--split.html.twig b/templates/input/input--button--split.html.twig index 43b71b4..dfef5f5 100644 --- a/templates/input/input--button--split.html.twig +++ b/templates/input/input--button--split.html.twig @@ -22,15 +22,15 @@ * @see template_preprocess_input() */ #} -{% apply spaceless %} - {% - set classes = [ + + {% block input %}{% apply spaceless %} + {% + set classes = [ 'btn', type == 'submit' ? 'js-form-submit', icon and icon_position and not icon_only ? 'icon-' ~ icon_position, ] - %} - {% block input %} + %} {% if icon_only %} {{ label }} @@ -54,5 +54,5 @@ {{ 'Toggle Dropdown'|t }} {{ children }} - {% endblock %} -{% endapply %} + {% endapply %}{% endblock %} + diff --git a/templates/input/input--button--submit.html.twig b/templates/input/input--button--submit.html.twig index 05deec9..82fc345 100644 --- a/templates/input/input--button--submit.html.twig +++ b/templates/input/input--button--submit.html.twig @@ -22,16 +22,14 @@ * @see template_preprocess_input() */ #} -{% block input %} - {% apply spaceless %} + {% block input %}{% apply spaceless %} {% set classes = [ - 'btn', - type == 'submit' ? 'js-form-submit', - icon and icon_position and not icon_only ? 'icon-' ~ icon_position, - ] + 'btn', + type == 'submit' ? 'js-form-submit', + icon and icon_position and not icon_only ? 'icon-' ~ icon_position, + ] %} - {% if search_submit == 'true' %} {% if wxt_theme == 'gcweb' %} {{ icon }}{{ 'Search'|t }}{{ children }} @@ -53,5 +51,4 @@ {% endif %} {% endif %} {{ children }} - {% endapply %} -{% endblock %} + {% endapply %}{% endblock %} diff --git a/templates/input/input--button.html.twig b/templates/input/input--button.html.twig index 60829fe..dd86adb 100644 --- a/templates/input/input--button.html.twig +++ b/templates/input/input--button.html.twig @@ -22,15 +22,14 @@ * @see template_preprocess_input() */ #} -{% apply spaceless %} - {% - set classes = [ + {% block input %}{% apply spaceless %} + {% + set classes = [ 'btn', type == 'submit' ? 'js-form-submit', icon and icon_position and not icon_only ? 'icon-' ~ icon_position, ] - %} - {% block input %} + %} {% if icon and icon_only %} {{ label }} @@ -44,5 +43,4 @@ {% endif %} {% endif %} {{ children }} - {% endblock %} -{% endapply %} + {% endapply %}{% endblock %} diff --git a/templates/input/input--form-control.html.twig b/templates/input/input--form-control.html.twig index 216de83..a5b235d 100644 --- a/templates/input/input--form-control.html.twig +++ b/templates/input/input--form-control.html.twig @@ -20,13 +20,13 @@ * @see template_preprocess_input() */ #} -{% block input %} - {% - set classes = [ + + {% block input %}{% apply spaceless %} + {% + set classes = [ 'form-control', ] - %} - {% apply spaceless %} + %} - {% endapply %} -{% endblock %} + {% endapply %}{% endblock %} + From eb4ce3398cb243c6ae2946ef5e39564a53134462 Mon Sep 17 00:00:00 2001 From: Joseph Olstad <20895-joseph.olstad@users.noreply.drupalcode.org> Date: Wed, 26 Jul 2023 09:02:48 -0400 Subject: [PATCH 11/15] Issue #3374741 by joseph.olstad: [D10] Drupal 10.1.1 requires bootstrap 3.29 , 3.29 also compatible with D10.0.10 and D9.5.10 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 72d4f3d..3c7062e 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "cweagans/composer-patches": "^1.6.0", "oomphinc/composer-installers-extender": "^1.1 || ^2", "drupal/core": "9.* || 10.*", - "drupal/bootstrap": "3.28" + "drupal/bootstrap": "3.29" }, "minimum-stability": "dev", "prefer-stable": true, From 87cc2b0bf0d0cbcfb5711563aa713cbbd8d4d8dc Mon Sep 17 00:00:00 2001 From: Liam Morland <24363-lkmorlan@users.noreply.drupalcode.org> Date: Fri, 28 Jul 2023 11:03:33 -0400 Subject: [PATCH 12/15] Issue #3356383 by Liam Morland: Typo in template files: "clas" --- ...t-bootstrap-footer-contextual-fr.html.twig | 22 +++++++++---------- ...-wxt-bootstrap-footer-contextual.html.twig | 22 +++++++++---------- ...web--wxt-bootstrap-footer-top-fr.html.twig | 22 +++++++++---------- ...-gcweb--wxt-bootstrap-footer-top.html.twig | 22 +++++++++---------- 4 files changed, 40 insertions(+), 48 deletions(-) diff --git a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig index 4cfb224..a1f57b8 100644 --- a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig +++ b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig @@ -40,16 +40,14 @@ ] %}
-
- - {{ title_prefix }} -

{{ label }}

- {{ title_suffix }} - {% block content %} -
    - {{ content }} -
- {% endblock %} - -
+ + {{ title_prefix }} +

{{ label }}

+ {{ title_suffix }} + {% block content %} +
    + {{ content }} +
+ {% endblock %} +
diff --git a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig index 4cfb224..a1f57b8 100644 --- a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig +++ b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig @@ -40,16 +40,14 @@ ] %}
-
- - {{ title_prefix }} -

{{ label }}

- {{ title_suffix }} - {% block content %} -
    - {{ content }} -
- {% endblock %} - -
+ + {{ title_prefix }} +

{{ label }}

+ {{ title_suffix }} + {% block content %} +
    + {{ content }} +
+ {% endblock %} +
diff --git a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top-fr.html.twig b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top-fr.html.twig index d8f2ea3..8f700cc 100644 --- a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top-fr.html.twig +++ b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top-fr.html.twig @@ -40,16 +40,14 @@ ] %}
-
- - {{ title_prefix }} -

{{ 'Government of Canada'|t }}

- {{ title_suffix }} - {% block content %} -
    - {{ content }} -
- {% endblock %} - -
+ + {{ title_prefix }} +

{{ 'Government of Canada'|t }}

+ {{ title_suffix }} + {% block content %} +
    + {{ content }} +
+ {% endblock %} +
diff --git a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top.html.twig b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top.html.twig index d8f2ea3..8f700cc 100644 --- a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top.html.twig +++ b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-top.html.twig @@ -40,16 +40,14 @@ ] %}
-
- - {{ title_prefix }} -

{{ 'Government of Canada'|t }}

- {{ title_suffix }} - {% block content %} -
    - {{ content }} -
- {% endblock %} - -
+ + {{ title_prefix }} +

{{ 'Government of Canada'|t }}

+ {{ title_suffix }} + {% block content %} +
    + {{ content }} +
+ {% endblock %} +
From e7233eb4b307a0f23c26a9504bcbe3800729883f Mon Sep 17 00:00:00 2001 From: Liam Morland <24363-lkmorlan@users.noreply.drupalcode.org> Date: Fri, 28 Jul 2023 11:09:30 -0400 Subject: [PATCH 13/15] Issue #3356385 by Liam Morland: Empty label can lead to empty 'h3', invalid HTML --- ...ooter--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig | 4 +++- ...--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig index a1f57b8..735f24e 100644 --- a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig +++ b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual-fr.html.twig @@ -42,7 +42,9 @@
{{ title_prefix }} -

{{ label }}

+ {% if label %} +

{{ label }}

+ {% endif %} {{ title_suffix }} {% block content %}
    diff --git a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig index a1f57b8..735f24e 100644 --- a/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig +++ b/templates/block/block--footer--gcweb--wxt-bootstrap-footer-contextual.html.twig @@ -42,7 +42,9 @@
    {{ title_prefix }} -

    {{ label }}

    + {% if label %} +

    {{ label }}

    + {% endif %} {{ title_suffix }} {% block content %}
      From 06f73e16560ff6beb60e16bbe187949ef02065da Mon Sep 17 00:00:00 2001 From: Stephen Mulvihill <38925-smulvihill@users.noreply.drupalcode.org> Date: Sat, 19 Aug 2023 13:07:19 -0400 Subject: [PATCH 14/15] Issue #3381988 by smulvih2: [CKE5] Give editor min-height --- css/ckeditor5.css | 3 ++- sass/ckeditor5.scss | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/css/ckeditor5.css b/css/ckeditor5.css index ba0b647..0b5ba19 100644 --- a/css/ckeditor5.css +++ b/css/ckeditor5.css @@ -2,4 +2,5 @@ * CKEditor5 styles. */ -/*# sourceMappingURL=ckeditor5.css.map */ +.ck-content { + min-height: 250px; } diff --git a/sass/ckeditor5.scss b/sass/ckeditor5.scss index 031bffb..330e296 100644 --- a/sass/ckeditor5.scss +++ b/sass/ckeditor5.scss @@ -1,3 +1,7 @@ /** * CKEditor5 styles. */ + +.ck-content { + min-height: 250px; +} From 261c49db2508563274c248baf5eb7d7ebe76f875 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 01:11:16 +0000 Subject: [PATCH 15/15] chore(deps): Bump y18n from 3.2.1 to 3.2.2 Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/yargs/y18n/releases) - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/yargs/y18n/commits) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 0b5b8ef..38a7a73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4374,9 +4374,9 @@ xmlhttprequest-ssl@~1.5.4: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - integrity sha1-bRX7qITAhnnA136I53WegR4H+kE= + version "3.2.2" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== yallist@^2.1.2: version "2.1.2"