diff --git a/awx/ui/client/features/credentials/external-test-modal.partial.html b/awx/ui/client/features/credentials/external-test-modal.partial.html index 57ba47bc3f..5f35774655 100644 --- a/awx/ui/client/features/credentials/external-test-modal.partial.html +++ b/awx/ui/client/features/credentials/external-test-modal.partial.html @@ -1,4 +1,4 @@ - + @@ -17,4 +17,4 @@ - + diff --git a/awx/ui/client/features/credentials/input-source-lookup.partial.html b/awx/ui/client/features/credentials/input-source-lookup.partial.html index 74de2429f2..3c5b0478e2 100644 --- a/awx/ui/client/features/credentials/input-source-lookup.partial.html +++ b/awx/ui/client/features/credentials/input-source-lookup.partial.html @@ -1,4 +1,4 @@ - + - + diff --git a/awx/ui/client/lib/components/_index.less b/awx/ui/client/lib/components/_index.less index b065777948..a0be9a31a7 100644 --- a/awx/ui/client/lib/components/_index.less +++ b/awx/ui/client/lib/components/_index.less @@ -1,10 +1,10 @@ @import 'action/_index'; +@import 'dialog/_index'; @import 'input/_index'; @import 'launchTemplateButton/_index'; @import 'layout/_index'; @import 'list/_index'; @import 'modal/_index'; -@import 'easy-modal/_index'; @import 'panel/_index'; @import 'popover/_index'; @import 'relaunchButton/_index'; diff --git a/awx/ui/client/lib/components/easy-modal/_index.less b/awx/ui/client/lib/components/dialog/_index.less similarity index 74% rename from awx/ui/client/lib/components/easy-modal/_index.less rename to awx/ui/client/lib/components/dialog/_index.less index 942803309b..a793d65a63 100644 --- a/awx/ui/client/lib/components/easy-modal/_index.less +++ b/awx/ui/client/lib/components/dialog/_index.less @@ -1,25 +1,25 @@ -.at-EasyModal-body { +.at-Dialog-body { font-size: @at-font-size; padding: @at-padding-panel 0; } -.at-EasyModal-dismiss { +.at-Dialog-dismiss { .at-mixin-ButtonIcon(); font-size: @at-font-size-modal-dismiss; color: @at-color-icon-dismiss; text-align: right; } -.at-EasyModal-heading { +.at-Dialog-heading { margin: 0; overflow: visible; - & > .at-EasyModal-dismiss { + & > .at-Dialog-dismiss { margin: 0; } } -.at-EasyModal-title { +.at-Dialog-title { margin: 0; padding: 0; diff --git a/awx/ui/client/lib/components/easy-modal/easy-modal.component.js b/awx/ui/client/lib/components/dialog/dialog.component.js similarity index 63% rename from awx/ui/client/lib/components/easy-modal/easy-modal.component.js rename to awx/ui/client/lib/components/dialog/dialog.component.js index cf78db312c..33edcf1783 100644 --- a/awx/ui/client/lib/components/easy-modal/easy-modal.component.js +++ b/awx/ui/client/lib/components/dialog/dialog.component.js @@ -1,8 +1,8 @@ -const templateUrl = require('~components/easy-modal/easy-modal.partial.html'); +const templateUrl = require('~components/dialog/dialog.partial.html'); -const overlaySelector = '.at-EasyModal'; +const overlaySelector = '.at-Dialog'; -function EasyModalController ($element) { +function DialogController ($element) { const vm = this || {}; vm.$onInit = () => { @@ -13,13 +13,13 @@ function EasyModalController ($element) { }; } -EasyModalController.$inject = [ +DialogController.$inject = [ '$element', ]; export default { templateUrl, - controller: EasyModalController, + controller: DialogController, controllerAs: 'vm', transclude: true, bindings: { diff --git a/awx/ui/client/lib/components/easy-modal/easy-modal.partial.html b/awx/ui/client/lib/components/dialog/dialog.partial.html similarity index 59% rename from awx/ui/client/lib/components/easy-modal/easy-modal.partial.html rename to awx/ui/client/lib/components/dialog/dialog.partial.html index 2c44ab0ae0..5173207f84 100644 --- a/awx/ui/client/lib/components/easy-modal/easy-modal.partial.html +++ b/awx/ui/client/lib/components/dialog/dialog.partial.html @@ -1,14 +1,14 @@ -