Skip to content

Commit

Permalink
Merge f2181a0 into 36ad35b
Browse files Browse the repository at this point in the history
  • Loading branch information
ericangeles committed May 21, 2024
2 parents 36ad35b + f2181a0 commit 179ec73
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
1 change: 1 addition & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

### 1.2.0 Fixes

- `[About]` Removed mobile info from about page. ([#8502](https://github.com/infor-design/enterprise/issues/8502))
- `[PopupMenu]` Fix popupmenu truncation bug for menu items with shortcuts. ([#2250](https://github.com/infor-design/enterprise-wc/issues/2250))
- `[Popupmenu]` Changed the `position-style` default to `fixed` this causes better placement in scroll containers. ([#2289](https://github.com/infor-design/enterprise-wc/issues/2289))
- `[Toolbar]` Converted toolbar tests to playwright. ([#1984](https://github.com/infor-design/enterprise-wc/issues/1984))
Expand Down
5 changes: 2 additions & 3 deletions src/components/ids-about/demos/standalone-css.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ <h1 class="ids-text ids-text-24 bold">IDS Enterprise</h1>
<div class="ids-modal-content" tabindex="0">
<p class="ids-text">Controls Example Application Version No. XX</p>
<p class="ids-text">Fashionable components for fashionable applications.</p>
<p class="ids-text">Copyright © 2021 Infor. All rights reserved. The word and design marks set forth herein are trademarks and/or registered trademarks of Infor and/or its affiliates and subsidiaries. All other trademarks listed herein are the property of their respective owners <a class="ids-hyperlink" href="https://www.infor.com" target="_blank">www.infor.com</a>.</p>
<p class="ids-text">Copyright © 2024 Infor. All rights reserved. The word and design marks set forth herein are trademarks and/or registered trademarks of Infor and/or its affiliates and subsidiaries. All other trademarks listed herein are the property of their respective owners <a class="ids-hyperlink" href="https://www.infor.com" target="_blank">www.infor.com</a>.</p>
<p class="ids-text"><span>Operating System : Mac OS X 10.15.7</span><br/>
<span>Platform : MacIntel</span><br/>
<span>Mobile : false</span><br/>
<span>Locale : en-US</span><br/>
<span>Language : en</span><br/>
<span>Browser : Chrome (92.0.4515.159)</span><br/>
<span>Browser language : en-US</span><br/>
<span>IDS Version : 1.1.0</span></p>
<span>IDS Version : 1.2.0</span></p>
</div>
</div>
</div>
Expand Down
8 changes: 8 additions & 0 deletions src/components/ids-about/ids-about.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
contain: content;
}

.ids-modal {
&.ids-about {
.ids-modal-content.has-scrollbar {
overflow: auto;
}
}
}

.ids-about {
.ids-modal-container {
max-width: var(--ids-about-width-max);
Expand Down
1 change: 0 additions & 1 deletion src/components/ids-about/ids-about.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ export default class IdsAbout extends Base {
const specs = getSpecs();
const element = `<ids-text slot="device" type="p">
<span>${this.localeAPI?.translate('Platform')} : ${specs.platform}</span><br/>
<span>${this.localeAPI?.translate('Mobile')} : ${specs.isMobile}</span><br/>
<span>${this.localeAPI?.translate('Browser')} : ${specs.browser} (${specs.browserVersion})</span><br/>
<span>${this.localeAPI?.translate('Locale')} : ${this.localeAPI?.locale.name || 'en-US'}</span><br/>
<span>${this.localeAPI?.translate('Language')} : ${this.localeAPI?.language.name || 'en'}</span><br/>
Expand Down
1 change: 0 additions & 1 deletion tests/ids-about/ids-about.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ test.describe('IdsAbout tests', () => {
// Check that the clipboard contains correct UUID
expect(clipboardContent).toContain('IDS version');
expect(clipboardContent).toContain('Controls Example Application Version No. XX');
expect(clipboardContent).toContain('Mobile');
expect(clipboardContent).toContain('Platform');
});
});
Expand Down

0 comments on commit 179ec73

Please sign in to comment.