Merge pull request #780 from MifdhaM/lan-1006-icon

LAN-1006: Unarchive icon added to OXD icons and reject button color changed
orangehrm · May 14, 2024 · a9f813f · a9f813f
2 parents a7d9b93 + f1af957
commit a9f813f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+2024-05-14 - f91c5a9ac899c5e8a431447d7611d95b9ca38cce - styles/_colors.scss - label-feedback-reject color changed
+
+2024-05-14 - f91c5a9ac899c5e8a431447d7611d95b9ca38cce - Icon/icons.ts - Add oxd-unarchive icon
+
 2024-05-09 - 5a8b404db53df944733a36a373b1429c98a6d79d - Button/button.scss, Button/types.ts, Button/_variables.scss, styles/_colors.scss - Add label-feedback-reject button
 
 2024-05-06 - 78c22c31a971adbf9a9c146f871994bcf7eaa648 - components/LinearProgress/LinearProgress.vue - Add new component LinearProgress to support linear progress

diff --git a/components/src/core/components/Button/_variables.scss b/components/src/core/components/Button/_variables.scss
@@ -319,7 +319,7 @@ $oxd-button-color--label-feedback-success-inactive: $oxd-interface-gray-lighten-
 $oxd-button-font-color--label-feedback-reject: $oxd-feedback-reject-color !default;
 $oxd-button-color--label-feedback-reject: rgba(
   $oxd-feedback-reject-color,
-  0.2
+  0.1
 ) !default;
 $oxd-button-color--label-feedback-reject-pressed: rgba(
   $oxd-feedback-reject-color,

diff --git a/components/src/core/components/Icon/icons.ts b/components/src/core/components/Icon/icons.ts
@@ -1541,6 +1541,16 @@ export const oxdTimeZone: icon = {
   M12,6a1,1,0,0,0-1,1v5a1,1,0,0,0,.293.707l3,3a1,1,0,0,0,1.414-1.414L13,11.586V7A1,1,0,0,0,12,6Z"/></svg>`,
 };
 
+export const oxdUnarchive: icon = {
+  name: 'oxd-unarchive',
+  value: `<svg width="100%" height="100%" viewBox="0 0 13 13" style="fill:currentColor" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.30867 13L6.60157 12.2929C6.79683 12.4882 6.79683 12.0976 6.60157 12.2929C6.79683 12.0976 6.40631 12.0976 6.60157 12.2929V9.02408C6.54529 9.02144 6.4903 9.01868 6.43705 9.01601C6.26882 9.00757 6.1181 9 5.99997 9H6.60157H8.40426V8.5C8.40426 8.25148 8.99239 7.9375 9.21676 7.9375H10.6543L9.02926 5.6875C9.008 5.65806 8.97695 5.60208 8.94054 5.53643C8.84494 5.36404 8.71239 5.125 8.62301 5.125L7.59506 5.07768C7.48829 5.07276 7.40426 4.98477 7.40426 4.87789V4.2C7.40426 4.08955 7.4938 4 7.60426 4H8.63875C9.00899 4 9.35915 4.18643 9.59043 4.50667L12.3651 8.5C12.3651 8.54093 12.3664 8.59293 12.3678 8.64854C12.3709 8.77309 12.3745 8.9167 12.3651 9V11.8175C12.2888 12.493 11.7704 13 11.1557 13H7.30867ZM4.89446 13H1.21527C0.600629 13 0.0821716 12.493 0.00593437 11.8175L0.00601817 9C0.00262057 8.9699 0.000921066 8.95995 0.000282665 8.95621L0 8.95371C0.000979347 8.95057 0.0060148 8.93436 0.00598777 8.71284L2.78059 4.50667C3.01187 4.18643 3.36203 4 3.73227 4H4.76676C4.87722 4 4.96676 4.08955 4.96676 4.2V4.925C4.96676 5.03546 4.87722 5.125 4.76676 5.125H4.15426H3.74801L1.71676 7.9375H3.15426C3.37863 7.9375 3.96676 8.25148 3.96676 8.5V9H5.60157H5.99997C5.88406 9 5.74777 9.00729 5.60157 9.01554L5.60159 12.2929C5.79686 12.0976 5.40633 12.0976 5.60159 12.2929C5.40633 12.0976 5.40633 12.4882 5.60159 12.2929L4.89446 13ZM6.60157 7.67188C5.99997 8 5.60157 7.67188 5.60157 7.67188V1.70711L4.45512 2.85355C4.25986 3.04882 3.94328 3.04882 3.74801 2.85355C3.55275 2.65829 3.55275 2.34171 3.74801 2.14645L5.74801 0.146446C5.94328 -0.0488155 6.25986 -0.0488155 6.45512 0.146446L8.45512 2.14645C8.65038 2.34171 8.65038 2.65829 8.45512 2.85355C8.25986 3.04882 7.94328 3.04882 7.74801 2.85355L6.60157 1.70711C6.60157 1.70711 6.60157 5.30868 6.60157 7.67188Z" style="fill:currentColor"/>
+    <path d="M5.60159 12.2929L4.89446 13H7.30867L6.60157 12.2929V9.02408L5.60157 9.01554L5.60159 12.2929Z" style="fill:currentColor"/>
+    <path d="M6.60157 12.2929C6.79683 12.0976 6.40631 12.0976 6.60157 12.2929C6.79683 12.4882 6.79683 12.0976 6.60157 12.2929Z" style="fill:currentColor"/>
+    <path d="M5.60159 12.2929C5.40633 12.0976 5.40633 12.4882 5.60159 12.2929C5.79686 12.0976 5.40633 12.0976 5.60159 12.2929Z" style="fill:currentColor"/>
+    </svg>`,
+};
+
 const icons: Icons = {
   'oxd-likes': oxdLikes,
   'oxd-birthday': oxdBirthday,
@@ -1716,6 +1726,7 @@ const icons: Icons = {
   'oxd-tick-circle': oxdTickCircle,
   'oxd-shortlist': oxdShortlist,
   'oxd-time-zone': oxdTimeZone,
+  'oxd-unarchive': oxdUnarchive,
 };
 
 export default icons;
diff --git a/components/src/styles/_colors.scss b/components/src/styles/_colors.scss
@@ -30,7 +30,7 @@ $oxd-feedback-info-color: #1e6ceb !default;
 $oxd-feedback-danger-color: #eb0910 !default;
 $oxd-feedback-warn-color: #ffa62f !default;
 $oxd-feedback-success-color: #34bc40 !default;
-$oxd-feedback-reject-color: #ffaa00 !default;
+$oxd-feedback-reject-color: #ac0c0c !default;
 
 $oxd-white-color: #ffffff !default;
 $oxd-black-color: #000000 !default;