External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #758 from jaredevantabor/text-input-styling

Browse Source 
Styling of text input fields
This commit is contained in:
Jared Tabor
2016-01-31 14:11:59 -08:00
parent f9f10a4ed7 47e80405e2
commit 6efe8a9360
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/legacy-styles/forms.less
View File

@@ -144,11 +144,23 @@
width:100%; 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{ .CodeMirror{
border-radius: 5px; border-radius: 5px;
font-family: 'Open Sans'; font-family: 'Open Sans';
font-style: normal; font-style: normal;
color: @default-data-txt; color: @field-input-text;
} }
.CodeMirror-gutters{ .CodeMirror-gutters{

4
awx/ui/client/src/shared/branding/colors.default.less
View File

@@ -95,13 +95,15 @@
@field-label: @default-interface-txt; @field-label: @default-interface-txt;
@field-input-text: @default-data-txt; @field-input-text: @default-data-txt;
@field-bg: @default-tertiary-bg; @field-bg: @default-tertiary-bg;
@field-secondary-bg: @default-secondary-bg;
@field-border: @default-second-border; @field-border: @default-second-border;
@field-border-sel: @default-link;
@submit-button-text: @default-bg; @submit-button-text: @default-bg;
@submit-button-bg: @default-succ; @submit-button-bg: @default-succ;
@submit-button-bg-hov: @default-succ-hov; @submit-button-bg-hov: @default-succ-hov;
@submit-button-bg-dis: @default-icon-hov; @submit-button-bg-dis: @default-icon-hov;
@code-mirror-gutter: #F2F2F2; @code-mirror-gutter: #F2F2F2;
@radio-bg: @default-interface-txt; @radio-bg: @default-interface-txt;
// footer // footer
@copyright-text: @default-interface-txt; @copyright-text: @default-interface-txt;

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -779,7 +779,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += (field.ngChange) ? this.attr(field, 'ngChange') : ""; html += (field.ngChange) ? this.attr(field, 'ngChange') : "";
html += buildId(field, fld, this.form); html += buildId(field, fld, this.form);
html += (field.controlNGClass) ? "ng-class=\"" + field.controlNGClass + "\" " : ""; 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 += (field['class']) ? " " + this.attr(field, 'class') : "";
html += "\" "; html += "\" ";
html += (field.placeholder) ? this.attr(field, 'placeholder') : ""; html += (field.placeholder) ? this.attr(field, 'placeholder') : "";