From bd62f136a39b8aace80fb344ccba85b6b5d4e230 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 29 Apr 2015 16:45:15 -0400 Subject: [PATCH] fixed color of delete prompt ok button bug --- awx/ui/static/js/helpers/ConfigureTower.js | 22 ---------------------- awx/ui/static/less/ansible-ui.less | 14 ++++++++++++++ awx/ui/templates/ui/index.html | 2 +- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/awx/ui/static/js/helpers/ConfigureTower.js b/awx/ui/static/js/helpers/ConfigureTower.js index 15142da257..b0c5e5ccf2 100644 --- a/awx/ui/static/js/helpers/ConfigureTower.js +++ b/awx/ui/static/js/helpers/ConfigureTower.js @@ -427,28 +427,6 @@ export default action: action, backdrop: false }); - // } - // } else { - // //a schedule doesn't exist - // $("#prompt_action_btn").text('OK'); - // $('#prompt_cancel_btn').hide(); - // var action2 = function(){ - // $('#prompt-modal').modal('hide'); - // $("#prompt_action_btn").text('Yes'); - // $('#prompt_cancel_btn').show(); - // }; - // Prompt({ - // hdr: "Delete", - // body: "
No schedule exists for that job.
", - // action: action2, - // backdrop: false - // }); - // } - // }) - // .error(function(data, status) { - // ProcessErrors(scope, data, status, null, { hdr: 'Error!', - // msg: 'Failed updating job ' + scope.job_template_id + ' with variables. PUT returned: ' + status }); - // }); }; scope.cancelScheduleForm = function() { diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index 5b80afef66..ddc5e628bc 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -30,6 +30,7 @@ @green: #60D66F; @red: #ff5850; @red-hover: #FA8C87; +@red-focus: #FF1105; @font-face { @@ -1551,6 +1552,19 @@ input[type="checkbox"].checkbox-no-label { } } + + .btn-danger { + background-color: @red; + border-color: @red-focus; + } + + .btn-danger:hover, + .btn-danger:focus, + .btn-danger:active { + border-color: @red-focus; + background-color: @red-focus; + } + // ad hoc permission checkbox .squeeze.form-group { margin-bottom: 10px; diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index e09d7e8616..1c685ac545 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -193,7 +193,7 @@