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.

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

Misc - Merge preview release with new icons and alabaster default #8322

Merged
merged 57 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from 56 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
233f212
Tweaks for Headers
tjamesallen15 Oct 11, 2023
52d97da
Tweaks for Tabs Header
tjamesallen15 Oct 12, 2023
8f6a5b2
Merge branch 'main' into 7861-alabaster-default
tjamesallen15 Oct 12, 2023
d2b8ad4
Added Changelog
tjamesallen15 Oct 12, 2023
cb66969
Skip Puppeteer
tjamesallen15 Oct 12, 2023
1ab022b
Tweaks for Personalize
tjamesallen15 Oct 14, 2023
d26f284
Tweaks for Colors
tjamesallen15 Oct 14, 2023
26c041d
Merge branch 'main' into 7861-alabaster-default
tmcconechy Oct 18, 2023
8c36165
Merge branch 'main' into 7861-alabaster-default
tjamesallen15 Oct 23, 2023
330929b
Fix Tim Findings
tjamesallen15 Oct 23, 2023
fdf3c0c
Fix Colors, Hovers
tjamesallen15 Oct 23, 2023
ea4e8aa
Fix Classic Search
tjamesallen15 Oct 23, 2023
f7ec1a9
Merge pull request #8068 from infor-design/7861-alabaster-default
tmcconechy Oct 30, 2023
9762b98
Merge branch 'main' of github.com:infor-design/enterprise into ids-en…
tmcconechy Nov 3, 2023
0cc7eb8
Add new icons and icon adjustments
tmcconechy Nov 6, 2023
db85481
Add some docu
tmcconechy Nov 6, 2023
2d1388c
Update package
tmcconechy Nov 6, 2023
a4af48b
Added lint fixes
tmcconechy Nov 6, 2023
e3038f5
Merge pull request #8146 from infor-design/8129-new-icons
tmcconechy Nov 6, 2023
6053b20
Fix replace all
tmcconechy Nov 6, 2023
cac8331
Bump version
tmcconechy Nov 6, 2023
01aac07
Fix package.lock
tmcconechy Nov 6, 2023
690f99f
Add verify command
tmcconechy Nov 6, 2023
bc900ca
Release v4.89.0-dev.0
corpulent Nov 6, 2023
f5a811b
Fix page and example height
tmcconechy Nov 6, 2023
03bea71
Added icon fixes
tmcconechy Nov 7, 2023
b951b62
Merge branch 'main' of github.com:infor-design/enterprise into preview
tmcconechy Nov 7, 2023
f8cd78d
Added personalization color changes
tmcconechy Nov 7, 2023
d4fb556
Added lint fixes
tmcconechy Nov 7, 2023
535b82c
Merge branch 'preview' of github.com:infor-design/enterprise into 812…
tmcconechy Nov 8, 2023
e3c88c3
Fix merge conflict
tmcconechy Nov 8, 2023
fe1dd22
Merge branch 'main' of github.com:infor-design/enterprise into 8129-n…
tmcconechy Nov 8, 2023
fde78f1
Merge pull request #8145 from infor-design/8129-new-icons
tmcconechy Nov 8, 2023
0925dc5
Added new CHANGELOG entries
tmcconechy Nov 8, 2023
39fe3e9
Merge branch 'main' of github.com:infor-design/enterprise into preview
tmcconechy Nov 9, 2023
aba248a
Fix icon size
tmcconechy Nov 9, 2023
f10b35f
Merge branch 'preview' into 8151-personalization-colors
tmcconechy Nov 9, 2023
95b5dfd
Fixed lint and sync change log
tmcconechy Nov 9, 2023
aaeee47
Merge pull request #8153 from infor-design/8151-personalization-colors
tmcconechy Nov 13, 2023
ab15869
Merge branch 'main' of github.com:infor-design/enterprise into preview
tmcconechy Nov 17, 2023
68c3871
Merge branch 'preview' of github.com:infor-design/enterprise into pre…
tmcconechy Nov 17, 2023
11f3606
Fix replace
tmcconechy Nov 17, 2023
a5312d8
Release v4.90.0-dev.0
corpulent Nov 17, 2023
c95a37a
Bump version
tmcconechy Dec 5, 2023
ccab07b
Release v4.90.0-beta.0
corpulent Dec 5, 2023
75ffacd
Add lookup fix
tmcconechy Dec 7, 2023
c183abe
Release v4.90.0
corpulent Dec 7, 2023
cfea337
Merge tag '4.90.0' of github.com:infor-design/enterprise into preview
tmcconechy Jan 8, 2024
7c5a2ec
Release v4.92.0-dev.0
corpulent Jan 8, 2024
02271f5
Merge branch 'preview' of github.com:infor-design/enterprise into mer…
tmcconechy Jan 8, 2024
6e3a0f8
Sync lock file
tmcconechy Jan 8, 2024
58302db
Fix lint issues
tmcconechy Jan 8, 2024
de7c139
Merge branch 'main' of github.com:infor-design/enterprise into merge-…
tmcconechy Jan 9, 2024
b0efdb9
Merge branch 'main' of github.com:infor-design/enterprise into merge-…
tmcconechy Jan 11, 2024
2b731b7
Merge branch 'main' of github.com:infor-design/enterprise into merge-…
tmcconechy Jan 11, 2024
b867de2
Merge branch 'main' of github.com:infor-design/enterprise into merge-…
tmcconechy Jan 11, 2024
7676310
Merge branch 'main' into merge-preview
tmcconechy Jan 12, 2024
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: 4 additions & 0 deletions app/data/icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ const __dirname = path.dirname(__filename);
* http://localhost:4000/api/icons?theme=classic
* or
* http://localhost:4000/api/icons?theme=new
* or
* http://localhost:4000/api/icons?theme=new-default
* or
* http://localhost:4000/api/icons?theme=new-old
* @param {object} req Node request
* @param {object} res Node reponse
*/
Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"form-data": "^4.0.0",
"handlebars": "^4.7.7",
"handlebars-wax": "^6.1.0",
"ids-identity": "4.15.5",
"ids-identity": "4.16.0",
"jquery": "^3.7.0",
"mmm": "^0.2.2",
"node-sass": "^9.0.0",
Expand Down
13 changes: 11 additions & 2 deletions app/src/js/middleware/option-handler-themes.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,17 @@ export default function (app) {
res.opts.theme.mode = req.query.mode.toString().toLowerCase();
}
logger('info', `Setting theme to "theme-${res.opts.theme.name}-${res.opts.theme.mode || req.query.variant}"`);
const svgHtmlPartial = fs.readFileSync(`${iconsPath}/theme-${res.opts.theme.name}-svg.html`).toString();
const svgEmptyHtmlPartial = fs.readFileSync(`${iconsEmptyPath}/theme-${res.opts.theme.name}-svg-empty.html`).toString();

let svgHtmlPartial = '';
let svgEmptyHtmlPartial = '';

if (res.opts.theme.name === 'new') {
svgHtmlPartial = fs.readFileSync(`${iconsPath}/theme-new-default-svg.html`).toString();
svgEmptyHtmlPartial = fs.readFileSync(`${iconsEmptyPath}/theme-new-svg-empty.html`).toString();
} else {
svgHtmlPartial = fs.readFileSync(`${iconsPath}/theme-classic-svg.html`).toString();
svgEmptyHtmlPartial = fs.readFileSync(`${iconsEmptyPath}/theme-classic-svg-empty.html`).toString();
}

// Set icons to the partials
app.locals.partials = {
Expand Down
8 changes: 7 additions & 1 deletion app/src/js/routes/custom-icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,13 @@ export default (url, theme) => {
const fileName = path.basename(url, '.html');
const iconSet = fileName.includes('example-empty-states') ? 'empty' : 'standard';

const metaPath = `node_modules/ids-identity/dist/theme-${theme}/icons/${iconSet}/metadata.json`;
let metaPath = `node_modules/ids-identity/dist/theme-${theme}/icons/${iconSet}/metadata.json`;
if (iconSet === 'standard' && theme === 'new') {
metaPath = 'node_modules/ids-identity/dist/theme-new/icons/default/metadata.json';
}
if (iconSet === 'empty' && theme === 'new') {
metaPath = 'node_modules/ids-identity/dist/theme-new/icons/old/empty/metadata.json';
}
const meta = JSON.parse(fs.readFileSync(metaPath, 'utf-8').toString());

if (iconSet === 'empty') {
Expand Down
8 changes: 4 additions & 4 deletions app/views/components/datagrid/example-grouped-headers.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
columns: columns,
// Numeric Column Span Groups (3 + 1 + 2 + 3 === 9)
columnGroups: [
{ colspan: 3, id: 'group1', name: 'Column Group One', align: 'center' },
{ colspan: 1, id: 'group2', name: 'Column Group Two' },
{ colspan: 2, id: 'group3', name: 'Column Group Three', align: 'right' },
{ colspan: 3, id: 'group4', name: 'Column Group Four', align: 'left' }
{ colspan: 3, id: 'group1', name: 'Column Group One', align: 'center', tooltip: 'test', headerTooltip: 'test' },
{ colspan: 1, id: 'group2', name: 'Column Group Two', tooltip: 'test' },
{ colspan: 2, id: 'group3', name: 'Column Group Three', align: 'right', tooltip: 'test' },
{ colspan: 3, id: 'group4', name: 'Column Group Four', align: 'left', tooltip: 'test' }
],
dataset: data,
columnReorder: true,
Expand Down
2 changes: 2 additions & 0 deletions app/views/components/icons/example-logos.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
width: 70px;
}
</style>


<div class="row">
<div class="twelve columns">
<h2 class="fieldset-title">Icons - Logos</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1>Level Two Detail View</h1>
<section id="maincontent" class="page-container scrollable-flex" role="main">
<section class="scrollable-flex-header is-personalizable">
<div class="content personalize-header">
<div class="row no-bottom-margin bottom-padding">
<div class="row no-bottom-margin bottom-padding top-padding">
<div class="one-fifth column one-half-mobile">
<label class="personalize-text">Item</label>
<p class="name-xl personalize-text">2000 LGE Incorporated</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1>Level Two Detail View</h1>
<section id="maincontent" class="page-container scrollable-flex" role="main">
<section class="scrollable-flex-header">
<div class="content is-personalizable full-width" style="padding: 0;">
<div class="row no-bottom-margin bottom-padding personalize-header">
<div class="row no-bottom-margin bottom-padding personalize-header top-padding">
<div class="one-fifth column one-half-mobile">
<label class="personalize-text">Item</label>
<p class="name-xl personalize-text">2000 LGE Incorporated</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1>Level Two Detail View</h1>
<section id="maincontent" class="page-container scrollable-flex" role="main">
<section class="scrollable-flex-header">
<div class="content is-personalizable full-width" style="padding: 0;">
<div class="row no-bottom-margin bottom-padding personalize-header">
<div class="row no-bottom-margin bottom-padding personalize-header top-padding">
<div class="one-fifth column one-half-mobile">
<label class="personalize-text">Item</label>
<p class="name-xl personalize-text">2000 LGE Incorporated</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/personalize/example-form.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1>Level Two Detail View</h1>
<section id="maincontent" class="page-container scrollable-flex is-personalizable" role="main">
<section class="scrollable-flex-header personalize-header">
<div class="content">
<div class="row no-bottom-margin bottom-padding">
<div class="row no-bottom-margin bottom-padding top-padding">
<div class="one-fifth column one-half-mobile">
<label class="personalize-text">Item</label>
<p class="name-xl personalize-text">2000 LGE Incorporated</p>
Expand Down
4 changes: 2 additions & 2 deletions app/views/components/personalize/example-form2.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ <h1>Level Two Detail View</h1>
</div>
</header>

<section id="maincontent" class="is-personalizable" role="main">
<section id="maincontent" class="is-personalizable page-container" role="main">
<section class="personalize-header">
<div class="content">
<div class="row no-bottom-margin small-bottom-padding">
<div class="row no-bottom-margin small-bottom-padding top-padding">
<div class="one-third column">
<img class="image-round" src="{{basepath}}/images/10.jpg" alt="Photo of Evyn"/>
<br />
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/personalize/test-classes-short.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h1>Custom Personalization Sections</h1>

<div id="maincontent" class="page-container scrollable is-personalizable" role="main">
<div class="personalize-header form-layout-compact personalize-horizontal-bottom-border">
<div class="row l-center">
<div class="row l-center top-padding">
<div class="one-fifth column one-half-mobile">
<span class="object-count personalize-text">
<span>Active <br/> Opportunities</span>
Expand Down
4 changes: 2 additions & 2 deletions app/views/components/personalize/test-form-short.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ <h1>Level Two Detail View</h1>
</div>
</header>

<section id="maincontent" class="is-personalizable" role="main">
<section id="maincontent" class="is-personalizable page-container" role="main">
<section class="personalize-header form-layout-compact">
<div class="content">
<div class="row no-bottom-margin bottom-padding">
<div class="row no-bottom-margin bottom-padding top-padding">
<div class="one-fifth column one-half-mobile">
<label class="personalize-text">Item</label>
<p class="name-xl personalize-text">2000 LGE Incorporated</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/components/personalize/test-form2-short.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h1>Level Two Detail View</h1>
<section id="maincontent" class="is-personalizable" role="main">
<section class="personalize-header form-layout-compact">
<div class="content">
<div class="row no-bottom-margin small-bottom-padding">
<div class="row no-bottom-margin small-bottom-padding top-padding">
<div class="one-third column">
<img class="image-round" src="{{basepath}}/images/10.jpg" alt="Photo of Evyn"/>
<br />
Expand Down
20 changes: 20 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@

## v4.92.0 Features

- `[Icons]` Added new icons which are more substantial in look. ([#8129](https://github.com/infor-design/enterprise/issues/8129))

## v4.92.0 Fixes

- `[Header]` Fixed bottom border styles in dark mode. ([#8152](https://github.com/infor-design/enterprise/issues/8152))
- `[Header/Personalization]` The default color is now alabaster (white) instead of azure. ([#7861](https://github.com/infor-design/enterprise/issues/7861))
- `[Contextual Action Panel]` Fixed alignments of searchfield icons in RTL. ([#8208](https://github.com/infor-design/enterprise/issues/8208))
- `[Link]` Changed selected border color for link card. ([#8225](https://github.com/infor-design/enterprise/issues/8225))
- `[Locale]` Changed all `zh` locales time format as suggested by native speakers. ([#8313](https://github.com/infor-design/enterprise/issues/8313))
Expand Down Expand Up @@ -55,6 +59,12 @@
- `[Searchfield]` Fixed styling issues in RTL. ([#6982](https://github.com/infor-design/enterprise/issues/6982))
- `[Searchfield]` Fixed searchfield stylings in RTL and in mobile viewport. ([#8103](https://github.com/infor-design/enterprise/issues/8103))

## v4.89.1 (Preview)

## v4.89.1 (Preview) Fixes

- `[Personalization]` Fixed incorrect values in the `Soho.theme.personalizationColors` api. ([#8151](https://github.com/infor-design/enterprise/issues/8151))

## v4.90.0

## v4.90.0 Features
Expand Down Expand Up @@ -85,6 +95,16 @@
- `[Fileupload]` Added condition to not allow for input clearing for readonly and disabled. ([#8024](https://github.com/infor-design/enterprise/issues/8024))
- `[Locale]` Added new locales from the translation team. ([#8196](https://github.com/infor-design/enterprise/issues/8196))
- `[Modal]` Adjusted modal title spacing to avoid icon from cropping. ([#8031](https://github.com/infor-design/enterprise/issues/8031))
- `[Datagrid]` Added ability for expandable and summary rows to be updated after cell update. ([#8058](https://github.com/infor-design/enterprise/issues/8058))
- `[Tabs]` Changed all azure components like header and header tabs to be alabaster by default. ([#7861](https://github.com/infor-design/enterprise/issues/7861))

## v4.89.0 (Preview)

## v4.89.0 (Preview) Features

- `[Icons]` Added new icon designs. ([#8129](https://github.com/infor-design/enterprise/issues/8129))
- `[Tabs]` Changed all azure components like header and header tabs to be alabaster by default. ([#7861](https://github.com/infor-design/enterprise/issues/7861))
- `[Timepicker]` Remove `disabled` prop in trigger button on enable call. ([NG#1567](https://github.com/infor-design/enterprise-ng/issues/1567))
- `[Modal]` Fixed the searchfield size when settings has title in toolbar. ([#8025](https://github.com/infor-design/enterprise/issues/8025))
- `[Page-Patterns]` Fixed background on hovered selected tab. ([#8088](https://github.com/infor-design/enterprise/issues/8088))
- `[ProcessIndicator]` Fixed icon alignment in RTL. ([#8168](https://github.com/infor-design/enterprise/issues/8168))
Expand Down
Loading
Loading