Merge master to develop

bpmn-io · Jul 23, 2023 · c011a21 · c011a21
2 parents 86d7eb8 + 29f606e
commit c011a21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/form-js-carbon-styles/src/carbon-styles.js b/packages/form-js-carbon-styles/src/carbon-styles.js
@@ -161,15 +161,14 @@ const ANCHOR_STYLES = css`
   .fjs-container .fjs-form-field-text a {
     color: var(--cds-link-primary);
     outline: none;
-    text-decoration: none;
-    font-size: var(--cds-body-short-01-font-size);
-    font-weight: var(--cds-body-short-01-font-weight);
-    line-height: var(--cds-body-short-01-line-height);
-    letter-spacing: var(--cds-body-short-01-letter-spacing);
+    text-decoration: underline;
+    font-size: inherit;
+    font-weight: inherit;
+    line-height: var(--cds-body-compact-01-line-height);
+    letter-spacing: var(--cds-body-compact-01-letter-spacing);
 
     &:hover {
       color: var(--cds-link-primary-hover);
-      text-decoration: underline;
     }
 
     &:focus {
@@ -180,7 +179,6 @@ const ANCHOR_STYLES = css`
     &:active:visited,
     &:active:visited:hover {
       color: var(--cds-text-primary);
-      text-decoration: underline;
     }
 
     &:visited {
@@ -926,7 +924,7 @@ const SELECT_STYLES = css`
         }
 
         .fjs-select-arrow {
-          visibility: hidden;
+          color: transparent;
         }
 
         .fjs-select-cross {

diff --git a/packages/form-js-carbon-styles/test/spec/complex.json b/packages/form-js-carbon-styles/test/spec/complex.json
@@ -1,7 +1,7 @@
 {
   "components": [
     {
-      "text": "# Title 1\n## Title 2\n### Title 3\n#### Title 4\n##### Title 5\n###### Title 6\n\n\n\n- list\n- list\n\n1. foo\n2. foo\n\nFoo _italic_ **bold**\n\n&gt; Multiline code\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus auctor sodales pretium. Donec id volutpat quam, sit amet elementum lectus. \n\nInline `code`\n\n```\nMultiline code\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus auctor sodales pretium. Donec id volutpat quam, sit amet elementum lectus. \n```\n\n[Link](https://camunda.com)\n",
+      "text": "# Title 1\n## Title 2\n### Title 3\n#### Title 4\n##### Title 5\n###### Title 6\n\n[this is a link](https://camunda.com) and then comes [**another bold link**](https://bpmn.io) and then [_another italic link_](https://camunda.com)\n\n- list\n- list\n\n1. foo\n2. foo\n\nFoo _italic_ **bold**\n\n&gt; Multiline code\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus auctor sodales pretium. Donec id volutpat quam, sit amet elementum lectus. \n\nInline `code`\n\n```\nMultiline code\nLorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus auctor sodales pretium. Donec id volutpat quam, sit amet elementum lectus. \n```\n\n[Link](https://camunda.com)\n",
       "type": "text",
       "id": "Field_1bbbwwg"
     },