From e6311f285382bfc32a08093cc980b9a7f6e06d0c Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Wed, 26 Jul 2017 16:10:18 -0400 Subject: [PATCH] Fix Permissions Modal UX items --- awx/ui/client/legacy-styles/forms.less | 3 ++- .../add-rbac-resource/rbac-resource.partial.html | 2 +- awx/ui/client/src/access/add-rbac.block.less | 12 +----------- .../linkout/addUsers/addUsers.block.less | 3 +-- .../src/shared/smart-search/smart-search.block.less | 2 +- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index fdde7e18a4..37dad2aede 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -61,7 +61,8 @@ .Form-title--is_superuser, .Form-title--is_system_auditor, .Form-title--is_ldap_user, -.Form-title--is_external_account { +.Form-title--is_external_account, +.Form-title--roleType { height:15px; color: @default-interface-txt; background-color: @default-list-header-bg; diff --git a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html index cc2c3afbba..e364b3110a 100644 --- a/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html +++ b/awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html @@ -86,7 +86,7 @@ {{ obj.name }} - + {{ obj.type }} diff --git a/awx/ui/client/src/access/add-rbac.block.less b/awx/ui/client/src/access/add-rbac.block.less index 98d3e44eb4..eca34cfdc4 100644 --- a/awx/ui/client/src/access/add-rbac.block.less +++ b/awx/ui/client/src/access/add-rbac.block.less @@ -129,15 +129,6 @@ overflow: hidden; } -.AddPermissions-roleType { - padding: 0px 6px; - font-size: 10px; - color: @default-interface-txt; - text-transform: uppercase; - background-color: @default-bg; - margin-left: 6px; -} - .AddPermissions-roleSelect { width: ~"calc(70% - 40px)"; margin-right: 20px; @@ -201,8 +192,7 @@ margin: 20px 0; font-size: 12px; width: 100%; - padding: 15px; - padding-top: 10px; + padding: 20px; margin-bottom: 15px; border-radius: 4px; border: 1px solid @login-notice-border; diff --git a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less index 3ebf847364..ca509b190f 100644 --- a/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less +++ b/awx/ui/client/src/organizations/linkout/addUsers/addUsers.block.less @@ -187,8 +187,7 @@ margin: 20px 0; font-size: 12px; width: 100%; - padding: 15px; - padding-top: 10px; + padding: 20px; margin-bottom: 15px; border-radius: 4px; border: 1px solid @login-notice-border; diff --git a/awx/ui/client/src/shared/smart-search/smart-search.block.less b/awx/ui/client/src/shared/smart-search/smart-search.block.less index 7552dd01cb..2c2a317a92 100644 --- a/awx/ui/client/src/shared/smart-search/smart-search.block.less +++ b/awx/ui/client/src/shared/smart-search/smart-search.block.less @@ -191,7 +191,7 @@ margin: 10px 0 0 0; font-size: 12px; width: 100%; - padding: 15px; + padding: 20px; border-radius: 4px; border: 1px solid @d7grey; background-color: @login-notice-bg;