From 47e80405e2eaa243f3d68dcc8ffa42513a6e473c Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 29 Jan 2016 15:06:13 -0800 Subject: [PATCH] Styling of text input fields --- awx/ui/client/legacy-styles/forms.less | 14 +++++++++++++- .../client/src/shared/branding/colors.default.less | 4 +++- awx/ui/client/src/shared/form-generator.js | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index c5c26b0c95..b7acb02ae3 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -144,11 +144,23 @@ width:100%; } +.Form-textInput{ + height: 30px; + background-color: @field-secondary-bg; + border-radius: 5px; + border:1px solid @field-border; + color: @field-input-text; +} + +.Form-textInput:active{ + border:1px solid @field-border-sel; +} + .CodeMirror{ border-radius: 5px; font-family: 'Open Sans'; font-style: normal; - color: @default-data-txt; + color: @field-input-text; } .CodeMirror-gutters{ diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 7c1d277395..5eca8fff0a 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -95,13 +95,15 @@ @field-label: @default-interface-txt; @field-input-text: @default-data-txt; @field-bg: @default-tertiary-bg; +@field-secondary-bg: @default-secondary-bg; @field-border: @default-second-border; +@field-border-sel: @default-link; @submit-button-text: @default-bg; @submit-button-bg: @default-succ; @submit-button-bg-hov: @default-succ-hov; @submit-button-bg-dis: @default-icon-hov; @code-mirror-gutter: #F2F2F2; -@radio-bg: @default-interface-txt; +@radio-bg: @default-interface-txt; // 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 37e7075441..6b29295edc 100644 --- a/awx/ui/client/src/shared/form-generator.js +++ b/awx/ui/client/src/shared/form-generator.js @@ -779,7 +779,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat html += (field.ngChange) ? this.attr(field, 'ngChange') : ""; html += buildId(field, fld, this.form); html += (field.controlNGClass) ? "ng-class=\"" + field.controlNGClass + "\" " : ""; - html += "class=\"form-control"; + html += "class=\"form-control Form-textInput "; html += (field['class']) ? " " + this.attr(field, 'class') : ""; html += "\" "; html += (field.placeholder) ? this.attr(field, 'placeholder') : "";