diff --git a/awx/ui/client/lib/components/switch/_index.less b/awx/ui/client/lib/components/switch/_index.less index 499e76c305..f1fa1197c5 100644 --- a/awx/ui/client/lib/components/switch/_index.less +++ b/awx/ui/client/lib/components/switch/_index.less @@ -1,4 +1,4 @@ -.awxSwitch-listTableCell { +.atSwitch-listTableCell { display: flex; align-items: center; height: 100%; @@ -6,7 +6,7 @@ padding-right: 0px; } -.awxSwitch-outer { +.atSwitch-outer { position: relative; display: inline-block; width: 40px; @@ -18,12 +18,12 @@ } } -.awxSwitch-on { - .awxSwitch-slider { +.atSwitch-on { + .atSwitch-slider { background-color: @default-link; } - .awxSwitch-slider:before { + .atSwitch-slider:before { -webkit-transform: translateX(16px); -ms-transform: translateX(16px); transform: translateX(16px); @@ -39,18 +39,18 @@ } } -.awxSwitch-disabled { +.atSwitch-disabled { cursor: not-allowed; - .awxSwitch-inner { + .atSwitch-inner { pointer-events: none; } - .awxSwitch-slider { + .atSwitch-slider { background-color: @default-icon; } - .awxSwitch-slider:before { + .atSwitch-slider:before { background-color: @d2grey; } @@ -59,7 +59,7 @@ } } -.awxSwitch-slider { +.atSwitch-slider { position: absolute; border-radius: 34px; top: 0; @@ -71,7 +71,7 @@ transition: .4s; } -.awxSwitch-slider:before { +.atSwitch-slider:before { position: absolute; content: ""; height: 16px; diff --git a/awx/ui/client/lib/components/switch/switch.partial.html b/awx/ui/client/lib/components/switch/switch.partial.html index 59dde21588..78b2d50a5a 100644 --- a/awx/ui/client/lib/components/switch/switch.partial.html +++ b/awx/ui/client/lib/components/switch/switch.partial.html @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js index 18907f78d4..60af4a17aa 100644 --- a/awx/ui/client/src/shared/generator-helpers.js +++ b/awx/ui/client/src/shared/generator-helpers.js @@ -528,7 +528,7 @@ angular.module('GeneratorHelpers', [systemStatus.name]) html = Template(field); } else if (field.type === 'toggle') { html += ` -
+
`; diff --git a/awx/ui/test/e2e/objects/inventories.js b/awx/ui/test/e2e/objects/inventories.js index 6d9f0ba11f..059b6a8692 100644 --- a/awx/ui/test/e2e/objects/inventories.js +++ b/awx/ui/test/e2e/objects/inventories.js @@ -18,7 +18,7 @@ const standardInvDetails = createFormSection({ '#inventory_form .Form-textArea', '#inventory_form input[type="checkbox"]', '#inventory_form .ui-spinner-input', - '#inventory_form .awxSwitch-inner' + '#inventory_form .atSwitch-inner' ] }, labels: { diff --git a/awx/ui/test/e2e/objects/notificationTemplates.js b/awx/ui/test/e2e/objects/notificationTemplates.js index b295f9722c..1811eb20b1 100644 --- a/awx/ui/test/e2e/objects/notificationTemplates.js +++ b/awx/ui/test/e2e/objects/notificationTemplates.js @@ -19,7 +19,7 @@ const details = createFormSection({ '#notification_template_form input[type="radio"]', '#notification_template_form .ui-spinner-input', '#notification_template_form .Form-textArea', - '#notification_template_form .awxSwitch-inner', + '#notification_template_form .atSwitch-inner', '#notification_template_form .Form-lookupButton' ] } diff --git a/awx/ui/test/e2e/objects/templates.js b/awx/ui/test/e2e/objects/templates.js index 9c71368c2a..47fd844305 100644 --- a/awx/ui/test/e2e/objects/templates.js +++ b/awx/ui/test/e2e/objects/templates.js @@ -18,7 +18,7 @@ const jtDetails = createFormSection({ '#job_template_form .Form-textArea', '#job_template_form input[type="checkbox"]', '#job_template_form .ui-spinner-input', - '#job_template_form .awxSwitch-inner' + '#job_template_form .atSwitch-inner' ] }, labels: { @@ -38,7 +38,7 @@ const wfjtDetails = createFormSection({ '#workflow_job_template_form .Form-textArea', '#workflow_job_template_form input[type="checkbox"]', '#workflow_job_template_form .ui-spinner-input', - '#workflow_job_template_form .awxSwitch-inner' + '#workflow_job_template_form .atSwitch-inner' ] }, labels: {