From f6ab2fdff7a93d49bfde2a16a689542ddd083233 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Wed, 20 Jan 2016 09:19:33 -0800 Subject: [PATCH] Adjusting 2 small things to forms 1) Changing the color of the SAVE button when disabled in order to make the text pop 2) Adding the ADMIN label to the title of hte user's form when the user is an admin in order to make the white text pop --- awx/ui/client/legacy-styles/forms.less | 16 ++++++++++++++++ .../src/shared/branding/colors.default.less | 2 +- awx/ui/client/src/shared/form-generator.js | 4 ++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 964010e7fc..8869fa3a7a 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -29,6 +29,22 @@ padding-bottom: 20px; } +.Form-title--is_superuser{ + height:15px; + color: @btn-txt; + background-color: @btn-bg; + border-radius: 5px; + border: 1px solid @btn-bord; + font-size: 10px; + padding-left: 10px; + padding-right: 10px; + margin-left: 10px; + text-transform: uppercase; + font-weight: 100; + position: absolute; + margin-top: 2px; +} + .Form-exitHolder{ justify-content: flex-end; display:flex; diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 191c622e5c..3c0337a009 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -99,7 +99,7 @@ @submit-button-text: @default-bg; @submit-button-bg: @default-succ; @submit-button-bg-hov: @default-succ-hov; -@submit-button-bg-dis: @default-second-border; +@submit-button-bg-dis: @default-icon-hov; // footer @copyright-text: @default-interface-txt; diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js index e531b2c502..81b248c00d 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -1427,6 +1427,10 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += "
"; html += "
"; html += (options.mode === 'edit') ? this.form.editTitle : this.form.addTitle; + if(this.form.name === "user"){ + html+= "Admin"; + } html += "
\n"; html += "
";