Merge branch 'main' into feat/customizable-table-classes

Author: fsbraun

.pre-commit-config.yaml

@@ -15,13 +15,13 @@ repos:
           args: ["--py39-plus"]
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: '1.23.1'
+    rev: '1.24.0'
     hooks:
       - id: django-upgrade
         args: [--target-version, "4.2"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.9
+    rev: v0.11.4
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

djangocms_text/contrib/text_ckeditor4/static/djangocms_text/vendor/ckeditor4/contents.css

@@ -11,10 +11,10 @@ body
 	font-size: 12px;
 
 	/* Text color */
-	color: #333;
+	color: var(--dca-black, var(--body-fg, #333));
 
 	/* Remove the background color to make it transparent. */
-	background-color: #fff;
+	background-color: var(--dca-white, var(--body-bg, #fff));
 
 	margin: 20px;
 }
@@ -34,7 +34,7 @@ blockquote
 	font-family: Georgia, Times, "Times New Roman", serif;
 	padding: 2px 0;
 	border-style: solid;
-	border-color: #ccc;
+	border-color: var(--dca-gray-lighter, var(--border-color, #ccc));
 	border-width: 0;
 }
 
@@ -54,7 +54,7 @@ blockquote
 
 a
 {
-	color: #0782C1;
+	color: var(--link-fg, #0782C1);
 }
 
 ol,ul,dl

djangocms_text/contrib/text_ckeditor4/static/djangocms_text/vendor/ckeditor4/skins/moono-lisa/dialog.css

@@ -44,8 +44,8 @@ def __init__(
         self.ALLOWED_ATTRIBUTES: dict[str, set[str]] = deepcopy(nh3.ALLOWED_ATTRIBUTES)
         self.generic_attribute_prefixes: set[str] = generic_attribute_prefixes or set()
         additional_attributes = {
-            **settings.TEXT_ADDITIONAL_ATTRIBUTES,
             **(additional_attributes or {}),
+            **settings.TEXT_ADDITIONAL_ATTRIBUTES,
         }
         if additional_attributes:
             self.ALLOWED_TAGS |= set(additional_attributes.keys())
@@ -55,7 +55,7 @@ def __init__(
     def __call__(self) -> dict[str, Union[dict[str, set[str]], set[str], None]]:
         """
         Return a dictionary containing the attributes, tags, generic_attribute_prefixes, and link_rel values for
-        immidiate passing to the nh3.clean function.
+        immediate passing to the nh3.clean function.
 
         :return: A dictionary with the following keys:
             - "attributes": A dictionary containing the allowed attributes setting.