External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 18:40:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2305 from Haokun-Chen/2225

Browse Source 
fixing margin for instances group, application, credential page
This commit is contained in:
Haokun Chen 2018-06-26 13:56:44 -04:00 committed by GitHub
commit 7aa48708d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/features/applications/list-applications-users.view.html
View File

@ -1,4 +1,4 @@
<div class="at-List-toolbar">
<div class="at-List-toolbar at-List--toolbar-padAbove">
<smart-search
class="at-List-search"
django-model="users"

2
awx/ui/client/features/credentials/add-edit-credentials.view.html
View File

@ -31,7 +31,7 @@
<at-panel ng-if="$state.current.name.includes('permissions')" on-dismiss="credentials">
<at-panel-heading>{{:: vm.strings.get('permissions.TITLE') }}</at-panel-heading>
<at-tab-group>
<at-tab-group class="at-TabGroup--padBelow">
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
<at-tab state="vm.tab.permissions">{{:: vm.strings.get('tab.PERMISSIONS') }}</at-tab>
</at-tab-group>

4
awx/ui/client/lib/components/list/_index.less
View File

@ -25,6 +25,10 @@
margin-bottom: @at-margin-bottom-list-toolbar;
}
.at-List--toolbar-padAbove{
margin-top: @at-margin-above-list-toolbar
}
.at-List-search {
flex: auto;
}

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

@ -267,6 +267,7 @@
@at-margin-top-list: @at-space-4x;
@at-margin-bottom-list-toolbar: @at-space-4x;
@at-margin-above-list-toolbar: @at-space-4x;
@at-margin-left-toolbar-action: @at-space-4x;
@at-margin-left-toolbar-carat: @at-space;
@at-margin-bottom-list-header: @at-space;

2
awx/ui/client/src/instance-groups/instances/instances-list.partial.html
View File

@ -3,7 +3,7 @@
{{ vm.panelTitle }}
</at-panel-heading>
<at-tab-group>
<at-tab-group class="at-TabGroup--padBelow">
<at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
<at-tab state="vm.tab.instances">{{:: vm.strings.get('tab.INSTANCES') }}</at-tab>
<at-tab state="vm.tab.jobs" ng-hide="$state.current.name === 'instanceGroups.add'">{{:: vm.strings.get('tab.JOBS') }}</at-tab>