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

Commit 6a12dec

Browse files
committed
Merge branch 'main' into update-package-jsons
2 parents 2f4ed0e + 67ce111 commit 6a12dec

18 files changed

Lines changed: 5803 additions & 6361 deletions

File tree

‎package-lock.json‎

Lines changed: 5688 additions & 6356 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/terra-core-docs/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Unreleased
44

5+
* Changed
6+
* Updated `one-cerner-style-icons` library to v1.53.0
57
* Added
68
* Added test example for `terra-form-select`.
79

‎packages/terra-core-docs/src/terra-dev-site/doc/icon/example/IconThemeable.jsx‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ import {
125125
IconMedicationTabletHalf,
126126
IconMedicationTabletHalfOutline,
127127
IconMedicationTabletOutline,
128+
IconMedicationTabletQuarter,
129+
IconMedicationTabletQuarterOutline,
128130
IconMenu,
129131
IconMerge,
130132
IconMicrophone,
@@ -133,6 +135,7 @@ import {
133135
IconMinus,
134136
IconMissedCall,
135137
IconModified,
138+
IconMultipleResultsCorner,
136139
IconMultipleResultsCritical,
137140
IconMultipleResultsNormal,
138141
IconMultipleResultsNotNormal,
@@ -1364,6 +1367,24 @@ const IconAll = () => (
13641367
</code>
13651368
</td>
13661369
</tr>
1370+
<tr style={{ backgroundColor: '#EEEEEE' }}>
1371+
<td style={cellStyle}><IconMedicationTabletQuarter height='2em' width='2em' /></td>
1372+
<td style={cellStyle}>medicationTabletQuarter</td>
1373+
<td style={{ fontWeight: 'bold', padding: '0.5rem' }}>
1374+
<code>
1375+
import { IconMedicationTabletQuarter } from 'terra-icon';
1376+
</code>
1377+
</td>
1378+
</tr>
1379+
<tr style={{ backgroundColor: '#EEEEEE' }}>
1380+
<td style={cellStyle}><IconMedicationTabletQuarterOutline height='2em' width='2em' /></td>
1381+
<td style={cellStyle}>medicationTabletQuarterOutline</td>
1382+
<td style={{ fontWeight: 'bold', padding: '0.5rem' }}>
1383+
<code>
1384+
import { IconMedicationTabletQuarterOutline } from 'terra-icon';
1385+
</code>
1386+
</td>
1387+
</tr>
13671388
<tr style={{ backgroundColor: '#EEEEEE' }}>
13681389
<td style={cellStyle}><IconMenu height='2em' width='2em' /></td>
13691390
<td style={cellStyle}>menu</td>
@@ -1436,6 +1457,15 @@ const IconAll = () => (
14361457
</code>
14371458
</td>
14381459
</tr>
1460+
<tr style={{ backgroundColor: '#EEEEEE' }}>
1461+
<td style={cellStyle}><IconMultipleResultsCorner height='2em' width='2em' /></td>
1462+
<td style={cellStyle}>multipleResultsCorner</td>
1463+
<td style={{ fontWeight: 'bold', padding: '0.5rem' }}>
1464+
<code>
1465+
import { IconMultipleResultsCorner } from 'terra-icon';
1466+
</code>
1467+
</td>
1468+
</tr>
14391469
<tr style={{ backgroundColor: '#EEEEEE' }}>
14401470
<td style={cellStyle}><IconMultipleResultsCritical height='2em' width='2em' /></td>
14411471
<td style={cellStyle}>multipleResultsCritical</td>

‎packages/terra-core-docs/src/terra-dev-site/test/icon/IconAll.test.jsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,11 @@ import {
177177
IconMediaRewind,
178178
IconMediaStop,
179179
IconMedicationTablet,
180+
IconMedicationTabletOutline,
180181
IconMedicationTabletHalf,
181182
IconMedicationTabletHalfOutline,
182-
IconMedicationTabletOutline,
183+
IconMedicationTabletQuarter,
184+
IconMedicationTabletQuarterOutline,
183185
IconMenu,
184186
IconMerge,
185187
IconMicrophone,
@@ -191,6 +193,7 @@ import {
191193
IconModerate,
192194
IconModerateLowLight,
193195
IconModified,
196+
IconMultipleResultsCorner,
194197
IconMultipleResultsCritical,
195198
IconMultipleResultsNormal,
196199
IconMultipleResultsNotNormal,
@@ -511,6 +514,8 @@ const IconAll = () => (
511514
<IconMedicationTabletOutline className={cx(['icon'])} />
512515
<IconMedicationTabletHalf className={cx(['icon'])} />
513516
<IconMedicationTabletHalfOutline className={cx(['icon'])} />
517+
<IconMedicationTabletQuarter className={cx(['icon'])} />
518+
<IconMedicationTabletQuarterOutline className={cx(['icon'])} />
514519
<IconMenu className={cx(['icon'])} />
515520
<IconMerge className={cx(['icon'])} />
516521
<IconMicrophone className={cx(['icon'])} />
@@ -522,6 +527,7 @@ const IconAll = () => (
522527
<IconModerate className={cx(['icon'])} />
523528
<IconModerateLowLight className={cx(['icon'])} />
524529
<IconModified className={cx(['icon'])} />
530+
<IconMultipleResultsCorner className={cx(['icon'])} />
525531
<IconMultipleResultsNormal className={cx(['icon'])} />
526532
<IconMultipleResultsNotNormal className={cx(['icon'])} />
527533
<IconMultipleResultsCritical className={cx(['icon'])} />

‎packages/terra-icon/CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
* Changed
6+
* Updated `one-cerner-style-icons` library to v1.53.0.
7+
58
## 3.60.0 - (February 15, 2024)
69

710
* Changed

‎packages/terra-icon/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"devDependencies": {
4444
"csvtojson": "2",
4545
"jsdom": "21",
46-
"one-cerner-style-icons": "https://github.com/cerner/one-cerner-style-icons/archive/v1.51.0.tar.gz",
46+
"one-cerner-style-icons": "https://github.com/oracle-samples/one-cerner-style-icons/archive/v1.53.0.tar.gz",
4747
"shelljs": "^0.8.2",
4848
"svgo": "3"
4949
},

‎packages/terra-icon/src/cerner-one-icons.csv‎

100644100755
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,10 @@ noResults,src/icons/0225_noResults_i_48.svg,themeable,,
292292
navStackUp,src/icons/0226_NavStackUp_Icon_a_48.svg,themeable,,
293293
multipleResultsNormal,src/icons/0236_MultipleResults_Normal_Icon_i_48.svg,themeable,,
294294
multipleResultsNotNormal,src/icons/0236_MultipleResults_NotNormal_Icon_i_48.svg,themeable,,
295+
multipleResultsCorner,src/icons/0236_MultipleResults_Corner_i.svg,themeable,,
295296
multipleResultsCritical,src/icons/0236_MultipleResults_Critical_Icon_i_48.svg,themeable,,
297+
medicationTabletQuarter,src/icons/0237_MedicationTablet_Quarter_Fill_48.svg,themeable,,
298+
medicationTabletQuarterOutline,src/icons/0237_MedicationTablet_Quarter_Outline_48.svg,themeable,,
296299
statusPositive_low_light,src/icons/LL_0213_statusPositive_i_lightDiamond.svg,,,
297300
statusPositiveWhite_low_light,src/icons/LL_0214_statusPositive_i_lightDiamondWhite.svg,,,
298301
circle_symbol,src/icons/S_0001_circle.svg,themeable,,

‎packages/terra-icon/src/icon-data.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* eslint-disable */
2+
import React from 'react';
3+
import IconBase from '../IconBase';
4+
5+
const SvgIcon = (customProps) => {
6+
const attributes = Object.assign({}, customProps);
7+
8+
return (
9+
<IconBase {...attributes}>
10+
<path fill="#231f20" d="M.05 25.5C.79 37.56 10.44 47.2 22.5 47.95V25.5H.05Z" ></path>
11+
</IconBase>
12+
);
13+
};
14+
15+
SvgIcon.displayName = "IconMedicationTabletQuarter";
16+
SvgIcon.defaultProps = {"viewBox":"0 0 48 48","xmlns":"http://www.w3.org/2000/svg"};
17+
18+
export default SvgIcon;
19+
/* eslint-enable */
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/* eslint-disable */
2+
import React from 'react';
3+
import IconBase from '../IconBase';
4+
5+
const SvgIcon = (customProps) => {
6+
const attributes = Object.assign({}, customProps);
7+
8+
return (
9+
<IconBase {...attributes}>
10+
<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>
11+
</IconBase>
12+
);
13+
};
14+
15+
SvgIcon.displayName = "IconMedicationTabletQuarterOutline";
16+
SvgIcon.defaultProps = {"viewBox":"0 0 48 48","xmlns":"http://www.w3.org/2000/svg"};
17+
18+
export default SvgIcon;
19+
/* eslint-enable */

0 commit comments

Comments
 (0)