Merge pull request #180 from localgovdrupal/1.x

PR ahead of 1.2.6
localgovdrupal · Feb 3, 2022 · 91ff38a · 91ff38a
2 parents f413d15 + d8b6be0
commit 91ff38a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/css/components/form-items.css b/css/components/form-items.css
@@ -199,15 +199,15 @@ input[type="submit"]:hover {
   wrapping them.
 */
 
-.form-item-radios {
+.webform-type-radios .form-item {
   position: relative;
   display: block;
   clear: left;
   min-height: 40px;
   margin-bottom: 10px;
   padding-left: 40px;
 }
-.form-item-radios input {
+.webform-type-radios .form-item input {
   position: absolute;
   z-index: 1;
   top: -2px;
@@ -218,14 +218,14 @@ input[type="submit"]:hover {
   cursor: pointer;
   opacity: 0;
 }
-.form-item-radios label {
+.webform-type-radios .form-item label {
   display: inline-block;
   margin-bottom: 0;
   padding: 8px 15px 5px;
   cursor: pointer;
   touch-action: manipulation;
 }
-.form-item-radios [type="radio"] + label::before {
+.webform-type-radios .form-item [type="radio"] + label::before {
   position: absolute;
   top: 0;
   left: 0;
@@ -236,7 +236,7 @@ input[type="submit"]:hover {
   border-radius: 50%;
   background: transparent;
 }
-.form-item-radios [type="radio"] + label::after {
+.webform-type-radios .form-item [type="radio"] + label::after {
   position: absolute;
   top: 10px;
   left: 10px;
@@ -248,14 +248,14 @@ input[type="submit"]:hover {
   border-radius: 50%;
   background: currentColor;
 }
-.form-item-radios [type="radio"]:focus + label::before {
+.webform-type-radios .form-item [type="radio"]:focus + label::before {
   box-shadow: 0 0 0 4px var(--radio-select-focus-color);
 }
-.form-item-radios input:checked + label::after {
+.webform-type-radios .form-item input:checked + label::after {
   opacity: 1;
 }
-.form-item-radios:last-child,
-.form-item-radios:last-of-type {
+.webform-type-radios .form-item:last-child,
+.webform-type-radios .form-item:last-of-type {
   margin-bottom: 0;
 }
 

diff --git a/css/components/messages.css b/css/components/messages.css
@@ -12,15 +12,15 @@
   border: 1px solid;
   border-width: 1px 1px 1px 0;  /* LTR */
   border-radius: 2px;
-  background: no-repeat 10px 17px;  /* LTR */
+  background: no-repeat 10px 21px;  /* LTR */
   overflow-wrap: break-word;
 }
 [dir="rtl"] .messages {
   padding-right: 35px;
   padding-left: 20px;
   text-align: right;
   border-width: 1px 0 1px 1px;
-  background-position: right 10px top 17px;
+  background-position: right 10px top 21px;
 }
 .messages + .messages {
   margin-top: 1.538em;
@@ -38,7 +38,7 @@
   color: #325e1c;
   border-color: #c9e1bd #c9e1bd #c9e1bd transparent;  /* LTR */
   background-color: #f3faef;
-  background-image: url(../../../../misc/icons/73b355/check.svg);
+  background-image: url(../../../../../core/misc/icons/73b355/check.svg);
   box-shadow: -8px 0 0 #77b259; /* LTR */
 }
 [dir="rtl"] .messages--status {
@@ -51,7 +51,7 @@
   color: #734c00;
   border-color: #f4daa6 #f4daa6 #f4daa6 transparent;  /* LTR */
   background-color: #fdf8ed;
-  background-image: url(../../../../misc/icons/e29700/warning.svg);
+  background-image: url(../../../../../core/misc/icons/e29700/warning.svg);
   box-shadow: -8px 0 0 #e09600; /* LTR */
 }
 [dir="rtl"] .messages--warning {
@@ -63,7 +63,7 @@
   color: #a51b00;
   border-color: #f9c9bf #f9c9bf #f9c9bf transparent;  /* LTR */
   background-color: #fcf4f2;
-  background-image: url(../../../../misc/icons/e32700/error.svg);
+  background-image: url(../../../../../core/misc/icons/e32700/error.svg);
   box-shadow: -8px 0 0 #e62600; /* LTR */
 }
 [dir="rtl"] .messages--error {