Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8165 - Updated colors in colorpicker #8185

Merged
merged 8 commits into from
Nov 17, 2023
Merged

8165 - Updated colors in colorpicker #8185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4752526
Updated colors for colorpicker.
Nov 15, 2023
55cb6a0
Updated CHANGELOG.md
Nov 15, 2023
74823dc
Updated unit testing values for colorpicker
Nov 15, 2023
fb84d39
Updated unit testing values for colorpicker
Nov 15, 2023
cbb6180
Merge branch 'main' into 8165-updated-color-picker
Nov 16, 2023
c54757b
Updated CHANGELOG.md, fixed issue where logs were duplicated once aft…
Nov 16, 2023
0e7f3ff
changed end of line sequence to LF
Nov 16, 2023
9ddaa47
Updated CHANGELOG.md
Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/components/colorpicker/example-index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<div class="field">
<label for="disabled-color-picker">Disabled Color Picker</label>
<input class="colorpicker" value="#941E1E" disabled="true" id="disabled-color-picker" type="text" />
<input class="colorpicker" value="#8D0B0E" disabled="true" id="disabled-color-picker" type="text" />
</div>
</div>
</div>
Expand All @@ -21,6 +21,6 @@
});

// Set the value and trigger change to have it update in the field.
elem.val('#B94E4E').trigger('change');
elem.val('#DA1217').trigger('change');
});
</script>
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

- `[Badges]` Adjusted color and positioning of dismissible button in multiselect dropdown tags. ([#8036](https://github.com/infor-design/enterprise/issues/8036))
- `[Button]` Adjusted personalize button hover colors. ([#8035](https://github.com/infor-design/enterprise/issues/8035))
- `[Colorpicker]` Updated color palette for colorpicker. ([#8165](https://github.com/infor-design/enterprise/issues/8165))
- `[Datagrid]` Adjusted hover styling for search and expand buttons. ([#8078](https://github.com/infor-design/enterprise/issues/8078))
- `[Datagrid]` Fixed misalignment on date cells when selected. ([#8021](https://github.com/infor-design/enterprise/issues/8021))
- `[Datagrid]` Fixed an issue where the new row did not display an error tooltip on the first cell. ([#8071](https://github.com/infor-design/enterprise/issues/8071))
Expand Down
140 changes: 70 additions & 70 deletions src/components/colorpicker/colorpicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,76 +52,76 @@ const COLORPICKER_DEFAULTS = {
},
customColors: false,
colors: [
{ label: 'Slate', number: '10', value: '1a1a1a' },
{ label: 'Slate', number: '09', value: '292929' },
{ label: 'Slate', number: '08', value: '383838', border: 'dark' },
{ label: 'Slate', number: '07', value: '454545', border: 'dark' },
{ label: 'Slate', number: '06', value: '5C5C5C' },
{ label: 'Slate', number: '05', value: '737373' },
{ label: 'Slate', number: '04', value: '999999' },
{ label: 'Slate', number: '03', value: 'BDBDBD' },
{ label: 'Slate', number: '02', value: 'D8D8D8' },
{ label: 'Slate', number: '01', value: 'F0F0F0', border: 'light, contrast' },
{ label: 'Amber', number: '10', value: 'D66221' },
{ label: 'Amber', number: '09', value: 'DE7223' },
{ label: 'Amber', number: '08', value: 'E68425' },
{ label: 'Amber', number: '07', value: 'EB9728' },
{ label: 'Amber', number: '06', value: 'EFAA30' },
{ label: 'Amber', number: '05', value: 'F2BC41' },
{ label: 'Amber', number: '04', value: 'F4C951' },
{ label: 'Amber', number: '03', value: 'F7D475' },
{ label: 'Amber', number: '02', value: 'F8E09C' },
{ label: 'Amber', number: '01', value: 'FBE9BF' },
{ label: 'Ruby', number: '10', value: '880E0E' },
{ label: 'Ruby', number: '09', value: '941E1E' },
{ label: 'Ruby', number: '08', value: 'A13030' },
{ label: 'Ruby', number: '07', value: 'AD4242' },
{ label: 'Ruby', number: '06', value: 'B94E4E' },
{ label: 'Ruby', number: '05', value: 'C65F5F' },
{ label: 'Ruby', number: '04', value: 'D26D6D' },
{ label: 'Ruby', number: '03', value: 'DE8181' },
{ label: 'Ruby', number: '02', value: 'EB9D9D' },
{ label: 'Ruby', number: '01', value: 'F4BCBC' },
{ label: 'Turquoise', number: '10', value: '0E5B52' },
{ label: 'Turquoise', number: '09', value: '206B62' },
{ label: 'Turquoise', number: '08', value: '317C73' },
{ label: 'Turquoise', number: '07', value: '448D83' },
{ label: 'Turquoise', number: '06', value: '579E95' },
{ label: 'Turquoise', number: '05', value: '69ADA3' },
{ label: 'Turquoise', number: '04', value: '7BBFB5' },
{ label: 'Turquoise', number: '03', value: '8ED1C6' },
{ label: 'Turquoise', number: '02', value: 'A9E1D6' },
{ label: 'Turquoise', number: '01', value: 'C0EDE3' },
{ label: 'Emerald', number: '10', value: '397514' },
{ label: 'Emerald', number: '09', value: '44831F' },
{ label: 'Emerald', number: '08', value: '56932E' },
{ label: 'Emerald', number: '07', value: '66A140' },
{ label: 'Emerald', number: '06', value: '76B051' },
{ label: 'Emerald', number: '05', value: '89BF65' },
{ label: 'Emerald', number: '04', value: '9CCE7C' },
{ label: 'Emerald', number: '03', value: 'AFDC91' },
{ label: 'Emerald', number: '02', value: 'C3E8AC' },
{ label: 'Emerald', number: '01', value: 'D5F6C0' },
{ label: 'Amethyst', number: '10', value: '4B2A5E' },
{ label: 'Amethyst', number: '09', value: '5A3A6F' },
{ label: 'Amethyst', number: '08', value: '6C4B81' },
{ label: 'Amethyst', number: '07', value: '7D5F92' },
{ label: 'Amethyst', number: '06', value: '8E72A4' },
{ label: 'Amethyst', number: '05', value: 'A189B8' },
{ label: 'Amethyst', number: '04', value: 'B59ECA' },
{ label: 'Amethyst', number: '03', value: 'C7B4DB' },
{ label: 'Amethyst', number: '02', value: 'DACCEC' },
{ label: 'Amethyst', number: '01', value: 'EDE3FC' },
{ label: 'Azure', number: '10', value: '133C59' },
{ label: 'Azure', number: '09', value: '134D71' },
{ label: 'Azure', number: '08', value: '1D5F8A' },
{ label: 'Azure', number: '07', value: '2876A8' },
{ label: 'Azure', number: '06', value: '2578A9' },
{ label: 'Azure', number: '05', value: '4EA0D1' },
{ label: 'Azure', number: '04', value: '69B5DD' },
{ label: 'Azure', number: '03', value: '8DC9E6' },
{ label: 'Azure', number: '02', value: 'ADD8EB' },
{ label: 'Azure', number: '01', value: 'C8E9F4' }
{ label: 'Slate', number: '10', value: '161618' },
{ label: 'Slate', number: '09', value: '28282A' },
{ label: 'Slate', number: '08', value: '3B3B3F', border: 'dark' },
{ label: 'Slate', number: '07', value: '525257', border: 'dark' },
{ label: 'Slate', number: '06', value: '6F6F76' },
{ label: 'Slate', number: '05', value: '8E8E95' },
{ label: 'Slate', number: '04', value: 'BBBBBF' },
{ label: 'Slate', number: '03', value: 'C5C5C9' },
{ label: 'Slate', number: '02', value: 'E0E0E1' },
{ label: 'Slate', number: '01', value: 'FAFAFA', border: 'light, contrast' },
{ label: 'Amber', number: '10', value: 'A14100' },
{ label: 'Amber', number: '09', value: 'BB5500' },
{ label: 'Amber', number: '08', value: 'CD6200' },
{ label: 'Amber', number: '07', value: 'DF6F00' },
{ label: 'Amber', number: '06', value: 'F98300' },
{ label: 'Amber', number: '05', value: 'FA9601' },
{ label: 'Amber', number: '04', value: 'FBAF50' },
{ label: 'Amber', number: '03', value: 'FCC888' },
{ label: 'Amber', number: '02', value: 'FDDFBD' },
{ label: 'Amber', number: '01', value: 'FEF2E5' },
{ label: 'Ruby', number: '10', value: '6C080B' },
{ label: 'Ruby', number: '09', value: '8D0B0E' },
{ label: 'Ruby', number: '08', value: 'A30D11' },
{ label: 'Ruby', number: '07', value: 'C31014' },
{ label: 'Ruby', number: '06', value: 'DA1217' },
{ label: 'Ruby', number: '05', value: 'DF3539' },
{ label: 'Ruby', number: '04', value: 'E66467' },
{ label: 'Ruby', number: '03', value: 'EE9496' },
{ label: 'Ruby', number: '02', value: 'F5C3C4' },
{ label: 'Ruby', number: '01', value: 'FBE7E8' },
{ label: 'Turquoise', number: '10', value: '1F5E5E' },
{ label: 'Turquoise', number: '09', value: '297B7B' },
{ label: 'Turquoise', number: '08', value: '2F8D8E' },
{ label: 'Turquoise', number: '07', value: '39A9AA' },
{ label: 'Turquoise', number: '06', value: '40BDBE' },
{ label: 'Turquoise', number: '05', value: '5CC6C7' },
{ label: 'Turquoise', number: '04', value: '82D4D4' },
{ label: 'Turquoise', number: '03', value: 'A8E1E1' },
{ label: 'Turquoise', number: '02', value: 'CFEEEE' },
{ label: 'Turquoise', number: '01', value: 'ECF8F8' },
{ label: 'Emerald', number: '10', value: '156138' },
{ label: 'Emerald', number: '09', value: '1C7F49' },
{ label: 'Emerald', number: '08', value: '1F9254' },
{ label: 'Emerald', number: '07', value: '25AF65' },
{ label: 'Emerald', number: '06', value: '2AC371' },
{ label: 'Emerald', number: '05', value: '4DCC86' },
{ label: 'Emerald', number: '04', value: '78D8A3' },
{ label: 'Emerald', number: '03', value: 'A1E4BF' },
{ label: 'Emerald', number: '02', value: 'CBEFDC' },
{ label: 'Emerald', number: '01', value: 'EBF9F1' },
{ label: 'Amethyst', number: '10', value: '3B1470' },
{ label: 'Amethyst', number: '09', value: '4E1A91' },
{ label: 'Amethyst', number: '08', value: '591DA8' },
{ label: 'Amethyst', number: '07', value: '6C23C9' },
{ label: 'Amethyst', number: '06', value: '7928E1' },
{ label: 'Amethyst', number: '05', value: '8D4BE5' },
{ label: 'Amethyst', number: '04', value: 'A876EB' },
{ label: 'Amethyst', number: '03', value: 'C2A1F1' },
{ label: 'Amethyst', number: '02', value: 'DDCBF7' },
{ label: 'Amethyst', number: '01', value: 'F1EBFC' },
{ label: 'Azure', number: '10', value: '003876' },
{ label: 'Azure', number: '09', value: '004A99' },
{ label: 'Azure', number: '08', value: '0054B1' },
{ label: 'Azure', number: '07', value: '0066D4' },
{ label: 'Azure', number: '06', value: '0072ED' },
{ label: 'Azure', number: '05', value: '1C86EF' },
{ label: 'Azure', number: '04', value: '55A3F3' },
{ label: 'Azure', number: '03', value: '8ABFF7' },
{ label: 'Azure', number: '02', value: 'BEDCFA' },
{ label: 'Azure', number: '01', value: 'E6F1FD' }
],
placeIn: null, // null|'editor'
showLabel: false,
Expand Down
6 changes: 3 additions & 3 deletions test/components/colorpicker/colorpicker-func-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ describe('ColorPicker Methods', () => {
});

it('should get the hex value based on a label', () => {
expect(colorpickerObj.getHexFromLabel('Turquoise10')).toEqual('#0E5B52');
expect(colorpickerObj.getHexFromLabel('Turquoise10')).toEqual('#1F5E5E');
});

it('should get the label value based on a hex', () => {
expect(colorpickerObj.getLabelFromHex('#0E5B52')).toEqual('Turquoise10');
expect(colorpickerObj.getLabelFromHex('#1F5E5E')).toEqual('Turquoise10');
});

it('should set custom width', () => {
Expand All @@ -72,7 +72,7 @@ describe('ColorPicker Methods', () => {

it('should get the current label value', () => {
colorpickerObj.settings.showLabel = true;
colorpickerObj.setColor('#1a1a1a');
colorpickerObj.setColor('#161618');

expect(colorpickerObj.getLabelValue()).toEqual('Slate10');
});
Expand Down
Loading