Merge branch 'master' into release

freshworks · Jul 14, 2020 · 384db13 · 384db13
2 parents 52aaadc + babc58d
commit 384db13
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/packages/@nucleus/tests/dummy/app/constants/icons.js b/packages/@nucleus/tests/dummy/app/constants/icons.js
@@ -5,6 +5,8 @@ export default [
   "nucleus-circle-info",
   "nucleus-circle-minus",
   "nucleus-circle-plus",
+  "nucleus-circle-warning",
   "nucleus-cross-thin",
-  "nucleus-cross"
+  "nucleus-cross",
+  "nucleus-danger"
 ];
diff --git a/packages/icon/public/assets/icons/nucleus-circle-check.svg b/packages/icon/public/assets/icons/nucleus-circle-check.svg
diff --git a/packages/icon/public/assets/icons/nucleus-circle-info.svg b/packages/icon/public/assets/icons/nucleus-circle-info.svg
diff --git a/packages/icon/public/assets/icons/nucleus-circle-warning.svg b/packages/icon/public/assets/icons/nucleus-circle-warning.svg
diff --git a/packages/icon/public/assets/icons/nucleus-danger.svg b/packages/icon/public/assets/icons/nucleus-danger.svg
diff --git a/packages/inline-banner/addon/constants/nucleus-inline-banner.js b/packages/inline-banner/addon/constants/nucleus-inline-banner.js
@@ -1,8 +1,8 @@
 const ICON_MAP = {
-  'info': 'nucleus-circle-help',
+  'info': 'nucleus-circle-info',
   'success': 'nucleus-circle-check',
-  'warning': 'nucleus-circle-info',
-  'danger': 'nucleus-circle-cross'
+  'warning': 'nucleus-circle-warning',
+  'danger': 'nucleus-danger'
 };
 
 export { ICON_MAP };