Merge pull request #75 from qld-gov-au/remove-force-hypoerlink-open-i…

…n-new-window sync main branch
qld-gov-au · Jul 7, 2022 · 300353b · 300353b
2 parents 2206707 + 9f931ab
commit 300353b
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/src/components/PlsPlusAddress/sass/plsPlusAddress.swe.scss b/src/components/PlsPlusAddress/sass/plsPlusAddress.swe.scss
@@ -0,0 +1,25 @@
+// copy style from https://github.com/qld-gov-au/qg-web-template src/assets/_project/_blocks/components/forms/_qg-forms.scss #319
+.formio-component-plsplusaddress {
+  display: inline-grid;
+  //Fallback
+  display: grid;
+  div.col-form-label {
+    order: 0;
+  }
+  div.text-muted {
+    order: 1;
+    margin-bottom: 0.25rem;
+  }
+  div.formio-errors {
+    order: 2;
+    margin-bottom: 0.5rem;
+  }
+  div[ref="element"],
+  div.row,
+  div.form-radio,
+  div.checkbox,
+  div.address-nested,
+  div.address-autocomplete-container {
+    order: 3;
+  }
+}
diff --git a/src/components/Radio/sass/radio.ds.scss b/src/components/Radio/sass/radio.ds.scss
@@ -1,7 +1,7 @@
 // design system style
-.formio-form {
+.formio-component-radio {
   // new custom class `radio-tab`
-  .radio-tab {
+  &.radio-tab {
     .radio.form-check {
       border: 3px solid grey;
     }

diff --git a/src/components/Radio/sass/radio.swe.scss b/src/components/Radio/sass/radio.swe.scss
@@ -1,6 +1,6 @@
-.formio-form {
+.formio-component-radio {
   // new custom class `radio-tab`
-  .radio-tab {
+  &.radio-tab {
     .radio.form-check {
       border: 1px solid grey;
       border-radius: 3px;

diff --git a/src/templates/bootstrap/plsPlusAddress/form.ejs b/src/templates/bootstrap/plsPlusAddress/form.ejs
@@ -35,7 +35,7 @@
   </div>
 {% } %}
 {% if (ctx.self.manualModeEnabled && ( ctx.mode.manual || ctx.displayValue)) { %}
-  <div ref="{{ ctx.nestedKey }}">
+  <div ref="{{ ctx.nestedKey }}" class="address-nested">
     {{ ctx.children }}
   </div>
 {% } %}