diff --git a/addons/core/addon/components/doc-link/index.hbs b/addons/core/addon/components/doc-link/index.hbs index c7b7e1a8e..67a788936 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 f121d7d7b..9d9e435db 100644 --- a/addons/core/addon/components/error/message/index.js +++ b/addons/core/addon/components/error/message/index.js @@ -28,11 +28,11 @@ export default class ErrorMessageComponent extends MessageComponent { get icon() { switch (this.args.status) { case '404': - return 'flight/help-16'; + return 'flight-icons/help-16'; case '401': case '403': default: - return 'flight/alert-circle-16'; + return 'flight-icons/alert-circle-16'; } } diff --git a/addons/core/index.js b/addons/core/index.js index f1a668631..3646d4641 100644 --- a/addons/core/index.js +++ b/addons/core/index.js @@ -16,14 +16,12 @@ module.exports = { */ includePublic(app) { const publicPath = path.resolve('public'); - const rosePublicPath = path.resolve('../rose/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); - app.options.svg.paths.push(rosePublicPath); if (this.isDevelopingAddon()) app.options.svg.paths.push(dummyPublicPath); this.addons.forEach((addon) => { diff --git a/addons/rose/addon/components/rose/badge/index.stories.mdx b/addons/rose/addon/components/rose/badge/index.stories.mdx index 1d65b3d0a..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,9 +43,9 @@ Styles: outline, dark, informational, informational-outline, success, success-ou 'none' ), icon: select('icon', { - 'flight/org-16': 'flight/org-16', + 'flight-icons/org-16': 'flight-icons/org-16', }, - 'flight/org-16' + 'flight-icons/org-16' ), } }} @@ -56,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 76010a51c..3b2841c8a 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,18 +49,18 @@ other routes. For accessibility, use links instead. iconLeft: select( 'iconLeft', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + 'flight-icons/check-circle-16' ), iconRight: select( 'iconRight', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/clipboard-copy-16' + 'flight-icons/clipboard-copy-16' ), onClick: action('clicked'), }, @@ -81,10 +81,10 @@ button in this case for accessibility. iconOnly: select( 'iconOnly', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + '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 8aaf7e693..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='flight/org-16' + @icon='flight-icons/org-16' @route='about'/> ``` @@ -32,9 +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', { - 'flight/org-16': 'flight/org-16', + 'flight-icons/org-16': 'flight-icons/org-16', }, - 'flight/org-16' + '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 72c503e85..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="flight/org-16" + @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="flight/org-16" + @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 7876f5349..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 0315a3c87..d5d05be52 100644 --- a/addons/rose/addon/components/rose/dialog/index.stories.mdx +++ b/addons/rose/addon/components/rose/dialog/index.stories.mdx @@ -36,10 +36,10 @@ A dialog component with optional modal capabilities. icon: select( 'icon', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + 'flight-icons/check-circle-16' ), style: select( 'style', @@ -58,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 8ac807a63..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 443829171..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 be4aa2b3f..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,10 +68,10 @@ Renders a form radiofield group. firstFieldIcon: select( 'first icon', { - 'flight/org-16': 'flight/org-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/org-16' + '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 e2f15d63a..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,8 +44,8 @@ Renders a form radiofield. 'icon', { 'none': null, - 'flight/org-16': 'flight/org-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, null ), @@ -109,8 +109,8 @@ Renders a form radiofield. 'icon', { 'none': null, - 'flight/org-16': 'flight/org-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/org-16': 'flight-icons/org-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, null ), diff --git a/addons/rose/addon/components/rose/header/index.stories.mdx b/addons/rose/addon/components/rose/header/index.stories.mdx index be894c503..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,11 +69,11 @@ A header component that allows three distinct sections to be configured: brand, dropdownIcon: select( 'dropdownIcon', { - 'flight/user-circle-16': 'flight/user-circle-16', - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + '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', }, - 'flight/user-circle-16' + '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 d22b1bcac..946b7d1cf 100644 --- a/addons/rose/addon/components/rose/icon/index.stories.mdx +++ b/addons/rose/addon/components/rose/icon/index.stories.mdx @@ -22,10 +22,10 @@ Renders a simple icon. name: select( 'name', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/check-circle-16' + '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 9f8831694..a5cc19106 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,18 +45,18 @@ Disabling link button is not supported as it is an action on form components onl iconLeft: select( 'iconLeft', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/clipboard-copy-16' + 'flight-icons/clipboard-copy-16' ), iconRight: select( 'iconRight', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/clipboard-copy-16': 'flight/clipboard-copy-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/clipboard-copy-16': 'flight-icons/clipboard-copy-16', }, - 'flight/clipboard-copy-16' + 'flight-icons/clipboard-copy-16' ), }, }} @@ -65,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 - + ``` @@ -88,10 +88,10 @@ Similar to `Rose::Button`, icon only link button is supported. iconOnly: select( 'iconOnly', { - 'flight/check-circle-16': 'flight/check-circle-16', - 'flight/help-16': 'flight/help-16', + 'flight-icons/check-circle-16': 'flight-icons/check-circle-16', + 'flight-icons/help-16': 'flight-icons/help-16', }, - 'flight/help-16' + '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 cded0db99..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 60fa1b9f0..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,23 +33,23 @@ Title can be configured with optional icon and subtitle. icon: select( 'icon', { - 'flight/alert-circle-16': 'flight/alert-circle-16', - 'flight/help-16': 'flight/help-16', + 'flight-icons/alert-circle-16': 'flight-icons/alert-circle-16', + 'flight-icons/help-16': 'flight-icons/help-16', }, - 'flight/help-16' + '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 3d9290695..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 c3c23b44b..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 = 'flight/info-16'; + let icon = 'flight-icons/info-16'; switch (this.style) { case 'error': - icon = 'flight/x-square-16'; + icon = 'flight-icons/x-square-16'; break; case 'success': - icon = 'flight/check-circle-16'; + icon = 'flight-icons/check-circle-16'; break; case 'warning': - icon = 'flight/alert-triangle-16'; + 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 0b786556a..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 4da13fee7..ebc5a2673 100644 --- a/addons/rose/index.js +++ b/addons/rose/index.js @@ -10,6 +10,7 @@ module.exports = { this._super.included.apply(this, arguments); this.includeStyles(app); + this.includeFlightIcons(app); this.includePublic(app); this.setupSVGO(app); }, @@ -40,6 +41,26 @@ module.exports = { app.options.sassOptions.includePaths.push(styleTree); }, + /** + * Finds the structure-icons folder and includes it into the + * ember-inline-svg addon. + */ + includeFlightIcons(app) { + const iconPackagePath = path.resolve( + '../../node_modules/@hashicorp/flight-icons' + ); + const iconsPath = path.resolve(iconPackagePath, '..'); + + app.options.svg = app.options.svg || {}; + app.options.svg.paths = app.options.svg.paths || []; + + app.options.svg.paths.push(iconsPath); + + this.addons.forEach((addon) => { + if (addon.name === 'ember-inline-svg') addon.included(app); + }); + }, + /** * Finds the public folder and includes it into the ember-inline-svg addon. */ diff --git a/addons/rose/package.json b/addons/rose/package.json index 88718fbbd..cffa4b44b 100644 --- a/addons/rose/package.json +++ b/addons/rose/package.json @@ -43,6 +43,7 @@ "@ember/test-helpers": "^2.2.8", "@glimmer/component": "^1.0.3", "@glimmer/tracking": "^1.0.3", + "@hashicorp/flight-icons": "^0.0.3-beta", "@storybook/addon-actions": "^6.3.1", "@storybook/addon-docs": "^6.3.1", "@storybook/addon-knobs": "^6.3.0", diff --git a/addons/rose/public/flight/alert-circle-16.svg b/addons/rose/public/flight/alert-circle-16.svg deleted file mode 100644 index 55d000d4c..000000000 --- a/addons/rose/public/flight/alert-circle-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/addons/rose/public/flight/alert-triangle-16.svg b/addons/rose/public/flight/alert-triangle-16.svg deleted file mode 100644 index 9367dbd4c..000000000 --- a/addons/rose/public/flight/alert-triangle-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/arrow-right-circle-16.svg b/addons/rose/public/flight/arrow-right-circle-16.svg deleted file mode 100644 index 24003e7de..000000000 --- a/addons/rose/public/flight/arrow-right-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/check-circle-16.svg b/addons/rose/public/flight/check-circle-16.svg deleted file mode 100644 index 4d296da62..000000000 --- a/addons/rose/public/flight/check-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/chevron-left-16.svg b/addons/rose/public/flight/chevron-left-16.svg deleted file mode 100644 index eeb214c72..000000000 --- a/addons/rose/public/flight/chevron-left-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/clipboard-checked-16.svg b/addons/rose/public/flight/clipboard-checked-16.svg deleted file mode 100644 index 04db58a2c..000000000 --- a/addons/rose/public/flight/clipboard-checked-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/clipboard-copy-16.svg b/addons/rose/public/flight/clipboard-copy-16.svg deleted file mode 100644 index 865e5d45d..000000000 --- a/addons/rose/public/flight/clipboard-copy-16.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/collections-16.svg b/addons/rose/public/flight/collections-16.svg deleted file mode 100644 index cb96ffef0..000000000 --- a/addons/rose/public/flight/collections-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/crosshair-16.svg b/addons/rose/public/flight/crosshair-16.svg deleted file mode 100644 index facad35a7..000000000 --- a/addons/rose/public/flight/crosshair-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/eye-16.svg b/addons/rose/public/flight/eye-16.svg deleted file mode 100644 index 8eb2e59a7..000000000 --- a/addons/rose/public/flight/eye-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/eye-off-16.svg b/addons/rose/public/flight/eye-off-16.svg deleted file mode 100644 index 105f1d3e3..000000000 --- a/addons/rose/public/flight/eye-off-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/folder-users-16.svg b/addons/rose/public/flight/folder-users-16.svg deleted file mode 100644 index bb81c2b6c..000000000 --- a/addons/rose/public/flight/folder-users-16.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/globe-16.svg b/addons/rose/public/flight/globe-16.svg deleted file mode 100644 index 0c5298171..000000000 --- a/addons/rose/public/flight/globe-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/grid-16.svg b/addons/rose/public/flight/grid-16.svg deleted file mode 100644 index b65333af2..000000000 --- a/addons/rose/public/flight/grid-16.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/help-16.svg b/addons/rose/public/flight/help-16.svg deleted file mode 100644 index acaf4b376..000000000 --- a/addons/rose/public/flight/help-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/addons/rose/public/flight/identity-user-16.svg b/addons/rose/public/flight/identity-user-16.svg deleted file mode 100644 index 47cb2ba13..000000000 --- a/addons/rose/public/flight/identity-user-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/info-16.svg b/addons/rose/public/flight/info-16.svg deleted file mode 100644 index 1c7f58c50..000000000 --- a/addons/rose/public/flight/info-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/key-16.svg b/addons/rose/public/flight/key-16.svg deleted file mode 100644 index e3ec42abd..000000000 --- a/addons/rose/public/flight/key-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/lock-16.svg b/addons/rose/public/flight/lock-16.svg deleted file mode 100644 index 5b5dba1c1..000000000 --- a/addons/rose/public/flight/lock-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/more-horizontal-16.svg b/addons/rose/public/flight/more-horizontal-16.svg deleted file mode 100644 index 79143ccd4..000000000 --- a/addons/rose/public/flight/more-horizontal-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/org-16.svg b/addons/rose/public/flight/org-16.svg deleted file mode 100644 index 213323766..000000000 --- a/addons/rose/public/flight/org-16.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/plus-circle-16.svg b/addons/rose/public/flight/plus-circle-16.svg deleted file mode 100644 index 6cef57c52..000000000 --- a/addons/rose/public/flight/plus-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/trash-16.svg b/addons/rose/public/flight/trash-16.svg deleted file mode 100644 index 9686f6d23..000000000 --- a/addons/rose/public/flight/trash-16.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/user-circle-16.svg b/addons/rose/public/flight/user-circle-16.svg deleted file mode 100644 index b74c95d07..000000000 --- a/addons/rose/public/flight/user-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/users-16.svg b/addons/rose/public/flight/users-16.svg deleted file mode 100644 index 0648faa9f..000000000 --- a/addons/rose/public/flight/users-16.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/x-16.svg b/addons/rose/public/flight/x-16.svg deleted file mode 100644 index f41d39dd5..000000000 --- a/addons/rose/public/flight/x-16.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/x-circle-16.svg b/addons/rose/public/flight/x-circle-16.svg deleted file mode 100644 index 5b0aa3f78..000000000 --- a/addons/rose/public/flight/x-circle-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/public/flight/x-square-16.svg b/addons/rose/public/flight/x-square-16.svg deleted file mode 100644 index 9bf270d7e..000000000 --- a/addons/rose/public/flight/x-square-16.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/rose/tests/dummy/app/templates/playground.hbs b/addons/rose/tests/dummy/app/templates/playground.hbs index dc477136d..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 7b5a62abe..65f6f6b45 100644 --- a/addons/rose/tests/integration/components/rose/badge-test.js +++ b/addons/rose/tests/integration/components/rose/badge-test.js @@ -17,7 +17,9 @@ 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 f41d8b686..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 f4eb10074..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 a80d5d365..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 11ef9ed53..3b1bc1193 100644 --- a/addons/rose/tests/integration/components/rose/dropdown/button-test.js +++ b/addons/rose/tests/integration/components/rose/dropdown/button-test.js @@ -33,7 +33,7 @@ module('Integration | Component | rose/dropdown/button', function (hooks) { test('it supports an icon-only type', async function (assert) { await render( - hbs`` + 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 15547dab8..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 @@ -19,7 +19,7 @@ module('Integration | Component | rose/form/radio/radio', function (hooks) { test('it supports an icon', async function (assert) { await render( - hbs`` + 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 2caad0943..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 49ba9d843..c49c66d20 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 6f13e6ce7..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 = 'flight/clipboard-copy-16'; - successIcon = 'flight/clipboard-checked-16'; + 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 33e29d67e..d311a6887 100644 --- a/ui/admin/app/components/form/auth-method/oidc/index.hbs +++ b/ui/admin/app/components/form/auth-method/oidc/index.hbs @@ -178,7 +178,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 7cb2fb625..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 eeb567f68..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 86c994d25..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 dde4c73d5..b5a9d6888 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -69,8 +69,12 @@ @text={{this.selectedGrantScope.displayName}} @icon={{if this.selectedGrantScope.isProject - 'flight/grid-16' - (if this.selectedGrantScope.isOrg 'flight/org-16' 'flight/globe-16') + 'flight-icons/grid-16' + (if + 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 a99390058..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 238ab3e42..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 afb2c43f8..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/templates/application.hbs b/ui/admin/app/templates/application.hbs index 7413d948e..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 f896df85a..d3abb701c 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,23 @@ --}} - + {{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 +98,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 0a0f9c3b9..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 - 'flight/globe-16' - 'flight/org-16' + '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 f592804ce..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 200cc9912..9099abe02 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 - 'flight/x-circle-16' - (if @model.isPrivate 'flight/lock-16' 'flight/check-circle-16') + '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 ee9b1091d..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 0a4fbd8d8..2b078d971 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/index.hbs @@ -123,7 +123,7 @@ @dropdownRight={{true}} @iconOnly={{true}} @showCaret={{false}} - @icon='flight/more-horizontal-16' + @icon='flight-icons/more-horizontal-16' as |dropdown| > {{#unless authMethod.isPrimary}} @@ -165,7 +165,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 755b72578..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 014f21a9a..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 60d720c91..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 cf059f762..1727d0347 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -78,7 +78,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 07503d0d3..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 c290f9948..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 1b1f21949..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 defdee52e..57542b1d8 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 @@ -52,7 +52,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 3079c54c2..a29293dd8 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 @@ -54,7 +54,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 6affad96b..0ee13bee1 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs @@ -81,7 +81,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 30cc00e38..2b975a0f3 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -67,7 +67,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 b67e32aa7..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 542404b4e..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 'flight/org-16' 'flight/grid-16'}} + @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 e1844e23b..552c50c88 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='flight/arrow-right-circle-16' + @name='flight-icons/arrow-right-circle-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 59a046f11..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 d49f9f75e..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 b62c5d4d2..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 5f0f96421..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 b282a6993..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 ec8d3704e..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 418f49822..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/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js index ab3b6e0f1..a7b391110 100644 --- a/ui/admin/ember-cli-build.js +++ b/ui/admin/ember-cli-build.js @@ -23,7 +23,7 @@ module.exports = function (defaults) { importCss: false, }, svg: { - paths: ['../../addons/core/public', '../../addons/rose/public'], + paths: ['../../addons/core/public'], }, }); diff --git a/ui/desktop/app/components/copyable/index.js b/ui/desktop/app/components/copyable/index.js index 8af16d028..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 = 'flight/clipboard-copy-16'; - successIcon = 'flight/clipboard-checked-16'; + 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 afca5e4d3..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/templates/application.hbs b/ui/desktop/app/templates/application.hbs index caab00131..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 da49bb798..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 014f21a9a..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 f3bde26b8..ab28a0a16 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 5aeffbf98..126557d3f 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 d35304465..9a1ba9bf4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2066,6 +2066,11 @@ resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf" integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A== +"@hashicorp/flight-icons@^0.0.3-beta": + version "0.0.3-beta" + resolved "https://registry.yarnpkg.com/@hashicorp/flight/-/flight-icons-0.0.3-beta.tgz#26b6b22e4c709559ed4c9ab0e87a0874c919b909" + integrity sha512-K+rS0p3YKPqNDHYP9Mz+7vmU5wsvm8wjI3h8rs/y6f84agC9LyhkmZQBy/RRAMXeyYsa3sq8cJc6jcj/nuR23g== + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"