External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 02:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2230 from marshmalien/fix/2229-side-nav-styles

Browse Source 
Fix side navigation width and text styles
This commit is contained in:
Marliana Lara
2018-06-19 15:41:45 -04:00
committed by GitHub
parent 8df186bc91 540f4fa956
commit 07665d545d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/lib/components/components.strings.js
View File

@@ -81,7 +81,7 @@ function ComponentsStrings (BaseString) {
NOTIFICATIONS: t.s('Notifications'), NOTIFICATIONS: t.s('Notifications'),
MANAGEMENT_JOBS: t.s('Management Jobs'), MANAGEMENT_JOBS: t.s('Management Jobs'),
INSTANCES: t.s('Instances'), INSTANCES: t.s('Instances'),
INSTANCE_GROUPS: t.s('INSTANCE GROUPS'), INSTANCE_GROUPS: t.s('Instance Groups'),
APPLICATIONS: t.s('Applications'), APPLICATIONS: t.s('Applications'),
SETTINGS: t.s('Settings'), SETTINGS: t.s('Settings'),
FOOTER_ABOUT: t.s('About'), FOOTER_ABOUT: t.s('About'),

1
awx/ui/client/lib/components/layout/_index.less
View File

@@ -109,7 +109,6 @@
color: @at-color-side-nav-content; color: @at-color-side-nav-content;
display: flex; display: flex;
cursor: pointer; cursor: pointer;
text-transform: uppercase;
font-size: 12px; font-size: 12px;
i { i {
cursor: pointer; cursor: pointer;

2
awx/ui/client/lib/theme/_variables.less
View File

@@ -300,7 +300,7 @@
@at-width-input-button-sm: 72px; @at-width-input-button-sm: 72px;
@at-width-input-button-md: 84px; @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-expanded-side-nav: 180px;
@at-width-list-row-item-label: 120px; @at-width-list-row-item-label: 120px;
@at-width-list-row-action: 30px; @at-width-list-row-action: 30px;

2
awx/ui/client/src/instance-groups/instance-groups.strings.js
View File

@@ -5,6 +5,8 @@ function InstanceGroupsStrings (BaseString) {
const ns = this.instanceGroups; const ns = this.instanceGroups;
ns.state = { ns.state = {
INSTANCE_GROUPS_BREADCRUMB_LABEL: t.s('INSTANCE GROUPS'),
INSTANCES_BREADCRUMB_LABEL: t.s('INSTANCES'),
ADD_BREADCRUMB_LABEL: t.s('CREATE INSTANCE GROUP'), ADD_BREADCRUMB_LABEL: t.s('CREATE INSTANCE GROUP'),
EDIT_BREADCRUMB_LABEL: t.s('EDIT INSTANCE GROUP') EDIT_BREADCRUMB_LABEL: t.s('EDIT INSTANCE GROUP')
}; };

9
awx/ui/client/src/instance-groups/main.js
View File

@@ -61,13 +61,13 @@ InstanceGroupsResolve.$inject = [
'InstanceModel' 'InstanceModel'
]; ];
function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) { function InstanceGroupsRun ($stateExtender, strings) {
$stateExtender.addState({ $stateExtender.addState({
name: 'instanceGroups', name: 'instanceGroups',
url: '/instance_groups', url: '/instance_groups',
searchPrefix: 'instance_group', searchPrefix: 'instance_group',
ncyBreadcrumb: { ncyBreadcrumb: {
label: ComponentsStrings.get('layout.INSTANCE_GROUPS') label: strings.get('state.INSTANCE_GROUPS_BREADCRUMB_LABEL')
}, },
params: { params: {
instance_group_search: { instance_group_search: {
@@ -232,7 +232,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
url: '/:instance_group_id/instances', url: '/:instance_group_id/instances',
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'instanceGroups.edit', parent: 'instanceGroups.edit',
label: ComponentsStrings.get('layout.INSTANCES') label: strings.get('state.INSTANCES_BREADCRUMB_LABEL')
}, },
params: { params: {
instance_search: { instance_search: {
@@ -296,8 +296,7 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
InstanceGroupsRun.$inject = [ InstanceGroupsRun.$inject = [
'$stateExtender', '$stateExtender',
'InstanceGroupsStrings', 'InstanceGroupsStrings'
'ComponentsStrings'
]; ];
angular.module(MODULE_NAME, []) angular.module(MODULE_NAME, [])