Merge release/2.3.0 into develop branch (#1082)

user-interviews · Nov 27, 2023 · bf2949b · bf2949b
1 parent ab3f3ba
commit bf2949b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@user-interviews/ui-design-system",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "dependencies": {
     "@tiptap/core": "^2.0.3",
     "@tiptap/extension-bold": "^2.0.3",

diff --git a/src/Alert/Alert.scss b/src/Alert/Alert.scss
@@ -322,6 +322,20 @@
   }
 }
 
+.Alert-feature {
+  background-color: $ux-teal-100;
+  color: $ux-teal-800;
+  border: 2px solid $ux-teal-600;
+
+  .close {
+    @include close-action($ux-teal-600, $ux-teal-800)
+  }
+
+  .primary-action {
+    @include primary-action($ux-teal-600, $ux-teal-700, $ux-white)
+  }
+}
+
 .Alert-warning {
   background-color: $ux-yellow-100;
   color: $ux-yellow-900;

diff --git a/src/Dropdown/DropdownToggle.scss b/src/Dropdown/DropdownToggle.scss
@@ -23,6 +23,10 @@ $warning: $ux-yellow-400;
     all: unset;
   }
 
+  &--unstyled {
+    all: unset;
+  }
+
   i, svg {
     &.icon-left {
       margin-right: $ux-spacing-20;

diff --git a/src/FormGroup/FormGroup.jsx b/src/FormGroup/FormGroup.jsx
@@ -91,7 +91,6 @@ export default function FormGroup(props) {
           {renderErrors(errorMessage)}
         </div>
       )}
-
     </>
   );