@duetds/components 10.2.4 → 10.3.1

package/lib/collection/components/duet-choice/duet-choice.css

@@ -165,10 +165,6 @@
 .duet-choice-card.duet-m-0 {
   margin: 0 !important;
 }
-.duet-theme-turva .duet-choice-card {
-  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  color: rgb(23, 42, 59) !important;
-}
 .duet-choice-card-flextainer {
   display: flex;
 }
@@ -217,12 +213,6 @@
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.duet-theme-turva .duet-choice-label {
-  border-color: rgb(212, 221, 226);
-}
-.duet-theme-turva .info .duet-choice-label {
-  border-color: rgb(212, 221, 226);
-}
 .duet-choice-label:active {
   opacity: 0.75;
   transition: none !important;
@@ -236,13 +226,6 @@
 .checked > .duet-choice-label .duet-checkmark-container {
   border-color: rgb(0, 119, 179);
 }
-.duet-theme-turva .checked > .duet-choice-label {
-  background: rgb(245, 246, 247);
-  border-color: rgb(23, 42, 59) !important;
-}
-.duet-theme-turva .checked > .duet-choice-label .duet-checkmark-container {
-  border-color: rgb(230, 23, 64);
-}
 .checked.collapsible > .duet-choice-label, .collapsible-force-expanded.collapsible > .duet-choice-label {
   padding-bottom: calc(1rem + 2px) !important;
   border-bottom: 0 !important;
@@ -258,16 +241,6 @@
   border-color: rgb(127, 150, 165);
 }
 
-:host(.duet-theme-turva:not(.no-hover):not(.disabled):hover) > .duet-choice-card-flextainer .duet-choice-label:not(.checked) {
-  border-color: rgb(23, 42, 59);
-}
-:host(.duet-theme-turva:not(.no-hover):not(.disabled):hover) > .duet-choice-card-flextainer .duet-choice-label:not(.checked) .duet-checkmark-container {
-  border-color: rgb(120, 145, 164);
-}
-.info :host(.duet-theme-turva:not(.no-hover):not(.disabled):hover) {
-  border-color: rgb(120, 145, 164);
-}
-
 :host(:not(.no-hover):not(.disabled):not([checked]):hover) > .duet-choice-card-flextainer .duet-choice-label:not(.checked) {
   padding: 1rem;
 }
@@ -281,7 +254,7 @@ input:focus {
   outline-offset: 2px;
   outline-color: rgba(0, 119, 179, 0.8);
 }
-.duet-theme-turva .focus.duet-choice-label, .focus.duet-choice-label.duet-theme-turva, .duet-theme-turva2 .focus.duet-choice-label, .focus.duet-choice-label.duet-theme-turva2 {
+.duet-theme-turva .focus.duet-choice-label, .focus.duet-choice-label.duet-theme-turva {
   outline-color: rgba(53, 79, 101, 0.8);
 }
 
@@ -294,9 +267,6 @@ input:focus {
 .disabled.duet-choice-label .duet-choice-card-icon {
   color: rgb(98, 121, 138);
 }
-.duet-theme-turva .disabled.duet-choice-label .duet-choice-card-icon {
-  color: rgb(120, 145, 164);
-}
 .disabled.duet-choice-label .duet-checkmark {
   border-color: rgb(98, 121, 138) !important;
 }
@@ -306,23 +276,10 @@ input:focus {
   transition: none !important;
 }
 
-.duet-theme-turva .disabled.duet-choice-label {
-  color: rgb(120, 145, 164) !important;
-  background: rgb(245, 246, 247) !important;
-  border-color: rgb(212, 221, 226) !important;
-}
-.duet-theme-turva .disabled.duet-choice-label .duet-checkmark {
-  border-color: rgb(120, 145, 164) !important;
-}
-
 .checked > .disabled.duet-choice-label {
   border-color: rgb(127, 150, 165) !important;
 }
 
-.duet-theme-turva .checked > .disabled.duet-choice-label {
-  border-color: rgb(120, 145, 164) !important;
-}
-
 .duet-checkmark-container {
   position: relative;
   width: 20px;
@@ -332,18 +289,11 @@ input:focus {
   border-radius: 4px;
   transition: border 300ms ease;
 }
-.duet-theme-turva .duet-checkmark-container {
-  border-color: rgb(120, 145, 164);
-}
 .checked > .duet-choice-label .duet-checkmark-container {
   background: rgb(0, 119, 179);
   border-color: rgb(0, 119, 179);
   transition: none;
 }
-.duet-theme-turva .checked > .duet-choice-label .duet-checkmark-container {
-  background: rgb(23, 42, 59);
-  border-color: rgb(23, 42, 59) !important;
-}
 .duet-checkmark-container.duet-checkmark-radio {
   border-radius: 50%;
 }
@@ -351,16 +301,9 @@ label.disabled .duet-checkmark-container {
   background: rgb(181, 198, 208) !important;
   border-color: rgb(181, 198, 208) !important;
 }
-.duet-theme-turva label.disabled .duet-checkmark-container {
-  border-color: rgb(178, 194, 205) !important;
-}
 .checked > label.disabled .duet-checkmark-container {
   background: rgb(181, 198, 208) !important;
 }
-.duet-theme-turva .checked > label.disabled .duet-checkmark-container {
-  background: rgb(178, 194, 205) !important;
-  border-color: rgb(178, 194, 205) !important;
-}
 
 .duet-checkmark {
   position: absolute;
@@ -400,9 +343,6 @@ label.disabled .duet-checkmark-container {
   position: relative;
   color: rgb(0, 119, 179);
 }
-.duet-theme-turva .duet-choice-card-icon {
-  color: rgb(185, 3, 41);
-}
 .duet-choice-card-icon duet-icon {
   display: block;
 }
@@ -437,10 +377,6 @@ label.disabled .duet-checkmark-container {
     padding: 28px !important;
   }
 }
-.duet-theme-turva .duet-choice-card-info, .duet-theme-turva .duet-choice-card-collapsible {
-  color: rgb(23, 42, 59);
-  border-color: rgb(23, 42, 59);
-}
 .checked > .duet-choice-card-info, .checked > .duet-choice-card-collapsible {
   display: block;
 }
@@ -452,10 +388,6 @@ label.disabled .duet-checkmark-container {
   border: 1px solid rgb(212, 223, 229);
   border-top: 0;
 }
-.duet-choice-card-collapsible.duet-theme-turva {
-  background: rgb(255, 255, 255);
-  border-color: rgb(212, 221, 226);
-}
 .duet-choice-card-collapsible.checked {
   padding: 19px !important;
   padding-top: 20px !important;
@@ -468,9 +400,6 @@ label.disabled .duet-checkmark-container {
     padding-top: 28px !important;
   }
 }
-.duet-choice-card-collapsible.checked.duet-theme-turva {
-  border-color: rgb(23, 42, 59);
-}
 .duet-choice-card-collapsible-disabled {
   background: rgb(245, 248, 250);
   border-color: rgb(212, 223, 229);
@@ -478,23 +407,12 @@ label.disabled .duet-checkmark-container {
 .duet-choice-card-collapsible-disabled.checked {
   border-color: rgb(212, 223, 229);
 }
-.duet-choice-card-collapsible-disabled.duet-theme-turva {
-  background: rgb(245, 246, 247);
-  border-color: rgb(212, 221, 226);
-}
-.duet-choice-card-collapsible-disabled.duet-theme-turva.checked {
-  border-color: rgb(212, 221, 226);
-}
 .duet-choice-card-info {
   font-size: 0.875rem;
   line-height: 1.5;
   background: rgb(245, 248, 250);
   transition: 150ms ease-out;
 }
-.duet-choice-card-info.duet-theme-turva {
-  background: rgb(245, 246, 247);
-  border-color: rgb(212, 221, 226);
-}
 .duet-choice-card-info.duet-choice-card-collapsed .duet-choice-info-container ::slotted(*) {
   display: none;
 }
@@ -505,24 +423,18 @@ label.disabled .duet-checkmark-container {
   outline-color: rgba(0, 119, 179, 0.8);
   display: block;
 }
-.duet-theme-turva :host(.user-is-tabbing) .duet-choice-info-container:focus, :host(.user-is-tabbing) .duet-choice-info-container:focus.duet-theme-turva, .duet-theme-turva2 :host(.user-is-tabbing) .duet-choice-info-container:focus, :host(.user-is-tabbing) .duet-choice-info-container:focus.duet-theme-turva2 {
+.duet-theme-turva :host(.user-is-tabbing) .duet-choice-info-container:focus, :host(.user-is-tabbing) .duet-choice-info-container:focus.duet-theme-turva {
   outline-color: rgba(53, 79, 101, 0.8);
 }
 
 :host(.disabled) .duet-choice-card-collapsible {
   border-color: rgb(127, 150, 165);
 }
-:host(.disabled) .duet-choice-card-collapsible.duet-theme-turva {
-  border-color: rgb(120, 145, 164);
-}
 
 :host(:not(.no-hover):not(.disabled):hover) > .duet-choice-card-collapsible:not(.checked) {
   border-color: rgb(0, 119, 179);
   border-width: 2px;
 }
-.duet-theme-turva :host(:not(.no-hover):not(.disabled):hover) > .duet-choice-card-collapsible:not(.checked) {
-  border-color: rgb(120, 145, 164);
-}
 
 :host([collapsible-force-expanded]:not(.no-hover):not(.disabled):hover) > .duet-choice-card-collapsible:not(.checked) {
   padding: 19px !important;
@@ -559,7 +471,7 @@ label.disabled .duet-checkmark-container {
   outline-offset: 2px;
   outline-color: rgba(0, 119, 179, 0.8);
 }
-.duet-theme-turva :host(.user-is-tabbing) .duet-choice-info-toggle:focus, :host(.user-is-tabbing) .duet-choice-info-toggle:focus.duet-theme-turva, .duet-theme-turva2 :host(.user-is-tabbing) .duet-choice-info-toggle:focus, :host(.user-is-tabbing) .duet-choice-info-toggle:focus.duet-theme-turva2 {
+.duet-theme-turva :host(.user-is-tabbing) .duet-choice-info-toggle:focus, :host(.user-is-tabbing) .duet-choice-info-toggle:focus.duet-theme-turva {
   outline-color: rgba(53, 79, 101, 0.8);
 }
 .duet-choice-info-toggle[aria-expanded=true] {
@@ -567,9 +479,6 @@ label.disabled .duet-checkmark-container {
   border-bottom-color: transparent;
   border-bottom-right-radius: 0;
 }
-.duet-theme-turva .duet-choice-info-toggle[aria-expanded=true] {
-  background: rgb(245, 246, 247);
-}
 .duet-choice-info-toggle[disabled] {
   pointer-events: none;
   background: rgb(245, 248, 250) !important;
@@ -578,13 +487,6 @@ label.disabled .duet-checkmark-container {
 .duet-choice-info-toggle[disabled] .duet-choice-info-icon {
   color: rgb(127, 150, 165) !important;
 }
-.duet-choice-info-toggle[disabled].duet-theme-turva {
-  background: rgb(245, 246, 247) !important;
-  border-color: rgb(212, 221, 226) !important;
-}
-.duet-choice-info-toggle[disabled].duet-theme-turva .duet-choice-info-icon {
-  color: rgb(120, 145, 164) !important;
-}
 .checked + .duet-choice-info-toggle {
   border-left-color: rgb(0, 119, 179) !important;
 }
@@ -594,16 +496,10 @@ label.disabled .duet-checkmark-container {
 .duet-choice-info-toggle .duet-choice-info-icon {
   color: rgb(0, 119, 179);
 }
-.duet-theme-turva .duet-choice-info-toggle .duet-choice-info-icon {
-  color: rgb(230, 23, 64);
-}
 
 :host(:not(.no-hover):not(.disabled):hover) > .duet-choice-card-flextainer .duet-choice-label .duet-choice-info-toggle {
   border-left-color: rgb(127, 150, 165);
 }
-.duet-theme-turva :host(:not(.no-hover):not(.disabled):hover) > .duet-choice-card-flextainer .duet-choice-label .duet-choice-info-toggle {
-  border-left-color: rgb(120, 145, 164);
-}
 
 .duet-choice-input,
 *::slotted([slot=choiceinput]) {
@@ -613,54 +509,110 @@ label.disabled .duet-checkmark-container {
   opacity: 0;
 }
 
-:host(.duet-theme-turva2) .duet-theme-turva .duet-choice-card {
+.duet-theme-turva .duet-choice-card {
+  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   color: rgb(23, 42, 59) !important;
 }
-:host(.duet-theme-turva2) .duet-theme-turva .duet-choice-label {
+.duet-theme-turva .duet-choice-label {
   border-color: rgb(178, 194, 205);
 }
-.info :host(.duet-theme-turva2) .duet-theme-turva .duet-choice-label {
+.info .duet-theme-turva .duet-choice-label {
   border-color: rgb(178, 194, 205);
 }
-:host(.duet-theme-turva2) .duet-theme-turva .checked > .duet-choice-label {
+.duet-theme-turva .duet-choice-label.disabled {
+  color: rgb(120, 145, 164) !important;
+  background: rgb(245, 246, 247) !important;
+  border-color: rgb(212, 221, 226) !important;
+}
+.duet-theme-turva .duet-choice-label.disabled .duet-choice-card-icon {
+  color: rgb(120, 145, 164);
+}
+.duet-theme-turva .duet-choice-label.disabled .duet-checkmark {
+  border-color: rgb(120, 145, 164) !important;
+}
+.duet-theme-turva .checked > .duet-choice-label {
   background: rgb(245, 246, 247);
   border-color: rgb(23, 42, 59) !important;
 }
-:host(.duet-theme-turva2) .duet-theme-turva .checked > .duet-choice-label .duet-checkmark-container {
-  border-color: rgb(230, 23, 64);
+.duet-theme-turva .checked > .duet-choice-label.disabled {
+  border-color: rgb(120, 145, 164) !important;
 }
-.duet-choice-label :host(.duet-theme-turva2) .duet-theme-turva .checked > .duet-choice-label .duet-checkmark-container {
+.duet-theme-turva .checked > .duet-choice-label .duet-checkmark-container {
   background: rgb(23, 42, 59);
   border-color: rgb(23, 42, 59) !important;
 }
-:host(.duet-theme-turva2) .duet-theme-turva.duet-choice-card-info, :host(.duet-theme-turva2) .duet-theme-turva.duet-choice-card-collapsible {
+.duet-theme-turva .duet-choice-card-icon {
+  color: rgb(185, 3, 41);
+}
+.duet-theme-turva.duet-choice-card-info, .duet-theme-turva.duet-choice-card-collapsible {
   color: rgb(23, 42, 59);
+  background: rgb(255, 255, 255);
   border-color: rgb(23, 42, 59);
 }
-:host(.duet-theme-turva2) .duet-theme-turva.duet-choice-card-collapsible {
+.duet-theme-turva.duet-choice-card-collapsible {
   border-color: rgb(178, 194, 205);
 }
-:host(.duet-theme-turva2) .duet-theme-turva.duet-choice-card-collapsible.checked {
+.duet-theme-turva.duet-choice-card-collapsible.checked {
   border-color: rgb(23, 42, 59);
 }
-:host(.duet-theme-turva2) .duet-theme-turva.duet-choice-card-info {
+.duet-theme-turva.duet-choice-card-collapsible-disabled {
+  background: rgb(245, 246, 247);
+  border-color: rgb(212, 221, 226);
+}
+.duet-theme-turva.duet-choice-card-collapsible-disabled.checked {
+  border-color: rgb(212, 221, 226);
+}
+.duet-theme-turva.duet-choice-card-info {
   background: rgb(245, 246, 247);
   border-color: rgb(178, 194, 205);
 }
-:host(.duet-theme-turva2) .duet-theme-turva .duet-checkmark-container {
+.duet-theme-turva .duet-checkmark-container {
   border-color: rgb(120, 145, 164);
 }
-:host(.duet-theme-turva2) .duet-theme-turva.duet-choice-info-toggle {
+.checked > .duet-choice-label .duet-theme-turva .duet-checkmark-container {
+  background: rgb(23, 42, 59);
+  border-color: rgb(23, 42, 59) !important;
+}
+.duet-theme-turva label.disabled .duet-checkmark-container {
+  border-color: rgb(178, 194, 205) !important;
+}
+.duet-theme-turva .checked > label.disabled .duet-checkmark-container {
+  background: rgb(178, 194, 205) !important;
+  border-color: rgb(178, 194, 205) !important;
+}
+
+.duet-theme-turva.duet-choice-info-toggle {
   border-color: rgb(178, 194, 205);
 }
-:host(.duet-theme-turva2) .duet-theme-turva.duet-choice-info-toggle[aria-expanded=true] {
+.duet-theme-turva.duet-choice-info-toggle[aria-expanded=true] {
   background: rgb(245, 246, 247);
   border-bottom-color: transparent;
 }
+.duet-theme-turva.duet-choice-info-toggle[disabled] {
+  background: rgb(245, 246, 247) !important;
+  border-color: rgb(212, 221, 226) !important;
+}
+.duet-theme-turva.duet-choice-info-toggle[disabled] .duet-choice-info-icon {
+  color: rgb(120, 145, 164) !important;
+}
+.duet-theme-turva.duet-choice-info-toggle .duet-choice-info-icon {
+  color: rgb(230, 23, 64);
+}
 
-:host(.duet-theme-turva2:not(.no-hover):not(.disabled):hover) > .duet-theme-turva.duet-choice-card-flextainer .duet-choice-label:not(.checked) {
+:host(.disabled) .duet-theme-turva.duet-choice-card-collapsible {
+  border-color: rgb(120, 145, 164);
+}
+
+:host(:not(.no-hover):not(.disabled):hover) .duet-theme-turva > .duet-choice-card-collapsible:not(.checked) {
+  border-color: rgb(120, 145, 164);
+}
+
+:host(.duet-theme-turva:not(.no-hover):not(.disabled):hover) > .duet-theme-turva.duet-choice-card-flextainer .duet-choice-label:not(.checked) {
   border-color: rgb(23, 42, 59);
 }
-:host(.duet-theme-turva2:not(.no-hover):not(.disabled):hover) > .duet-theme-turva.duet-choice-card-flextainer .duet-choice-label:not(.checked) .duet-checkmark-container {
+:host(.duet-theme-turva:not(.no-hover):not(.disabled):hover) > .duet-theme-turva.duet-choice-card-flextainer .duet-choice-label:not(.checked) .duet-checkmark-container {
   border-color: rgb(120, 145, 164);
+}
+:host(.duet-theme-turva:not(.no-hover):not(.disabled):hover) > .duet-theme-turva.duet-choice-card-flextainer .duet-choice-label .duet-choice-info-toggle {
+  border-left-color: rgb(120, 145, 164);
 }

package/lib/collection/components/duet-choice/duet-choice.js

@@ -422,7 +422,7 @@ export class DuetChoice {
      * Always the last one in the class.
      */
     render() {
-        return (h(Host, { key: '583ef635169af9972811ec71576988fa12c1ad9a', class: {
+        return (h(Host, { key: '20fca5910765c8cca647f5632a5b922957ab3295', class: {
                 horizontal: this.groupDirection === "horizontal" && !this.groupResponsive,
                 [`horizontal-responsive-${this.groupResponsive}`]: this.groupDirection === "horizontal" && !!this.groupResponsive,
                 "vertical-stretch": this.groupDirection === "horizontal",
@@ -431,10 +431,10 @@ export class DuetChoice {
                 "duet-theme-turva": this.theme === "turva",
                 "no-hover": this.isHovering,
                 disabled: this.getDisabled(),
-            } }, h("div", { key: 'ca64fbe3bb8291ad36305267c7e1ea02355ebc5c', class: {
+            } }, h("div", { key: 'fd4d2187540b58f67ba2215fb1e92ae80e1bda59', class: {
                 "duet-choice-card-flextainer": true,
                 "duet-theme-turva": this.theme === "turva",
-            } }, h("div", { key: 'cad7111f70511cf2f1dbe0e9db6c00c0f2e038ad', class: {
+            } }, h("div", { key: '767518376936e2ac6b0317ed2961c9832a9540f9', class: {
                 "duet-choice-card": true,
                 "has-icon": !!this.icon,
                 "has-info": this.hasInfo,
@@ -443,16 +443,16 @@ export class DuetChoice {
                 collapsible: this.collapsible,
                 "collapsible-force-expanded": this.collapsibleForceExpanded,
                 "duet-p-0": this.padding === "none",
-            } }, h("slot", { key: 'bb7405107756f726503cf0e17278761d9f68386e', name: "choiceinput" }), h("label", { key: '0ae8fc10a14a1b68cf78e7fe65164cc4ac4471f4', class: {
+            } }, h("slot", { key: '3218ec3ce6232219942048b1dc4720e6544d5a8e', name: "choiceinput" }), h("label", { key: '43d66fc0a5fbe3dc91ba24b1b9a61bfe1565c9c4', class: {
                 "duet-choice-label": true,
                 "has-before-text": this.hasBeforeText,
                 checked: this.checked,
                 focus: this.focus,
                 disabled: this.getDisabled(),
-            }, onClick: this.onClick }, this.hasBeforeText && h("slot", { key: '174aa0372dd6cce4bc695425fc0f4f9b9ef51e89', name: "before-text" }), this.icon && (h("div", { key: '1d8c96fbbb225864342228a15026d56c2288ba7c', class: "duet-choice-card-icon" }, h("duet-icon", { key: '737fc607c29c5178a62c6981571c1624e3a7d993', margin: "none", size: "small", name: this.icon, color: "currentColor" }))), h("div", { key: 'e97966ca1b32ac47460f193997509eda09904469', class: "duet-choice-card-text" }, h("div", { key: 'df684a3bf298011052b12e8a8a781f537403a1a0' }, this.hasLabel ? h("slot", { name: "label" }) : this.label), this.caption && (h("div", { key: 'eb703567d8b2d2a3d940af79c3e36e339b16358e' }, h("duet-spacer", { key: '2a260bd1fa121622e21c8e64952c14a8fdf7e40f', size: "xx-small" }), h("duet-caption", { key: 'ca97833b65e235dc4316249086e099f33cbea465', margin: "none", selected: this.checked }, this.caption))), this.hasAdditional && (h("div", { key: 'bce4fd584082e0a2d2b6e72ba5ffb32487c55564' }, h("duet-spacer", { key: '40efa3cc50c5636c85cfab0e4ba9e96aafad8f79', size: "xx-small" }), h("slot", { key: 'db4d24e43aa875de213391981ed2b841137337aa', name: "additional" })))), h("div", { key: '496255f50229c21cf645b9b2a0a3c10db73cee12' }, h("div", { key: '90180fd834fc6a1f39cc6dcea6a61133961cbdaf', class: { "duet-checkmark-container": true, "duet-checkmark-radio": this.type === "radio" } }, this.checked && h("div", { key: '1d6455f6915d00399fdb586aca6b0ee2a622d2da', class: "duet-checkmark" }))))), this.hasInfo && !this.collapsible && (h("button", { key: '8897ce9328e49c68fef9b9901e8e6f271cd484d9', ref: button => (this.infoButtonEl = button), id: this.infoButtonId, class: {
+            }, onClick: this.onClick }, this.hasBeforeText && h("slot", { key: '144d416819882f6ef4d1b7e8fc2de04e045e9e6f', name: "before-text" }), this.icon && (h("div", { key: 'adfb01ba2ba8dd118a9780ec2e01db2efa75c0ce', class: "duet-choice-card-icon" }, h("duet-icon", { key: 'abf48b519c4d60cc2ce9923eaf6a1830061a13a6', margin: "none", size: "small", name: this.icon, color: "currentColor" }))), h("div", { key: 'ddccee835dbdc2c123fc51ec2ced2539515f5e07', class: "duet-choice-card-text" }, h("div", { key: '68c2770f71856d031a720d03242809bcae202624' }, this.hasLabel ? h("slot", { name: "label" }) : this.label), this.caption && (h("div", { key: '67a7ead271ee52570028c6f2ce64267c9b7e687d' }, h("duet-spacer", { key: 'eb726497b2e68a5ddc43486af8fa621e4a620dd0', size: "xx-small" }), h("duet-caption", { key: '7656a138b5d881f6aaa5ce978816d550d30debd4', margin: "none", selected: this.checked }, this.caption))), this.hasAdditional && (h("div", { key: 'ed0700c59f2e492ba38dd03f1157332ac5794003' }, h("duet-spacer", { key: 'e45435defc128599b911095c8d845a4b19b5085c', size: "xx-small" }), h("slot", { key: 'aff1622080409265769aad87862ad14e6f4e96a1', name: "additional" })))), h("div", { key: '01f506c4af993b10b3f651a4175a3f93288ffac4' }, h("div", { key: '9d328e36a1e61a1ebec8bc5bab0fdbce0ba03cc2', class: { "duet-checkmark-container": true, "duet-checkmark-radio": this.type === "radio" } }, this.checked && h("div", { key: 'ebad90b11052d439d9a9c3243fa32a621d770215', class: "duet-checkmark" }))))), this.hasInfo && !this.collapsible && (h("button", { key: 'a1d78aab1bd360876936e79ad1c8a00d534ad2d5', ref: button => (this.infoButtonEl = button), id: this.infoButtonId, class: {
                 "duet-choice-info-toggle": true,
                 "duet-theme-turva": this.theme === "turva",
-            }, onMouseEnter: this.onMouseEnter, onMouseLeave: this.onMouseLeave, onClick: this.toggleInfo, disabled: this.getDisabled(), "aria-expanded": this.isInfoOpen ? "true" : "false", "aria-label": `${this.infoLabel} ${this.label}`, "aria-controls": this.expandId, tabindex: this.type === "radio" && !this.checked ? "-1" : "0", type: "button", onKeyUp: e => this.handleEscape(e) }, h("div", { key: 'cd0cc7ea1a4d1f7dfaf0a0cc0f2296c71d3b5d43', class: "duet-choice-info-icon" }, h("duet-icon", { key: '62c25ce3534a78c7f7b5cf5c7cdc53caaf42435a', icon: infoIcon.svg, margin: "none", size: "small", color: "currentColor" }))))), this.collapsible && (h("span", { key: 'efa969656f43120c9b8670160671c1c0c9630714', id: `${this.choiceId}-collapsible-notification`, hidden: true }, this.collapsibleNotification)), this.collapsible || this.hasInfo ? (h("div", { class: this.getClassNames(), id: this.expandId }, h("span", { class: {
+            }, onMouseEnter: this.onMouseEnter, onMouseLeave: this.onMouseLeave, onClick: this.toggleInfo, disabled: this.getDisabled(), "aria-expanded": this.isInfoOpen ? "true" : "false", "aria-label": `${this.infoLabel} ${this.label}`, "aria-controls": this.expandId, tabindex: this.type === "radio" && !this.checked ? "-1" : "0", type: "button", onKeyUp: e => this.handleEscape(e) }, h("div", { key: '8c394a1cc633e65e9f8c9162fbe4c361e37a15f6', class: "duet-choice-info-icon" }, h("duet-icon", { key: '52c25fe2a72346e9efde109af0736ec6673dfc0e', icon: infoIcon.svg, margin: "none", size: "small", color: "currentColor" }))))), this.collapsible && (h("span", { key: 'dda02c201e7874c64ed98b6b48e30f734bc8ecb8', id: `${this.choiceId}-collapsible-notification`, hidden: true }, this.collapsibleNotification)), this.collapsible || this.hasInfo ? (h("div", { class: this.getClassNames(), id: this.expandId }, h("span", { class: {
                 "duet-choice-section-visible": this.collapsible ? this.getExpanded() : this.isInfoOpen,
                 "duet-choice-section-hidden": this.collapsible ? !this.getExpanded() : !this.isInfoOpen,
             } }, h("span", { id: this.headerId }, h("slot", { name: "header" })), this.hasInfo ? (h("span", { ref: span => (this.infoContainer = span), tabindex: "-1", class: "duet-choice-info-container", onKeyUp: e => this.handleEscape(e) }, h("span", null, h("slot", { name: "info" })), h("slot", null))) : (h("span", { id: `${this.choiceId}-collapsible-content` }, h("slot", null)))))) : null));

package/lib/collection/components/duet-choice-group/duet-choice-group.js

@@ -183,14 +183,14 @@ export class DuetChoiceGroup {
      * Always the last one in the class.
      */
     render() {
-        return (h(Host, { key: '91ad25e9ae34e334eb8c94c39477915350324fe4', onDuetChange: this.onSelect, onDuetChoiceReady: this.onChoiceReady, class: {
+        return (h(Host, { key: '76d5ad8cc7a9f59c9ab08932b3e6e6596ff1f9d0', onDuetChange: this.onSelect, onDuetChoiceReady: this.onChoiceReady, class: {
                 horizontal: this.direction === "horizontal",
                 "duet-choice-group-breakpoint-x-small": this.responsive && this.breakpoint === "x-small",
                 "duet-choice-group-breakpoint-small": this.responsive && this.breakpoint === "small",
                 "duet-choice-group-breakpoint-medium": this.responsive && this.breakpoint === "medium",
                 "duet-choice-group-breakpoint-large": this.responsive && this.breakpoint === "large",
                 "duet-choice-group-breakpoint-x-large": this.responsive && this.breakpoint === "x-large",
-            } }, h("duet-fieldset", { key: '8be987ee15a23906a771c28b844ae283ca5df13c', label: this.label, labelHidden: this.labelHidden, compactLabel: true, caption: this.caption, error: this.error, margin: this.margin, theme: this.theme, "accessible-live-error": this.accessibleLiveError }, this.tooltip && (h("duet-tooltip", { key: 'fb25c9c926cc1e47bf9147112634d1c2f792dfb5', slot: "tooltip", direction: this.tooltipDirection, accessibleInputLabel: this.label }, this.tooltip)), h("slot", { key: '9236736c2872c5ab10bccad8c12ee2819bf41270', name: "tooltip" }), h("div", { key: '5cb0b64392398f6535d947c142ae27a794820dec', class: { [this.choiceGroupName]: true, "duet-no-stacking": !this.responsive } }, h("slot", { key: 'eddef456160e825d9a44fcade7482e854de79824' })))));
+            } }, h("duet-fieldset", { key: 'ade69113f55cbcc86f0504f857ede704aa4c0075', label: this.label, labelHidden: this.labelHidden, compactLabel: true, caption: this.caption, error: this.error, margin: this.margin, theme: this.theme, "accessible-live-error": this.accessibleLiveError }, this.tooltip && (h("duet-tooltip", { key: '388b1ccb2ac2ba51cb35dbe6f9f824183f0d3f0f', slot: "tooltip", direction: this.tooltipDirection, accessibleInputLabel: this.label }, this.tooltip)), h("slot", { key: '104f30e94ea5413347edb6abc1975fcd9ae8ad6c', name: "tooltip", slot: "tooltip" }), h("div", { key: 'af118f2f9fef2e7c2a6aa8d242bdd0cb4001f328', class: { [this.choiceGroupName]: true, "duet-no-stacking": !this.responsive } }, h("slot", { key: 'ebb96354e1a32cb4821ad6700e0cdbe1087ee815' })))));
     }
     static get is() { return "duet-choice-group"; }
     static get encapsulation() { return "shadow"; }

package/lib/collection/components/duet-collapsible/duet-collapsible.css

@@ -33,11 +33,6 @@
   color: rgb(8, 42, 77);
 }
 
-:host(.duet-theme-turva) {
-  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  color: rgb(23, 42, 59);
-}
-
 :host(.duet-m-0) {
   margin: 0 !important;
 }
@@ -60,10 +55,6 @@
     font-size: 0.875rem;
   }
 }
-.duet-collapsible-content.duet-theme-turva {
-  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  color: rgb(23, 42, 59);
-}
 :host([open]) > .duet-collapsible-content {
   display: block;
 }
@@ -90,7 +81,7 @@
   outline-offset: 2px;
   outline-color: rgba(0, 119, 179, 0.8);
 }
-.duet-theme-turva :host(.user-is-tabbing) .duet-collapsible-heading:focus, :host(.user-is-tabbing) .duet-collapsible-heading:focus.duet-theme-turva, .duet-theme-turva2 :host(.user-is-tabbing) .duet-collapsible-heading:focus, :host(.user-is-tabbing) .duet-collapsible-heading:focus.duet-theme-turva2 {
+.duet-theme-turva :host(.user-is-tabbing) .duet-collapsible-heading:focus, :host(.user-is-tabbing) .duet-collapsible-heading:focus.duet-theme-turva {
   outline-color: rgba(53, 79, 101, 0.8);
 }
 .duet-collapsible-heading.full-width {
@@ -105,10 +96,6 @@
 .duet-collapsible-heading.duet-collapsible-normal-weight {
   font-weight: 400;
 }
-.duet-collapsible-heading.duet-theme-turva {
-  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  color: rgb(23, 42, 59);
-}
 .duet-collapsible-heading .duet-collapsible-heading-content {
   min-width: 0;
 }
@@ -167,10 +154,12 @@
   color: rgb(255, 255, 255);
 }
 
-:host(.duet-theme-turva2) {
+.duet-theme-turva {
+  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   color: rgb(23, 42, 59);
 }
-:host(.duet-theme-turva2) .duet-collapsible-content.duet-theme-turva,
-:host(.duet-theme-turva2) .duet-collapsible-heading.duet-theme-turva {
+.duet-theme-turva .duet-collapsible-content.duet-theme-turva,
+.duet-theme-turva .duet-collapsible-heading.duet-theme-turva {
+  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   color: rgb(23, 42, 59);
 }

package/lib/collection/components/duet-collapsible/duet-collapsible.js

@@ -177,7 +177,7 @@ export class DuetCollapsible {
      */
     render() {
         const HeadingTagName = this.headingTags.includes(this.headingLevel) ? this.headingLevel : "div";
-        return (h(Host, { key: 'fd4435676c3862734ae74dc5a3f87b8eab2f70f4', class: { "duet-m-0": this.margin === "none", negative: this.negative } }, h(HeadingTagName, { key: 'a8cebd440d7d71ec114617e5fb99929f577c4519' }, h("button", { key: '20835d6fa2e0dd36cc25d5400f31d29f00123c08', class: {
+        return (h(Host, { key: 'b19b694f6710f4338d26580dea95463eefaa30d4', class: { "duet-m-0": this.margin === "none", negative: this.negative } }, h(HeadingTagName, { key: '47062fe8e280b4c2489ebe9ba784e6211ecac9e3' }, h("button", { key: '5e635b36739a5ab604c5d523435522b83bddcd56', class: {
                 "duet-collapsible-heading": true,
                 "duet-collapsible-heading-centered": this.centerHeading,
                 "duet-theme-turva": this.theme === "turva",
@@ -185,7 +185,7 @@ export class DuetCollapsible {
                 "has-after-heading": this.hasAfterHeadingSlot,
                 "full-width": this.headingFullWidth,
                 "has-caption": !!this.caption,
-            }, style: { "font-size": this.getFontSizeFromTokens() }, role: "button", ref: button => (this.nativeButton = button), "aria-label": this.getAccessibleLabel(), "aria-expanded": this.open ? "true" : "false", "aria-controls": this.id, onClick: this.handleClick, onKeyDown: this.handleKeyDown }, h("div", { key: '5efe212565a40b4805d565c6856ef080f3b0b696', class: "duet-collapsible-heading-wrapper" }, h("div", { key: '09dde2b49aa4b3aee5ae10e6cd6ffee6bdd75faa', class: "duet-collapsible-heading-icon" }, h("duet-icon", { key: '6bc4d5b4d62dcd39c6b03a37f0879d19d9b56f14', margin: "none", size: this.getEquivalentIconSize(), icon: icon.svg })), h("div", { key: 'cc07686af44301b10a541149bffc8df833a294f3', class: "duet-collapsible-heading-content", part: "duet-collapsible-heading-content" }, this.heading ? this.heading : h("slot", { name: "heading" })), this.hasAfterHeadingSlot && (h("div", { key: '83f79853695547594c25a1b017c0653d4e4edc7d', part: "duet-collapsible-after-heading" }, h("slot", { key: '47dd2ce6d896f75c6814594899604aa15e9a98cd', name: "after-heading" })))), this.caption && (h("div", { key: 'ebd4561054092f312999f98f8e859bd193cb9613', class: "duet-collapsible-heading-caption" }, h("duet-caption", { key: 'f620061ec26eed524ee27e417d6fb1e828fc04e8', size: "small", margin: "none" }, this.caption))))), h("div", { key: '4a2de882c742fbd31fb4c1ce959e9c081cf1a15d', id: this.id, class: { "duet-collapsible-content": true, "duet-theme-turva": this.theme === "turva" }, part: "duet-collapsible-content" }, h("slot", { key: '7efd617c6d79dba957e02d3a7ea4677629c64ef7' }))));
+            }, style: { "font-size": this.getFontSizeFromTokens() }, role: "button", ref: button => (this.nativeButton = button), "aria-label": this.getAccessibleLabel(), "aria-expanded": this.open ? "true" : "false", "aria-controls": this.id, onClick: this.handleClick, onKeyDown: this.handleKeyDown }, h("div", { key: '9d49b16d4375ea5c4700c3142b920e3e76924443', class: "duet-collapsible-heading-wrapper" }, h("div", { key: '6b45ae151d90d269a466c782eed5c7ed29ecdbee', class: "duet-collapsible-heading-icon" }, h("duet-icon", { key: '99eac9e54f5bbf71068e9b5dc3557ee347d2cd5b', margin: "none", size: this.getEquivalentIconSize(), icon: icon.svg })), h("div", { key: '732d6cf225d17864487046efc9c3cb26e19b9dc8', class: "duet-collapsible-heading-content", part: "duet-collapsible-heading-content" }, this.heading ? this.heading : h("slot", { name: "heading" })), this.hasAfterHeadingSlot && (h("div", { key: 'ecb0414b87ff8340967c2a65d5715986b8c11c01', part: "duet-collapsible-after-heading" }, h("slot", { key: '85b150c18dd43fbe21041bd4a8258d6412a350f0', name: "after-heading" })))), this.caption && (h("div", { key: '6d3aa5e7917e2db228251eab60ee888ec51d3944', class: "duet-collapsible-heading-caption" }, h("duet-caption", { key: '52aa682a75aa4a7bfef36ad34cbf900b41fb46ba', size: "small", margin: "none" }, this.caption))))), h("div", { key: '815c138b748356c749954d2a99564edd608e8b41', id: this.id, class: { "duet-collapsible-content": true, "duet-theme-turva": this.theme === "turva" }, part: "duet-collapsible-content" }, h("slot", { key: '5f5ccef4fa9e4cba89278e034ae23a68c29add51' }))));
     }
     static get is() { return "duet-collapsible"; }
     static get encapsulation() { return "shadow"; }

package/lib/collection/components/duet-combobox/duet-combobox.css

@@ -17,17 +17,11 @@
   color: rgb(8, 42, 77);
   transition: none;
 }
-:host.duet-theme-turva {
-  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  color: rgb(23, 42, 59);
-}
-:host.duet-theme-turva a {
-  color: rgb(23, 42, 59);
-}
 
-:host(.duet-theme-turva2.duet-theme-turva) {
+:host(.duet-theme-turva) {
+  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   color: rgb(23, 42, 59);
 }
-:host(.duet-theme-turva2.duet-theme-turva) a {
+:host(.duet-theme-turva) a {
   color: rgb(23, 42, 59);
 }

package/lib/collection/components/duet-contact-card/duet-contact-card.css

@@ -47,10 +47,6 @@
   line-height: 1.5;
   color: rgb(8, 42, 77);
 }
-.duet-contact-card.duet-theme-turva {
-  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-  color: rgb(23, 42, 59);
-}
 @media (min-width: 48em) {
   .duet-contact-card {
     grid-template-columns: min-content minmax(0, 1fr) auto;
@@ -84,6 +80,7 @@
   overflow-wrap: break-word;
 }
 
-:host(.duet-theme-turva2) .duet-contact-card.duet-theme-turva {
+.duet-contact-card.duet-theme-turva {
+  font-family: "turva-sans", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
   color: rgb(23, 42, 59);
 }

package/lib/collection/components/duet-contact-card/duet-contact-card.js

@@ -47,10 +47,10 @@ export class DuetContactCard {
     render() {
         const isTurva = this.theme === "turva";
         const theme = isTurva ? "turva" : "default";
-        return (h(Host, { key: '6cf20cb225b22fbb826b136c3909234684d30e3d', class: { "duet-m-0": this.margin === "none" } }, h("div", { key: '24e57cbe34b4d01ff024fe8128d3168b61e61af6', class: {
+        return (h(Host, { key: 'a08fac4daef7586a885d4556d27260feb027d4fb', class: { "duet-m-0": this.margin === "none" } }, h("div", { key: 'd70cc29e06be46210e3150661f16bcf19fab27b1', class: {
                 "duet-contact-card": true,
                 "duet-theme-turva": this.theme === "turva",
-            }, role: "group", "aria-label": this.name }, this.image ? h("img", { class: "image", src: this.image, alt: this.name }) : h("div", null), h("div", { key: 'f3c40c440d2d9dd97e3c1e24817d60e62f6347f0' }, this.name && (h("duet-heading", { key: 'cde7a70f10cfdd45e801c9ef923e116b2ee12e42', class: "name", level: "h3", margin: "none", theme: theme }, this.name)), this.description && (h("duet-paragraph", { key: '1c855114d2101701a8b39f75fe8b2ae76d5ffe57', class: "description", margin: "none", theme: theme }, this.description)), this.email && (h("div", { key: 'b552b0f0de5e16059e77ee518e2087d24a2171c4', class: "email" }, h("duet-icon", { key: '2048a5cb8e29d7d664c984c72031cdfd1894e0a6', name: "navigation-message", size: "x-small", color: "primary-dark", margin: "none", theme: theme }), h("duet-link", { key: '6e2a9b632e0fb1df3efd51dc66d6df1891eaa3a1', url: `mailto:${this.email}`, accessibleLabel: `Email: ${this.email}`, theme: theme }, this.email))), this.phone && (h("div", { key: '1a263f67d1844f9c2ba334ba24ebc32d9faf4b86', class: "phone" }, h("duet-icon", { key: 'dab3c18ed7f4c092aa8644ef6d9a915854c9e33d', name: "form-tel", size: "x-small", color: "primary-dark", margin: "none", theme: theme }), h("duet-link", { key: '68c6b2ff4480300f563b7d8d65fb4d47160fcd8b', url: `tel:${this.phone}`, accessibleLabel: `${this.phoneLabel[this.language]}: ${this.phone}`, theme: theme }, this.phone)))), this.buttonUrl && this.buttonText && (h("div", { key: '70288a25480b39a333831a129def567c99f202b7', class: "call-to-action" }, h("duet-button", { key: 'c5fccd74b8b2b6b4917b464c5e723c657e326bb0', variation: "default", icon: this.buttonIcon, fixed: true, margin: "none", url: this.buttonUrl, theme: theme }, this.buttonText))), h("div", { key: '9fd8e574534d15aa89eaac786c257586a6f9f845' }), h("slot", { key: 'ab0fa1cc3232c70441d441e4c673b8b562ffbe92' }))));
+            }, role: "group", "aria-label": this.name }, this.image ? h("img", { class: "image", src: this.image, alt: this.name }) : h("div", null), h("div", { key: '4cde139368ebb252e83638d0634671f2167b14a0' }, this.name && (h("duet-heading", { key: 'c91fe7f5ef066de893cfa2fb4018e9b17e5e66af', class: "name", level: "h3", margin: "none", theme: theme }, this.name)), this.description && (h("duet-paragraph", { key: '9ef8bdab5f11c125115cfa147428327131e6086a', class: "description", margin: "none", theme: theme }, this.description)), this.email && (h("div", { key: 'd07bbb21d8963247655a3b172e26c9f1becc2fd2', class: "email" }, h("duet-icon", { key: 'd25b13911b29302d0eabc8f715e13ff59b473c7f', name: "navigation-message", size: "x-small", color: "primary-dark", margin: "none", theme: theme }), h("duet-link", { key: '2765a6cbc0fb671c3cb8a37d7ac2fe578f369cfe', url: `mailto:${this.email}`, accessibleLabel: `Email: ${this.email}`, theme: theme }, this.email))), this.phone && (h("div", { key: 'fcbed4d2a82ed0ee1e90665f5e42f10bfdcaf344', class: "phone" }, h("duet-icon", { key: '17233a8a4863c68255e207c23de3667437bd1177', name: "form-tel", size: "x-small", color: "primary-dark", margin: "none", theme: theme }), h("duet-link", { key: '0a49811728ddfd13096701fe9d33c54722554107', url: `tel:${this.phone}`, accessibleLabel: `${this.phoneLabel[this.language]}: ${this.phone}`, theme: theme }, this.phone)))), this.buttonUrl && this.buttonText && (h("div", { key: 'eb199cf8f4f83cb7ebebbfb2e791c78b6424091e', class: "call-to-action" }, h("duet-button", { key: 'c8e0d2d72d5b15a74b0d7fd79a595c6ffddf6f7e', variation: "default", icon: this.buttonIcon, fixed: true, margin: "none", url: this.buttonUrl, theme: theme }, this.buttonText))), h("div", { key: '5e2f0915b883c85ad3bca3f54b62347af8250749' }), h("slot", { key: '388383ea2ca2a756a28d13bdbf521cd85094526a' }))));
     }
     static get is() { return "duet-contact-card"; }
     static get encapsulation() { return "shadow"; }