Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into update-package-jsons
Browse files Browse the repository at this point in the history
  • Loading branch information
sdadn committed May 8, 2024
2 parents 2f4ed0e + 67ce111 commit 6a12dec
Show file tree
Hide file tree
Showing 18 changed files with 5,803 additions and 6,361 deletions.
12,044 changes: 5,688 additions & 6,356 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/terra-core-docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

* Changed
* Updated `one-cerner-style-icons` library to v1.53.0
* Added
* Added test example for `terra-form-select`.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ import {
IconMedicationTabletHalf,
IconMedicationTabletHalfOutline,
IconMedicationTabletOutline,
IconMedicationTabletQuarter,
IconMedicationTabletQuarterOutline,
IconMenu,
IconMerge,
IconMicrophone,
Expand All @@ -133,6 +135,7 @@ import {
IconMinus,
IconMissedCall,
IconModified,
IconMultipleResultsCorner,
IconMultipleResultsCritical,
IconMultipleResultsNormal,
IconMultipleResultsNotNormal,
Expand Down Expand Up @@ -1364,6 +1367,24 @@ const IconAll = () => (
</code>
</td>
</tr>
<tr style={{ backgroundColor: '#EEEEEE' }}>
<td style={cellStyle}><IconMedicationTabletQuarter height='2em' width='2em' /></td>
<td style={cellStyle}>medicationTabletQuarter</td>
<td style={{ fontWeight: 'bold', padding: '0.5rem' }}>
<code>
import { IconMedicationTabletQuarter } from 'terra-icon';
</code>
</td>
</tr>
<tr style={{ backgroundColor: '#EEEEEE' }}>
<td style={cellStyle}><IconMedicationTabletQuarterOutline height='2em' width='2em' /></td>
<td style={cellStyle}>medicationTabletQuarterOutline</td>
<td style={{ fontWeight: 'bold', padding: '0.5rem' }}>
<code>
import { IconMedicationTabletQuarterOutline } from 'terra-icon';
</code>
</td>
</tr>
<tr style={{ backgroundColor: '#EEEEEE' }}>
<td style={cellStyle}><IconMenu height='2em' width='2em' /></td>
<td style={cellStyle}>menu</td>
Expand Down Expand Up @@ -1436,6 +1457,15 @@ const IconAll = () => (
</code>
</td>
</tr>
<tr style={{ backgroundColor: '#EEEEEE' }}>
<td style={cellStyle}><IconMultipleResultsCorner height='2em' width='2em' /></td>
<td style={cellStyle}>multipleResultsCorner</td>
<td style={{ fontWeight: 'bold', padding: '0.5rem' }}>
<code>
import { IconMultipleResultsCorner } from 'terra-icon';
</code>
</td>
</tr>
<tr style={{ backgroundColor: '#EEEEEE' }}>
<td style={cellStyle}><IconMultipleResultsCritical height='2em' width='2em' /></td>
<td style={cellStyle}>multipleResultsCritical</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,11 @@ import {
IconMediaRewind,
IconMediaStop,
IconMedicationTablet,
IconMedicationTabletOutline,
IconMedicationTabletHalf,
IconMedicationTabletHalfOutline,
IconMedicationTabletOutline,
IconMedicationTabletQuarter,
IconMedicationTabletQuarterOutline,
IconMenu,
IconMerge,
IconMicrophone,
Expand All @@ -191,6 +193,7 @@ import {
IconModerate,
IconModerateLowLight,
IconModified,
IconMultipleResultsCorner,
IconMultipleResultsCritical,
IconMultipleResultsNormal,
IconMultipleResultsNotNormal,
Expand Down Expand Up @@ -511,6 +514,8 @@ const IconAll = () => (
<IconMedicationTabletOutline className={cx(['icon'])} />
<IconMedicationTabletHalf className={cx(['icon'])} />
<IconMedicationTabletHalfOutline className={cx(['icon'])} />
<IconMedicationTabletQuarter className={cx(['icon'])} />
<IconMedicationTabletQuarterOutline className={cx(['icon'])} />
<IconMenu className={cx(['icon'])} />
<IconMerge className={cx(['icon'])} />
<IconMicrophone className={cx(['icon'])} />
Expand All @@ -522,6 +527,7 @@ const IconAll = () => (
<IconModerate className={cx(['icon'])} />
<IconModerateLowLight className={cx(['icon'])} />
<IconModified className={cx(['icon'])} />
<IconMultipleResultsCorner className={cx(['icon'])} />
<IconMultipleResultsNormal className={cx(['icon'])} />
<IconMultipleResultsNotNormal className={cx(['icon'])} />
<IconMultipleResultsCritical className={cx(['icon'])} />
Expand Down
3 changes: 3 additions & 0 deletions packages/terra-icon/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

* Changed
* Updated `one-cerner-style-icons` library to v1.53.0.

## 3.60.0 - (February 15, 2024)

* Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/terra-icon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"csvtojson": "2",
"jsdom": "21",
"one-cerner-style-icons": "https://github.com/cerner/one-cerner-style-icons/archive/v1.51.0.tar.gz",
"one-cerner-style-icons": "https://github.com/oracle-samples/one-cerner-style-icons/archive/v1.53.0.tar.gz",
"shelljs": "^0.8.2",
"svgo": "3"
},
Expand Down
3 changes: 3 additions & 0 deletions packages/terra-icon/src/cerner-one-icons.csv
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,10 @@ noResults,src/icons/0225_noResults_i_48.svg,themeable,,
navStackUp,src/icons/0226_NavStackUp_Icon_a_48.svg,themeable,,
multipleResultsNormal,src/icons/0236_MultipleResults_Normal_Icon_i_48.svg,themeable,,
multipleResultsNotNormal,src/icons/0236_MultipleResults_NotNormal_Icon_i_48.svg,themeable,,
multipleResultsCorner,src/icons/0236_MultipleResults_Corner_i.svg,themeable,,
multipleResultsCritical,src/icons/0236_MultipleResults_Critical_Icon_i_48.svg,themeable,,
medicationTabletQuarter,src/icons/0237_MedicationTablet_Quarter_Fill_48.svg,themeable,,
medicationTabletQuarterOutline,src/icons/0237_MedicationTablet_Quarter_Outline_48.svg,themeable,,
statusPositive_low_light,src/icons/LL_0213_statusPositive_i_lightDiamond.svg,,,
statusPositiveWhite_low_light,src/icons/LL_0214_statusPositive_i_lightDiamondWhite.svg,,,
circle_symbol,src/icons/S_0001_circle.svg,themeable,,
Expand Down
2 changes: 1 addition & 1 deletion packages/terra-icon/src/icon-data.json

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions packages/terra-icon/src/icon/IconMedicationTabletQuarter.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* eslint-disable */
import React from 'react';
import IconBase from '../IconBase';

const SvgIcon = (customProps) => {
const attributes = Object.assign({}, customProps);

return (
<IconBase {...attributes}>
<path fill="#231f20" d="M.05 25.5C.79 37.56 10.44 47.2 22.5 47.95V25.5H.05Z" ></path>
</IconBase>
);
};

SvgIcon.displayName = "IconMedicationTabletQuarter";
SvgIcon.defaultProps = {"viewBox":"0 0 48 48","xmlns":"http://www.w3.org/2000/svg"};

export default SvgIcon;
/* eslint-enable */
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* eslint-disable */
import React from 'react';
import IconBase from '../IconBase';

const SvgIcon = (customProps) => {
const attributes = Object.assign({}, customProps);

return (
<IconBase {...attributes}>
<path fill="#231f20" d="M19.5 28.5v16.04c-7.78-1.7-14.34-8.25-16.04-16.04H19.5m3-3H.05C.57 37.26 10.74 47.43 22.5 47.95V25.5Z" ></path>
</IconBase>
);
};

SvgIcon.displayName = "IconMedicationTabletQuarterOutline";
SvgIcon.defaultProps = {"viewBox":"0 0 48 48","xmlns":"http://www.w3.org/2000/svg"};

export default SvgIcon;
/* eslint-enable */
19 changes: 19 additions & 0 deletions packages/terra-icon/src/icon/IconMultipleResultsCorner.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/* eslint-disable */
import React from 'react';
import IconBase from '../IconBase';

const SvgIcon = (customProps) => {
const attributes = Object.assign({}, customProps);

return (
<IconBase {...attributes}>
<path d="M0 0h48v48L22.29 22.29 0 0z" ></path>
</IconBase>
);
};

SvgIcon.displayName = "IconMultipleResultsCorner";
SvgIcon.defaultProps = {"viewBox":"0 0 48 48","xmlns":"http://www.w3.org/2000/svg"};

export default SvgIcon;
/* eslint-enable */
10 changes: 8 additions & 2 deletions packages/terra-icon/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,11 @@ import IconMediaRecord from './icon/IconMediaRecord';
import IconMediaRewind from './icon/IconMediaRewind';
import IconMediaStop from './icon/IconMediaStop';
import IconMedicationTablet from './icon/IconMedicationTablet';
import IconMedicationTabletOutline from './icon/IconMedicationTabletOutline';
import IconMedicationTabletHalf from './icon/IconMedicationTabletHalf';
import IconMedicationTabletHalfOutline from './icon/IconMedicationTabletHalfOutline';
import IconMedicationTabletOutline from './icon/IconMedicationTabletOutline';
import IconMedicationTabletQuarter from './icon/IconMedicationTabletQuarter';
import IconMedicationTabletQuarterOutline from './icon/IconMedicationTabletQuarterOutline';
import IconMenu from './icon/IconMenu';
import IconMerge from './icon/IconMerge';
import IconMicrophone from './icon/IconMicrophone';
Expand All @@ -189,6 +191,7 @@ import IconMissedCall from './icon/IconMissedCall';
import IconModerate from './icon/IconModerate';
import IconModerateLowLight from './icon/IconModerateLowLight';
import IconModified from './icon/IconModified';
import IconMultipleResultsCorner from './icon/IconMultipleResultsCorner';
import IconMultipleResultsCritical from './icon/IconMultipleResultsCritical';
import IconMultipleResultsNormal from './icon/IconMultipleResultsNormal';
import IconMultipleResultsNotNormal from './icon/IconMultipleResultsNotNormal';
Expand Down Expand Up @@ -504,9 +507,11 @@ export {
IconMediaRewind,
IconMediaStop,
IconMedicationTablet,
IconMedicationTabletOutline,
IconMedicationTabletHalf,
IconMedicationTabletHalfOutline,
IconMedicationTabletOutline,
IconMedicationTabletQuarter,
IconMedicationTabletQuarterOutline,
IconMenu,
IconMerge,
IconMicrophone,
Expand All @@ -518,6 +523,7 @@ export {
IconModerate,
IconModerateLowLight,
IconModified,
IconMultipleResultsCorner,
IconMultipleResultsCritical,
IconMultipleResultsNormal,
IconMultipleResultsNotNormal,
Expand Down
1 change: 1 addition & 0 deletions packages/terra-icon/src/svg/MedicationTabletQuarter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/terra-icon/src/svg/MultipleResultsCorner.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6a12dec

Please sign in to comment.