Merge pull request #68 from UN-OCHA/develop

Update main
UN-OCHA · Mar 16, 2023 · 2e0c880 · 2e0c880
2 parents 442719a + df146e0
commit 2e0c880
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 229 deletions.
diff --git a/composer.json b/composer.json
@@ -47,7 +47,6 @@
         "drupal/allowed_formats": "^2",
         "drupal/anonymous_login": "^2.0",
         "drupal/bigint": "^1.1",
-        "drupal/ckeditor_config": "^3.1",
         "drupal/components": "^2.4",
         "drupal/config_split": "^1.7",
         "drupal/core-composer-scaffold": "^9.3",

diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -19,7 +19,6 @@
             "Issue #2799479: Views doesn't recognize relationship to host": "https://www.drupal.org/files/issues/2022-06-01/entity_reference_revisions-relationship_host_id-2799479-176.patch"
         },
         "drupal/gin": {
-            "Issue #3323501: Table sticky-header width causing overlap": "https://git.drupalcode.org/project/gin/-/merge_requests/225.diff",
             "Issue #3342513: Ajax on action buttons not working except in chrome": "https://www.drupal.org/files/issues/2023-02-16/3342513-entity-edit-form-update-ajax-ids-3.patch"
         },
         "drupal/user_expire": {

diff --git a/config/editor.editor.filtered_html.yml b/config/editor.editor.filtered_html.yml
@@ -13,6 +13,7 @@ settings:
     items:
       - bold
       - italic
+      - style
       - heading
       - '|'
       - link
@@ -38,6 +39,11 @@ settings:
         - heading4
         - heading5
         - heading6
+    ckeditor5_style:
+      styles:
+        -
+          label: Highlight
+          element: '<p class="highlight">'
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<cite>'

diff --git a/config/filter.format.filtered_html.yml b/config/filter.format.filtered_html.yml
@@ -19,7 +19,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p> <h2 id jump-*> <h3 id jump-*> <h4 id jump-*> <h5 id jump-*> <h6 id jump-*> <cite> <dl> <dt> <dd> <a target href> <blockquote cite> <ul type> <ol type a i start> <drupal-media data-caption title data-entity-type data-entity-uuid alt data-view-mode data-align> <strong> <em> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
+      allowed_html: '<br> <p class="highlight"> <h2 id jump-*> <h3 id jump-*> <h4 id jump-*> <h5 id jump-*> <h6 id jump-*> <cite> <dl> <dt> <dd> <a target href> <blockquote cite> <ul type> <ol type a i start> <drupal-media data-caption title data-entity-type data-entity-uuid alt data-view-mode data-align> <strong> <em> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

diff --git a/html/modules/custom/ncms_ui/css/ncms_gin.css b/html/modules/custom/ncms_ui/css/ncms_gin.css
@@ -43,9 +43,6 @@ table {
 .ui-dialog .ui-dialog-buttonpane .form-actions > button {
   margin: 0;
 }
-.ui-dialog .ui-dialog-titlebar .ui-dialog-titlebar-close {
-  top: var(--gin-spacing-s);
-}
 
 /* Improvements for the horizontal form tabs. */
 .horizontal-tabs ul.horizontal-tabs-list li.horizontal-tab-button a {

diff --git a/html/modules/custom/ncms_ui/css/node_preview.css b/html/modules/custom/ncms_ui/css/node_preview.css
@@ -0,0 +1,3 @@
+body.ncms-node-preview .node--unpublished {
+  background: inherit;
+}
diff --git a/html/modules/custom/ncms_ui/ncms_ui.libraries.yml b/html/modules/custom/ncms_ui/ncms_ui.libraries.yml
@@ -4,6 +4,9 @@ node_preview:
     js/node_preview.js: {}
 node_standalone:
   header: true
+  css:
+    component:
+      css/node_preview.css: {}
   js:
     js/node_standalone.js: {}
   dependencies:

diff --git a/html/modules/custom/ncms_ui/ncms_ui.module b/html/modules/custom/ncms_ui/ncms_ui.module
@@ -112,6 +112,7 @@ function ncms_ui_preprocess_html(&$variables) {
         return strpos($value, 'toolbar-') !== 0;
       });
     }
+    $variables['attributes']['class'][] = 'ncms-node-preview';
   }
 }
 

diff --git a/symfony.lock b/symfony.lock
@@ -146,9 +146,6 @@
     "drupal/bigint": {
         "version": "1.1.0"
     },
-    "drupal/ckeditor_config": {
-        "version": "3.0.0"
-    },
     "drupal/coder": {
         "version": "8.3.11"
     },
@@ -293,12 +290,12 @@
     "drupal/token": {
         "version": "1.7.0"
     },
-    "drupal/user_expire": {
-        "version": "1.0.0"
-    },
     "drupal/typed_data": {
         "version": "1.0.0-beta1"
     },
+    "drupal/user_expire": {
+        "version": "1.0.0"
+    },
     "drupal/yaml_content": {
         "version": "1.0.0-alpha7"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,7 @@ function ncms_ui_preprocess_html(&$variables) { @@
             return strpos($value, 'toolbar-') !== 0;
           });
         }
+        $variables['attributes']['class'][] = 'ncms-node-preview';
       }
     }
@@ Expand Down @@