diff --git a/awx/ui/client/lib/components/components.strings.js b/awx/ui/client/lib/components/components.strings.js index 00102becff..395af1f809 100644 --- a/awx/ui/client/lib/components/components.strings.js +++ b/awx/ui/client/lib/components/components.strings.js @@ -81,7 +81,7 @@ function ComponentsStrings (BaseString) { NOTIFICATIONS: t.s('Notifications'), MANAGEMENT_JOBS: t.s('Management Jobs'), INSTANCES: t.s('Instances'), - INSTANCE_GROUPS: t.s('INSTANCE GROUPS'), + INSTANCE_GROUPS: t.s('Instance Groups'), APPLICATIONS: t.s('Applications'), SETTINGS: t.s('Settings'), FOOTER_ABOUT: t.s('About'), diff --git a/awx/ui/client/lib/components/layout/_index.less b/awx/ui/client/lib/components/layout/_index.less index 1882934032..5ef829aa27 100644 --- a/awx/ui/client/lib/components/layout/_index.less +++ b/awx/ui/client/lib/components/layout/_index.less @@ -109,7 +109,6 @@ color: @at-color-side-nav-content; display: flex; cursor: pointer; - text-transform: uppercase; font-size: 12px; i { cursor: pointer; @@ -193,7 +192,7 @@ + .at-Layout-main { padding-left: @at-width-expanded-side-nav; - } + } + .at-Layout-main--noLicense { padding-left: 0; diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less index 5acf3419cb..1a34edf72f 100644 --- a/awx/ui/client/lib/theme/_variables.less +++ b/awx/ui/client/lib/theme/_variables.less @@ -300,7 +300,7 @@ @at-width-input-button-sm: 72px; @at-width-input-button-md: 84px; -@at-width-collapsed-side-nav: 50px; +@at-width-collapsed-side-nav: 55px; @at-width-expanded-side-nav: 180px; @at-width-list-row-item-label: 120px; @at-width-list-row-action: 30px; diff --git a/awx/ui/client/src/instance-groups/instance-groups.strings.js b/awx/ui/client/src/instance-groups/instance-groups.strings.js index aff0edfd95..b082a93cc8 100644 --- a/awx/ui/client/src/instance-groups/instance-groups.strings.js +++ b/awx/ui/client/src/instance-groups/instance-groups.strings.js @@ -5,6 +5,8 @@ function InstanceGroupsStrings (BaseString) { const ns = this.instanceGroups; ns.state = { + INSTANCE_GROUPS_BREADCRUMB_LABEL: t.s('INSTANCE GROUPS'), + INSTANCES_BREADCRUMB_LABEL: t.s('INSTANCES'), ADD_BREADCRUMB_LABEL: t.s('CREATE INSTANCE GROUP'), EDIT_BREADCRUMB_LABEL: t.s('EDIT INSTANCE GROUP') }; diff --git a/awx/ui/client/src/instance-groups/main.js b/awx/ui/client/src/instance-groups/main.js index 78b238fefa..d7776202d2 100644 --- a/awx/ui/client/src/instance-groups/main.js +++ b/awx/ui/client/src/instance-groups/main.js @@ -61,13 +61,13 @@ InstanceGroupsResolve.$inject = [ 'InstanceModel' ]; -function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) { +function InstanceGroupsRun ($stateExtender, strings) { $stateExtender.addState({ name: 'instanceGroups', url: '/instance_groups', searchPrefix: 'instance_group', ncyBreadcrumb: { - label: ComponentsStrings.get('layout.INSTANCE_GROUPS') + label: strings.get('state.INSTANCE_GROUPS_BREADCRUMB_LABEL') }, params: { instance_group_search: { @@ -232,7 +232,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) { url: '/:instance_group_id/instances', ncyBreadcrumb: { parent: 'instanceGroups.edit', - label: ComponentsStrings.get('layout.INSTANCES') + label: strings.get('state.INSTANCES_BREADCRUMB_LABEL') }, params: { instance_search: { @@ -296,8 +296,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) { InstanceGroupsRun.$inject = [ '$stateExtender', - 'InstanceGroupsStrings', - 'ComponentsStrings' + 'InstanceGroupsStrings' ]; angular.module(MODULE_NAME, [])