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..0011927a7 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,11 @@ Styles: outline, dark, informational, informational-outline, success, success-ou 'none' ), icon: select('icon', { - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'partner': 'partner', 'gift-fill': 'gift-fill', }, - 'user-organization' + 'flight/org-16' ), } }} @@ -58,7 +58,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/card/link/index.stories.mdx b/addons/rose/addon/components/rose/card/link/index.stories.mdx index 57171eaf6..960fc709f 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/org-16' @route='about'/> ``` @@ -32,11 +32,11 @@ 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', + 'flight/org-16': 'flight/org-16', 'partner': 'partner', 'gift-fill': 'gift-fill', }, - 'user-organization' + 'flight/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..72c503e85 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/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/org-16" /> ``` diff --git a/addons/rose/addon/components/rose/dropdown/index.stories.mdx b/addons/rose/addon/components/rose/dropdown/index.stories.mdx index 58a0575bf..8ca5ff6dc 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 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..6c81d2f94 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,12 @@ Renders a form radiofield group. firstFieldIcon: select( 'first icon', { - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', }, - 'user-organization' + 'flight/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..2d1585c38 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,7 +44,7 @@ Renders a form radiofield. 'icon', { 'none': null, - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', @@ -111,7 +111,7 @@ Renders a form radiofield. 'icon', { 'none': null, - 'user-organization': 'user-organization', + 'flight/org-16': 'flight/org-16', 'copy-action': 'copy-action', 'unfold-more': 'unfold-more', 'unfold-less': 'unfold-less', @@ -121,4 +121,4 @@ Renders a form radiofield. inline: boolean('inline', false) } }} - \ No newline at end of file + diff --git a/addons/rose/public/flight/globe-16.svg b/addons/rose/public/flight/globe-16.svg new file mode 100644 index 000000000..0c5298171 --- /dev/null +++ b/addons/rose/public/flight/globe-16.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/grid-16.svg b/addons/rose/public/flight/grid-16.svg new file mode 100644 index 000000000..b65333af2 --- /dev/null +++ b/addons/rose/public/flight/grid-16.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/addons/rose/public/flight/org-16.svg b/addons/rose/public/flight/org-16.svg new file mode 100644 index 000000000..213323766 --- /dev/null +++ b/addons/rose/public/flight/org-16.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ui/admin/app/components/form/role/index.hbs b/ui/admin/app/components/form/role/index.hbs index 169621362..dde4c73d5 100644 --- a/ui/admin/app/components/form/role/index.hbs +++ b/ui/admin/app/components/form/role/index.hbs @@ -69,10 +69,8 @@ @text={{this.selectedGrantScope.displayName}} @icon={{if this.selectedGrantScope.isProject - 'app-icons/project' - (if - this.selectedGrantScope.isOrg 'app-icons/org' 'app-icons/global' - ) + 'flight/grid-16' + (if this.selectedGrantScope.isOrg 'flight/org-16' 'flight/globe-16') }} as |dropdown| > diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index 65e456c51..8385f4759 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'}} diff --git a/ui/admin/app/templates/scopes/scope/-header-nav.hbs b/ui/admin/app/templates/scopes/scope/-header-nav.hbs index ebfc3ffad..0a0f9c3b9 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/globe-16' + 'flight/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/authenticate.hbs b/ui/admin/app/templates/scopes/scope/authenticate.hbs index 55977a188..847987db3 100644 --- a/ui/admin/app/templates/scopes/scope/authenticate.hbs +++ b/ui/admin/app/templates/scopes/scope/authenticate.hbs @@ -16,7 +16,7 @@ }}

diff --git a/ui/admin/app/templates/scopes/scope/scopes/index.hbs b/ui/admin/app/templates/scopes/scope/scopes/index.hbs index 93df2c2cd..c4fce49b5 100644 --- a/ui/admin/app/templates/scopes/scope/scopes/index.hbs +++ b/ui/admin/app/templates/scopes/scope/scopes/index.hbs @@ -43,7 +43,7 @@ @title={{scope.name}} @description={{scope.description}} @id={{scope.id}} - @icon={{if scope.isOrg 'app-icons/org' 'app-icons/project'}} + @icon={{if scope.isOrg 'flight/org-16' 'flight/grid-16'}} @route='scopes.scope' @model={{scope.id}} /> diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js index a7b391110..ab3b6e0f1 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'], + paths: ['../../addons/core/public', '../../addons/rose/public'], }, }); diff --git a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs b/ui/desktop/app/templates/scopes/scope/-header-nav.hbs index cbb597ea5..d8baa5042 100644 --- a/ui/desktop/app/templates/scopes/scope/-header-nav.hbs +++ b/ui/desktop/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/globe-16' + 'flight/org-16' }} as |dropdown| > diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs index 60ccaefa0..0472b5fce 100644 --- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs +++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs @@ -11,7 +11,7 @@ diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js index 91b6adad0..c1ba1af03 100644 --- a/ui/desktop/ember-cli-build.js +++ b/ui/desktop/ember-cli-build.js @@ -23,7 +23,7 @@ module.exports = function (defaults) { importCss: false, }, svg: { - paths: ['../../addons/core/public'], + paths: ['../../addons/core/public', '../../addons/rose/public'], }, });