diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index e654aac4a..664e9d215 100644 --- a/addons/core/addon/components/doc-link/index.hbs +++ b/addons/core/addon/components/doc-link/index.hbs @@ -4,5 +4,5 @@ target="_blank" rel="noreferrer noopener" title={{t "actions.get-topic-help"}}> - + diff --git a/addons/core/addon/components/error/message/index.js b/addons/core/addon/components/error/message/index.js index 22c587595..9d9e435db 100644 --- a/addons/core/addon/components/error/message/index.js +++ b/addons/core/addon/components/error/message/index.js @@ -27,13 +27,12 @@ export default class ErrorMessageComponent extends MessageComponent { @computed('args.status') get icon() { switch (this.args.status) { + case '404': + return 'flight-icons/help-16'; case '401': case '403': - return 'disabled'; - case '404': - return 'help-circle-outline'; default: - return 'alert-circle-outline'; + return 'flight-icons/alert-circle-16'; } } diff --git a/addons/core/index.js b/addons/core/index.js index fa6be2662..3646d4641 100644 --- a/addons/core/index.js +++ b/addons/core/index.js @@ -1,4 +1,41 @@ 'use strict'; + +var path = require('path'); + module.exports = { name: require('./package').name, + + included(app) { + this._super.included.apply(this, arguments); + this.includePublic(app); + this.setupSVGO(app); + }, + + /** + * Finds the public folder and includes it into the ember-inline-svg addon. + */ + includePublic(app) { + const publicPath = path.resolve('public'); + const dummyPublicPath = path.resolve('tests/dummy/public'); + + app.options.svg = app.options.svg || {}; + app.options.svg.paths = app.options.svg.paths || []; + + app.options.svg.paths.push(publicPath); + if (this.isDevelopingAddon()) app.options.svg.paths.push(dummyPublicPath); + + this.addons.forEach((addon) => { + if (addon.name === 'ember-inline-svg') addon.included(app); + }); + }, + + /** + * Adjust SVG optimizer defaults (used by ember-inline-svg). + */ + setupSVGO(app) { + app.options.svg = app.options.svg || {}; + app.options.svg.optimize = app.options.svg.optimize || {}; + app.options.svg.optimize.plugins = app.options.svg.optimize.plugins || []; + app.options.svg.optimize.plugins.push({ removeViewBox: false }); + }, }; diff --git a/addons/core/public/app-icons/global.svg b/addons/core/public/app-icons/global.svg index 0e5b84d47..0c5298171 100644 --- a/addons/core/public/app-icons/global.svg +++ b/addons/core/public/app-icons/global.svg @@ -1,3 +1,5 @@ - - - + + + + + \ No newline at end of file diff --git a/addons/core/public/app-icons/org.svg b/addons/core/public/app-icons/org.svg index 238cc8435..213323766 100644 --- a/addons/core/public/app-icons/org.svg +++ b/addons/core/public/app-icons/org.svg @@ -1,3 +1,12 @@ - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/core/public/app-icons/project.svg b/addons/core/public/app-icons/project.svg index 5b9515d08..b65333af2 100644 --- a/addons/core/public/app-icons/project.svg +++ b/addons/core/public/app-icons/project.svg @@ -1,3 +1,8 @@ - - - + + + + + + + + \ No newline at end of file diff --git a/addons/rose/addon/components/rose/badge/index.stories.mdx b/addons/rose/addon/components/rose/badge/index.stories.mdx index 1f91c7beb..d109810c6 100644 --- a/addons/rose/addon/components/rose/badge/index.stories.mdx +++ b/addons/rose/addon/components/rose/badge/index.stories.mdx @@ -13,7 +13,7 @@ When style definition isn't supplied, a default style will be supplied. Styles: outline, dark, informational, informational-outline, success, success-outline, error, error-outline, warning, warning-outline, alert, alert-outline ```html -Badge +Badge ``` @@ -43,11 +43,9 @@ Styles: outline, dark, informational, informational-outline, success, success-ou 'none' ), icon: select('icon', { - 'user-organization': 'user-organization', - 'partner': 'partner', - 'gift-fill': 'gift-fill', + 'flight-icons/org-16': 'flight-icons/org-16', }, - 'user-organization' + 'flight-icons/org-16' ), } }} @@ -58,7 +56,7 @@ Styles: outline, dark, informational, informational-outline, success, success-ou template: hbs` default style outline - default style with icon + default style with icon dark informational informational-outline diff --git a/addons/rose/addon/components/rose/button/index.stories.mdx b/addons/rose/addon/components/rose/button/index.stories.mdx index 7617f0ba3..18235d3ce 100644 --- a/addons/rose/addon/components/rose/button/index.stories.mdx +++ b/addons/rose/addon/components/rose/button/index.stories.mdx @@ -12,7 +12,7 @@ to trigger actions or to submit forms. Avoid using buttons as simple links to other routes. For accessibility, use links instead. ```htmlbars - + Action ``` @@ -49,23 +49,18 @@ other routes. For accessibility, use links instead. iconLeft: select( 'iconLeft', { - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'check-circle-outline' + 'flight-icons/check-circle-16' ), iconRight: select( 'iconRight', { - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'chevron-right', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'chevron-right' + 'flight-icons/clipboard-copy-16' ), onClick: action('clicked'), }, @@ -86,12 +81,10 @@ button in this case for accessibility. iconOnly: select( 'iconOnly', { - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'check-circle-outline' + 'flight-icons/check-circle-16' ), }, }} diff --git a/addons/rose/addon/components/rose/card/link/index.stories.mdx b/addons/rose/addon/components/rose/card/link/index.stories.mdx index 57171eaf6..eaaa20293 100644 --- a/addons/rose/addon/components/rose/card/link/index.stories.mdx +++ b/addons/rose/addon/components/rose/card/link/index.stories.mdx @@ -13,7 +13,7 @@ Card link component wraps content with `LinkTo` component. Supports title and de @title='Card title' @description='Card description' @id='resource_id_1234' - @icon='user-organization' + @icon='flight-icons/org-16' @route='about'/> ``` @@ -32,11 +32,9 @@ Card link component wraps content with `LinkTo` component. Supports title and de description: text('description', 'Card description'), id: text('id', 'resource_id_1234'), icon: select('icon', { - 'user-organization': 'user-organization', - 'partner': 'partner', - 'gift-fill': 'gift-fill', + 'flight-icons/org-16': 'flight-icons/org-16', }, - 'user-organization' + 'flight-icons/org-16' ), }, }} diff --git a/addons/rose/addon/components/rose/cards/index.stories.mdx b/addons/rose/addon/components/rose/cards/index.stories.mdx index 166d8fd83..bb2471b84 100644 --- a/addons/rose/addon/components/rose/cards/index.stories.mdx +++ b/addons/rose/addon/components/rose/cards/index.stories.mdx @@ -18,35 +18,35 @@ A set of cards arranged side-by-side. @title="Card Title" @description="Description" @id="resource_id_1234" - @icon="user-organization" + @icon="flight-icons/org-16" /> `, @@ -62,14 +62,14 @@ A set of cards arranged side-by-side. @title="Card Title" @description="Description" @id="resource_id_1234" - @icon="user-organization" + @icon="flight-icons/org-16" /> ``` diff --git a/addons/rose/addon/components/rose/dialog/index.hbs b/addons/rose/addon/components/rose/dialog/index.hbs index aa03d38de..4f762c6bc 100644 --- a/addons/rose/addon/components/rose/dialog/index.hbs +++ b/addons/rose/addon/components/rose/dialog/index.hbs @@ -27,7 +27,7 @@ title={{@dismissButtonText}} {{on "click" (fn this.dismiss @dismiss)}} > - + @@ -62,7 +62,7 @@ title={{@dismissButtonText}} {{on "click" (fn this.dismiss @dismiss)}} > - + diff --git a/addons/rose/addon/components/rose/dialog/index.stories.mdx b/addons/rose/addon/components/rose/dialog/index.stories.mdx index 9ea81df93..d5d05be52 100644 --- a/addons/rose/addon/components/rose/dialog/index.stories.mdx +++ b/addons/rose/addon/components/rose/dialog/index.stories.mdx @@ -36,12 +36,10 @@ A dialog component with optional modal capabilities. icon: select( 'icon', { - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less' + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'check-circle-outline' + 'flight-icons/check-circle-16' ), style: select( 'style', @@ -60,7 +58,7 @@ A dialog component with optional modal capabilities. diff --git a/addons/rose/addon/components/rose/dropdown/index.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx index 58a0575bf..fae413044 100644 --- a/addons/rose/addon/components/rose/dropdown/index.stories.mdx +++ b/addons/rose/addon/components/rose/dropdown/index.stories.mdx @@ -11,7 +11,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item @@ -31,7 +31,7 @@ A simple dropdown component with support for links and buttons. {{ template: hbs` - + Menu item Menu item @@ -117,7 +117,7 @@ Dropdown supports `danger` styling through `style` attribute. Dropdown indicator can be hidden using `showCaret` attribute. ```html - + Menu item Button menu item diff --git a/addons/rose/addon/components/rose/form/errors/message/index.hbs b/addons/rose/addon/components/rose/form/errors/message/index.hbs index fb4b2ebe0..eb2246b04 100644 --- a/addons/rose/addon/components/rose/form/errors/message/index.hbs +++ b/addons/rose/addon/components/rose/form/errors/message/index.hbs @@ -1,4 +1,4 @@

- + {{yield}}

diff --git a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx index 515c7ca35..026b9526c 100644 --- a/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/group/index.stories.mdx @@ -68,12 +68,10 @@ Renders a form radiofield group. firstFieldIcon: select( 'first icon', { - 'user-organization': 'user-organization', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'user-organization' + 'flight-icons/org-16' ), secondFieldLabel: text('second label', 'Maybe'), secondFieldValue: text('second value', 'maybe'), diff --git a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx index 4d6a4153e..a5540499b 100644 --- a/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/radio/radio/index.stories.mdx @@ -44,10 +44,8 @@ Renders a form radiofield. 'icon', { 'none': null, - 'user-organization': 'user-organization', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, null ), @@ -111,14 +109,12 @@ Renders a form radiofield. 'icon', { 'none': null, - 'user-organization': 'user-organization', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, null ), inline: boolean('inline', false) } }} - \ No newline at end of file + diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index bffd410b7..e1990b552 100644 --- a/addons/rose/addon/components/rose/header/index.stories.mdx +++ b/addons/rose/addon/components/rose/header/index.stories.mdx @@ -27,7 +27,7 @@ A header component that allows three distinct sections to be configured: brand, Menu item Menu item @@ -69,13 +69,11 @@ A header component that allows three distinct sections to be configured: brand, dropdownIcon: select( 'dropdownIcon', { - 'user-square-fill': 'user-square-fill', - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/user-circle-16': 'flight-icons/user-circle-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'user-square-fill' + 'flight-icons/user-circle-16' ), }, }} diff --git a/addons/rose/addon/components/rose/icon/index.stories.mdx b/addons/rose/addon/components/rose/icon/index.stories.mdx index ffb0e32ca..946b7d1cf 100644 --- a/addons/rose/addon/components/rose/icon/index.stories.mdx +++ b/addons/rose/addon/components/rose/icon/index.stories.mdx @@ -7,9 +7,7 @@ import { text, boolean, select } from '@storybook/addon-knobs'; # Icon -Renders a simple icon from [Structure Icons][structure-icons]. - -[structure-icons]: https://github.com/hashicorp/structure-icons +Renders a simple icon. ```htmlbars @@ -24,12 +22,10 @@ Renders a simple icon from [Structure Icons][structure-icons]. name: select( 'name', { - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', - 'unfold-less': 'unfold-less', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'check-circle-outline' + 'flight-icons/check-circle-16' ), } }} diff --git a/addons/rose/addon/components/rose/link-button/index.stories.mdx b/addons/rose/addon/components/rose/link-button/index.stories.mdx index 0ca00a2ee..9b952f6b9 100644 --- a/addons/rose/addon/components/rose/link-button/index.stories.mdx +++ b/addons/rose/addon/components/rose/link-button/index.stories.mdx @@ -12,7 +12,7 @@ Styles supported: primary, secondary, warning, and ghost. Disabling link button is not supported as it is an action on form components only. ```html - + Content ``` @@ -45,21 +45,18 @@ Disabling link button is not supported as it is an action on form components onl iconLeft: select( 'iconLeft', { - 'check-circle-outline': 'check-circle-outline', - 'copy-action': 'copy-action', - 'unfold-more': 'unfold-more', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'copy-action' + 'flight-icons/clipboard-copy-16' ), iconRight: select( 'iconRight', { - 'check-circle-outline': 'check-circle-outline', - 'chevron-right': 'chevron-right', - 'copy-action': 'copy-action', - 'search': 'search', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'chevron-right' + 'flight-icons/clipboard-copy-16' ), }, }} @@ -68,7 +65,7 @@ Disabling link button is not supported as it is an action on form components onl Similar to `Rose::Button`, icon only link button is supported. ```html - + ``` @@ -91,12 +88,10 @@ Similar to `Rose::Button`, icon only link button is supported. iconOnly: select( 'iconOnly', { - 'check-circle-outline': 'check-circle-outline', - 'help-circle-outline': 'help-circle-outline', - 'plus-circle-fill': 'plus-circle-fill', - 'user-square-outline': 'user-square-outline', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/help-16': 'flight-icons/help-16', }, - 'help-circle-outline' + 'flight-icons/help-16' ), }, }} diff --git a/addons/rose/addon/components/rose/list/key-value/index.stories.mdx b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx index b37e554ff..74d65375f 100644 --- a/addons/rose/addon/components/rose/list/key-value/index.stories.mdx +++ b/addons/rose/addon/components/rose/list/key-value/index.stories.mdx @@ -46,7 +46,7 @@ A simple key/value list with support for embedded form fields and buttons. - Remove + Remove @@ -94,7 +94,7 @@ A simple key/value list with support for embedded form fields and buttons. - Remove + Remove diff --git a/addons/rose/addon/components/rose/message/index.stories.mdx b/addons/rose/addon/components/rose/message/index.stories.mdx index 89447aca1..aeb5e042b 100644 --- a/addons/rose/addon/components/rose/message/index.stories.mdx +++ b/addons/rose/addon/components/rose/message/index.stories.mdx @@ -18,7 +18,7 @@ Title can be configured with optional icon and subtitle. {{description}} - + Go back @@ -33,24 +33,23 @@ Title can be configured with optional icon and subtitle. icon: select( 'icon', { - 'alert-circle-outline': 'alert-circle-outline', - 'help-circle-outline': 'help-circle-outline', - 'disabled': 'disabled', + 'flight-icons/alert-circle-16': 'flight-icons/alert-circle-16', + 'flight-icons/help-16': 'flight-icons/help-16', }, - 'help-circle-outline' + 'flight-icons/help-16' ), }, }} ```html - + You must be granted permissions to view this data. Ask your administrator if you think you should have access. - + Go back Need help? diff --git a/addons/rose/addon/components/rose/notification/index.hbs b/addons/rose/addon/components/rose/notification/index.hbs index 04d60df5f..fc0acf33f 100644 --- a/addons/rose/addon/components/rose/notification/index.hbs +++ b/addons/rose/addon/components/rose/notification/index.hbs @@ -26,7 +26,7 @@ {{on "click" @dismiss}} > {{@dismissText}} diff --git a/addons/rose/addon/components/rose/notification/index.js b/addons/rose/addon/components/rose/notification/index.js index 881d11355..b036bec5d 100644 --- a/addons/rose/addon/components/rose/notification/index.js +++ b/addons/rose/addon/components/rose/notification/index.js @@ -8,17 +8,17 @@ export default class RoseNotificationComponent extends Component { */ @computed('style') get icon() { - let icon = 'info-circle-fill'; + let icon = 'flight-icons/info-16'; switch (this.style) { case 'error': - icon = 'cancel-square-fill'; + icon = 'flight-icons/x-square-16'; break; case 'success': - icon = 'check-circle-fill'; + icon = 'flight-icons/check-circle-16'; break; case 'warning': - icon = 'alert-triangle'; + icon = 'flight-icons/alert-triangle-16'; break; } diff --git a/addons/rose/addon/components/rose/table/index.stories.mdx b/addons/rose/addon/components/rose/table/index.stories.mdx index 444419be4..2b56d4242 100644 --- a/addons/rose/addon/components/rose/table/index.stories.mdx +++ b/addons/rose/addon/components/rose/table/index.stories.mdx @@ -122,7 +122,7 @@ Cell shrink should be applied to all the cells in a row. Otherwise the bigger ce - Remove + Remove diff --git a/addons/rose/index.js b/addons/rose/index.js index 6de73c3ca..ebc5a2673 100644 --- a/addons/rose/index.js +++ b/addons/rose/index.js @@ -10,7 +10,7 @@ module.exports = { this._super.included.apply(this, arguments); this.includeStyles(app); - this.includeIcons(app); + this.includeFlightIcons(app); this.includePublic(app); this.setupSVGO(app); }, @@ -45,8 +45,10 @@ module.exports = { * Finds the structure-icons folder and includes it into the * ember-inline-svg addon. */ - includeIcons(app) { - const iconPackagePath = require.resolve('@hashicorp/structure-icons'); + includeFlightIcons(app) { + const iconPackagePath = path.resolve( + '../../node_modules/@hashicorp/flight-icons' + ); const iconsPath = path.resolve(iconPackagePath, '..'); app.options.svg = app.options.svg || {}; diff --git a/addons/rose/package.json b/addons/rose/package.json index 8fdf4eaf3..0e71bbe11 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,7 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", - "@hashicorp/structure-icons": "^1.9.0-0", + "@hashicorp/flight-icons": "0.0.6-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs index e9ace3c02..33694bdca 100644 --- a/addons/rose/tests/dummy/app/templates/playground.hbs +++ b/addons/rose/tests/dummy/app/templates/playground.hbs @@ -19,7 +19,7 @@ Menu item Menu item @@ -82,7 +82,7 @@ - Remove + Remove diff --git a/addons/rose/tests/integration/components/rose/badge-test.js b/addons/rose/tests/integration/components/rose/badge-test.js index 8665085e7..f52964bba 100644 --- a/addons/rose/tests/integration/components/rose/badge-test.js +++ b/addons/rose/tests/integration/components/rose/badge-test.js @@ -17,7 +17,7 @@ module('Integration | Component | rose/badge', function (hooks) { }); test('it renders an icon using @icon', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/button-test.js b/addons/rose/tests/integration/components/rose/button-test.js index d313e9b0a..cebdc50c3 100644 --- a/addons/rose/tests/integration/components/rose/button-test.js +++ b/addons/rose/tests/integration/components/rose/button-test.js @@ -34,14 +34,20 @@ module('Integration | Component | rose/button', function (hooks) { }); test('it supports left and right icons', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-left .rose-icon')); - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-right .rose-icon')); }); test('it supports an icon-only type', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-only .rose-icon')); }); }); diff --git a/addons/rose/tests/integration/components/rose/card/link-test.js b/addons/rose/tests/integration/components/rose/card/link-test.js index af9003ef3..fdbfb31ac 100644 --- a/addons/rose/tests/integration/components/rose/card/link-test.js +++ b/addons/rose/tests/integration/components/rose/card/link-test.js @@ -42,7 +42,7 @@ module('Integration | Component | rose/card/link', function (hooks) { test('it renders with @icon', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); }); diff --git a/addons/rose/tests/integration/components/rose/dropdown-test.js b/addons/rose/tests/integration/components/rose/dropdown-test.js index 24d4d7758..e94b1f09d 100644 --- a/addons/rose/tests/integration/components/rose/dropdown-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown-test.js @@ -24,7 +24,7 @@ module('Integration | Component | rose/dropdown', function (hooks) { }); test('it supports an icon', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('svg')); }); diff --git a/addons/rose/tests/integration/components/rose/dropdown/button-test.js b/addons/rose/tests/integration/components/rose/dropdown/button-test.js index 971e378d6..3b1bc1193 100644 --- a/addons/rose/tests/integration/components/rose/dropdown/button-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown/button-test.js @@ -32,7 +32,9 @@ module('Integration | Component | rose/dropdown/button', function (hooks) { }); test('it supports an icon-only type', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.has-icon-only .rose-icon')); }); }); diff --git a/addons/rose/tests/integration/components/rose/form/radio/radio-test.js b/addons/rose/tests/integration/components/rose/form/radio/radio-test.js index 9f1677571..c7117a1e7 100644 --- a/addons/rose/tests/integration/components/rose/form/radio/radio-test.js +++ b/addons/rose/tests/integration/components/rose/form/radio/radio-test.js @@ -18,7 +18,9 @@ module('Integration | Component | rose/form/radio/radio', function (hooks) { }); test('it supports an icon', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('svg')); }); diff --git a/addons/rose/tests/integration/components/rose/icon-test.js b/addons/rose/tests/integration/components/rose/icon-test.js index 43a429077..c51b16587 100644 --- a/addons/rose/tests/integration/components/rose/icon-test.js +++ b/addons/rose/tests/integration/components/rose/icon-test.js @@ -7,12 +7,14 @@ module('Integration | Component | rose/icon', function (hooks) { setupRenderingTest(hooks); test('it renders', async function (assert) { - await render(hbs``); + await render(hbs``); assert.ok(find('svg')); }); test('it supports optional @size', async function (assert) { - await render(hbs``); + await render( + hbs`` + ); assert.ok(find('.small')); }); }); diff --git a/addons/rose/tests/integration/components/rose/link-button-test.js b/addons/rose/tests/integration/components/rose/link-button-test.js index ac2be94aa..b5d3dbb2f 100644 --- a/addons/rose/tests/integration/components/rose/link-button-test.js +++ b/addons/rose/tests/integration/components/rose/link-button-test.js @@ -35,7 +35,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconLeft', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-left')); @@ -43,7 +43,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports left icon with @iconRight', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-right')); @@ -51,7 +51,7 @@ module('Integration | Component | rose/link-button', function (hooks) { test('it supports only icon with @iconOnly', async function (assert) { await render( - hbs`` + hbs`` ); assert.ok(find('.rose-icon')); assert.ok(find('.has-icon-only')); diff --git a/ui/admin/app/components/copyable/index.js b/ui/admin/app/components/copyable/index.js index 09da77365..0957798fe 100644 --- a/ui/admin/app/components/copyable/index.js +++ b/ui/admin/app/components/copyable/index.js @@ -12,8 +12,8 @@ export default class CopyableComponent extends Component { id = generateComponentID(); copyableButtonId = `copyable-button-${this.id}`; - actionIcon = 'copy-action'; - successIcon = 'copy-success'; + actionIcon = 'flight-icons/clipboard-copy-16'; + successIcon = 'flight-icons/clipboard-checked-16'; actionText = this.args.buttonText; successText = this.args.acknowledgeText; diff --git a/ui/admin/app/components/form/auth-method/oidc/index.hbs b/ui/admin/app/components/form/auth-method/oidc/index.hbs index 08c5e87de..cb1707456 100644 --- a/ui/admin/app/components/form/auth-method/oidc/index.hbs +++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs @@ -177,7 +177,7 @@ - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/host-set/add-hosts/index.hbs b/ui/admin/app/components/form/host-set/add-hosts/index.hbs index 7c851e376..72adf0902 100644 --- a/ui/admin/app/components/form/host-set/add-hosts/index.hbs +++ b/ui/admin/app/components/form/host-set/add-hosts/index.hbs @@ -55,7 +55,7 @@ - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/role/add-principals/index.hbs b/ui/admin/app/components/form/role/add-principals/index.hbs index dc6ad4f5a..1c60623be 100644 --- a/ui/admin/app/components/form/role/add-principals/index.hbs +++ b/ui/admin/app/components/form/role/add-principals/index.hbs @@ -58,7 +58,7 @@ {{t 'resources.role.principal.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/role/grants/index.hbs b/ui/admin/app/components/form/role/grants/index.hbs index 18f1837b9..f3a9e2f1e 100644 --- a/ui/admin/app/components/form/role/grants/index.hbs +++ b/ui/admin/app/components/form/role/grants/index.hbs @@ -74,7 +74,7 @@ diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index 725cdc0bf..6bd2cc647 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -69,9 +69,11 @@ @text={{this.selectedGrantScope.displayName}} @icon={{if this.selectedGrantScope.isProject - 'app-icons/project' + 'flight-icons/grid-16' (if - this.selectedGrantScope.isOrg 'app-icons/org' 'app-icons/global' + this.selectedGrantScope.isOrg + 'flight-icons/org-16' + 'flight-icons/globe-16' ) }} as |dropdown| diff --git a/ui/admin/app/components/form/target/add-credential-libraries/index.hbs b/ui/admin/app/components/form/target/add-credential-libraries/index.hbs index f7f05cf42..628bed983 100644 --- a/ui/admin/app/components/form/target/add-credential-libraries/index.hbs +++ b/ui/admin/app/components/form/target/add-credential-libraries/index.hbs @@ -55,7 +55,7 @@ {{t 'resources.target.credential-library.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/target/add-host-sets/index.hbs b/ui/admin/app/components/form/target/add-host-sets/index.hbs index 0ad80f766..ade5297a6 100644 --- a/ui/admin/app/components/form/target/add-host-sets/index.hbs +++ b/ui/admin/app/components/form/target/add-host-sets/index.hbs @@ -59,7 +59,7 @@ {{t 'resources.target.host-set.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/components/form/user/add-accounts/index.hbs b/ui/admin/app/components/form/user/add-accounts/index.hbs index ac93847f7..778fa7993 100644 --- a/ui/admin/app/components/form/user/add-accounts/index.hbs +++ b/ui/admin/app/components/form/user/add-accounts/index.hbs @@ -59,7 +59,7 @@ {{t 'resources.user.messages.no-accounts.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index 45d9b4bdc..e8f3d4987 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -189,14 +189,6 @@ } } -.doc-link { - .large { - svg { - transform: scale(0.8); - } - } -} - [class*='session-status-'] { color: var(--ui-gray-subtler-2); } diff --git a/ui/admin/app/templates/application.hbs b/ui/admin/app/templates/application.hbs index 9408904ce..daa6f8737 100644 --- a/ui/admin/app/templates/application.hbs +++ b/ui/admin/app/templates/application.hbs @@ -16,7 +16,7 @@ @@ -100,7 +100,7 @@ diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index 65e456c51..9396f280d 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -18,7 +18,7 @@ {{#if @model.isGlobal}} - + {{t 'resources.org.title_plural'}} @@ -28,12 +28,12 @@ {{#if this.session.data.authenticated.isGlobal}} - + {{t 'resources.org.title_plural'}} {{/if}} - + {{t 'resources.project.title_plural'}} @@ -43,12 +43,12 @@ {{#if this.session.data.authenticated.isGlobal}} - + {{t 'resources.org.title_plural'}} {{/if}} - + {{t 'resources.project.title_plural'}} @@ -58,13 +58,13 @@ {{t "resources.group.title_plural"}} {{t "resources.role.title_plural"}} @@ -72,20 +72,20 @@ --}} - + {{t 'resources.session.title_plural'}} - + {{t 'resources.target.title_plural'}} - + {{t 'resources.host-catalog.title_plural'}} {{#if (feature-flag 'credential-store')}} - + {{t 'resources.credential-store.title_plural'}} {{/if}} @@ -95,19 +95,19 @@ {{#unless @model.isProject}} - + {{t 'resources.user.title_plural'}} - + {{t 'resources.group.title_plural'}} - + {{t 'resources.role.title_plural'}} - + {{t 'resources.auth-method.title_plural'}} diff --git a/ui/admin/app/templates/scopes/scope/-header-nav.hbs b/ui/admin/app/templates/scopes/scope/-header-nav.hbs index ebfc3ffad..cd84e45cc 100644 --- a/ui/admin/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/admin/app/templates/scopes/scope/-header-nav.hbs @@ -2,8 +2,8 @@ @text={{this.scopes.selectedOrg.displayName}} @icon={{if this.scopes.selectedOrg.isGlobal - 'app-icons/global' - 'app-icons/org' + 'flight-icons/globe-16' + 'flight-icons/org-16' }} as |dropdown| > @@ -23,7 +23,7 @@ {{#if this.scopes.selectedProject}} {{#each this.scopes.projects as |scope|}} diff --git a/ui/admin/app/templates/scopes/scope/-sidebar.hbs b/ui/admin/app/templates/scopes/scope/-sidebar.hbs index 3b06e303e..08d4b6b46 100644 --- a/ui/admin/app/templates/scopes/scope/-sidebar.hbs +++ b/ui/admin/app/templates/scopes/scope/-sidebar.hbs @@ -1,18 +1,18 @@ - + {{t 'resources.user.title_plural'}} - + {{t 'resources.group.title_plural'}} - + {{t 'resources.role.title_plural'}} - + {{t 'resources.auth-method.title_plural'}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs index cef459d7f..e1e15ecf3 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/-actions.hbs @@ -3,8 +3,10 @@ @text={{t (concat 'states.' @model.attributes.state)}} @icon={{if @model.isInactive - 'disabled' - (if @model.isPrivate 'lock-closed-outline' 'check-circle-outline') + 'flight-icons/x-circle-16' + (if + @model.isPrivate 'flight-icons/lock-16' 'flight-icons/check-circle-16' + ) }} @dropdownRight={{true}} as |dropdown| diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs index c35071bf7..2006e7f52 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs @@ -115,7 +115,7 @@ {{t 'resources.account.messages.welcome.description'}} - + {{t 'resources.account.actions.create'}} diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs index 4bd1bd2a4..15bfeb407 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -129,7 +129,7 @@ @dropdownRight={{true}} @iconOnly={{true}} @showCaret={{false}} - @icon='more-horizontal' + @icon='flight-icons/more-horizontal-16' as |dropdown| > {{#unless authMethod.isPrimary}} @@ -171,7 +171,7 @@ @route='scopes.scope.auth-methods.new' @query={{hash type='password'}} > - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 55977a188..bf7f33f0a 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -16,7 +16,7 @@ }}

@@ -79,7 +79,7 @@ diff --git a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs index b8dbc824f..fa5633bb1 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate/index.hbs @@ -2,7 +2,7 @@ diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs index 2bb3101c2..56d73cdcb 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs @@ -58,7 +58,7 @@ - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index faa489b0b..d59f3c41e 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -82,7 +82,7 @@ {{t 'resources.credential-store.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs index a6512ef59..3979e762a 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs @@ -27,7 +27,7 @@ - + {{t 'resources.group.actions.add-members'}} diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs index cb59fde2e..7c25937c0 100644 --- a/ui/admin/app/templates/scopes/scope/groups/index.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs @@ -72,7 +72,7 @@ {{t 'resources.group.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs index c4a93ee5c..351fb19d7 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs @@ -37,7 +37,7 @@ {{!-- - + {{t "resources.host-set.actions.create-and-add-host"}} --}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index 735dd94e4..1b0a18cb8 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -56,7 +56,7 @@ - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index 262a32a79..6687cbf76 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -58,7 +58,7 @@ {{t 'resources.host.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs index 734825303..62664fc61 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -85,7 +85,7 @@ {{t 'resources.host-catalog.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index d69351c8e..ae8157f05 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -71,7 +71,7 @@ {{t 'resources.role.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs index 03d497c2a..5086502f0 100644 --- a/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/role/principals.hbs @@ -31,7 +31,7 @@ - + {{t 'resources.role.principal.actions.add-principals'}} diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index 93df2c2cd..19a4168d5 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -43,7 +43,11 @@ @title={{scope.name}} @description={{scope.description}} @id={{scope.id}} - @icon={{if scope.isOrg 'app-icons/org' 'app-icons/project'}} + @icon={{if + scope.isOrg + 'flight-icons/org-16' + 'flight-icons/grid-16' + }} @route='scopes.scope' @model={{scope.id}} /> @@ -62,7 +66,7 @@ {{t 'resources.org.description'}} - + {{t 'titles.new'}} @@ -79,7 +83,7 @@ {{t 'resources.project.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/sessions/index.hbs b/ui/admin/app/templates/scopes/scope/sessions/index.hbs index d97fc2fd0..4e00d0eff 100644 --- a/ui/admin/app/templates/scopes/scope/sessions/index.hbs +++ b/ui/admin/app/templates/scopes/scope/sessions/index.hbs @@ -36,7 +36,7 @@ 'session-status-' sessionAggregate.session.status }} - @name='app-icons/action-session' + @name='flight-icons/entry-point-16' @size='medium' /> - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs index e4573894c..a4188a78e 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-credential-libraries.hbs @@ -19,7 +19,7 @@ {{t 'resources.target.credential-library.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs index ddf08b109..af5d5921a 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/add-host-sets.hbs @@ -20,7 +20,7 @@ {{t 'resources.target.host-set.messages.none.description'}} - + {{t 'actions.back'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs index 14d0b4d90..87284cafe 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/credential-libraries.hbs @@ -44,7 +44,7 @@ - + {{t 'resources.target.actions.add-credential-libraries'}} diff --git a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs index ad9f10154..b123d74d3 100644 --- a/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs +++ b/ui/admin/app/templates/scopes/scope/targets/target/host-sets.hbs @@ -34,7 +34,7 @@ - + {{t 'resources.target.actions.add-host-sets'}} diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index ab31bc1cf..b0cf3e83b 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -71,7 +71,7 @@ {{t 'resources.user.description'}} - + {{t 'titles.new'}} diff --git a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs index ed9f6cd24..369e3c08b 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/accounts.hbs @@ -34,7 +34,7 @@ - + {{t 'resources.user.actions.add-accounts'}} diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs index 5d79b28c8..3ded8d49b 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs @@ -20,7 +20,7 @@ {{t 'resources.user.messages.no-accounts.description'}} - + {{t 'actions.back'}} diff --git a/ui/desktop/app/components/copyable/index.js b/ui/desktop/app/components/copyable/index.js index a30ff3aca..6168b8c97 100644 --- a/ui/desktop/app/components/copyable/index.js +++ b/ui/desktop/app/components/copyable/index.js @@ -13,8 +13,8 @@ export default class CopyableComponent extends Component { id = generateComponentID(); copyableButtonId = `copyable-button-${this.id}`; - actionIcon = 'copy-action'; - successIcon = 'copy-success'; + actionIcon = 'flight-icons/clipboard-copy-16'; + successIcon = 'flight-icons/clipboard-checked-16'; actionText = this.args.buttonText; successText = this.args.acknowledgeText; diff --git a/ui/desktop/app/components/hidden-secret/index.hbs b/ui/desktop/app/components/hidden-secret/index.hbs index 6660a77e5..a3181b9a6 100644 --- a/ui/desktop/app/components/hidden-secret/index.hbs +++ b/ui/desktop/app/components/hidden-secret/index.hbs @@ -1,7 +1,11 @@
{{t 'actions.toggle-secret'}} diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index 617f09ea5..d4dcdb408 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -233,14 +233,6 @@ } } -.doc-link { - .large { - svg { - transform: scale(0.8); - } - } -} - [class*='session-status-'] { color: var(--ui-gray-subtler-2); } diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs index 50c65b475..0099725ed 100644 --- a/ui/desktop/app/templates/application.hbs +++ b/ui/desktop/app/templates/application.hbs @@ -21,7 +21,7 @@ {{#if this.isWindowsOS}} @@ -107,7 +107,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index 60ccaefa0..2c48baf83 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -11,7 +11,7 @@ @@ -67,7 +67,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs index b8dbc824f..fa5633bb1 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs @@ -2,7 +2,7 @@ diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs index 4c68c45ca..7df14ea99 100644 --- a/ui/desktop/app/templates/scopes/scope/projects.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects.hbs @@ -2,12 +2,12 @@ - + {{t 'resources.target.title_plural'}} - + {{t 'resources.session.title_plural'}} diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs index 58abacbc3..6c1fb5636 100644 --- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs +++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs @@ -29,7 +29,7 @@ <:header> + @icon='flight-icons/key-16'> <:header> <:body> <:footer> diff --git a/yarn.lock b/yarn.lock index f15ba7c2b..74e7d3c67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,10 +2066,10 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== -"@hashicorp/structure-icons@^1.9.0-0": - version "1.9.2" - resolved "https://registry.yarnpkg.com/@hashicorp/structure-icons/-/structure-icons-1.9.2.tgz#c75f955b2eec414ecb92f3926c79b4ca01731d3c" - integrity sha512-AffJv0V9npr1EWlM1XrpaKPG9PzddV48OE+jspqy7aRoFZB5++oNnPx4MZQKmFInOljnzNwfktVRkJiQHy7haw== +"@hashicorp/flight-icons@0.0.6-beta": + version "0.0.6-beta" + resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.6-beta.tgz#49da48d4966c13ef0636a9853dc208fccc8d5c88" + integrity sha512-GJHFPig7n26mMyMDPuUiD2Szp8wEskkcLKxWGAx0wyCGASYotLgAYHAGfa4uLlUOsIkibxKjc/7Y/0ttQeN9hQ== "@humanwhocodes/config-array@^0.5.0": version "0.5.0"