External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

UI tweaks, fixes list #2151

Browse Source
This commit is contained in:
Ken Hoes 2016-06-06 13:34:59 -04:00
parent 5d32d6e17a
commit dee0a86655
8 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,14 +228,12 @@
}
.Form-textArea{
background-color: @field-secondary-bg!important;
background-color: @field-secondary-bg!important;
border-radius: 5px;
color: @field-input-text;
}
.Form-textInput{
height: 30px!important;
height: 30px;
background-color: @field-secondary-bg!important;
border-radius: 5px;
border:1px solid @field-border;
@ -250,6 +248,19 @@
font-family: Menlo,Monaco,Consolas,"Courier New",monospace!important;
}
.Form-alertblock {
margin: 20px 0;
font-size: 12px;
width: 100%;
padding: 15px;
padding-top: 10px;
margin-bottom: 15px;
border-radius: 4px;
border: 1px solid @login-notice-border;
background-color: @login-notice-bg;
color: @login-notice-text;
}
.ui-spinner{
height: 30px;
background-color: @field-secondary-bg;

4
awx/ui/client/src/bread-crumb/bread-crumb.block.less
View File

@ -37,6 +37,10 @@
.BreadCrumb-menuLinkImage {
font-size: 18px;
flex: initial;
&:hover {
color: @default-link-hov;
}
}
.BreadCrumb-list {

4
awx/ui/client/src/dashboard/hosts/dashboard-hosts.form.js
View File

@ -50,7 +50,7 @@ export default function(){
type: 'textarea',
editRequired: false,
rows: 6,
class: 'modal-input-xlarge Form-textArea',
class: 'modal-input-xlarge Form-textArea Form-formGroup--fullWidth',
dataTitle: 'Host Variables',
dataPlacement: 'right',
dataContainer: 'body',
@ -71,7 +71,7 @@ export default function(){
save: {
ngClick: 'formSave()', //$scope.function to call on click, optional
ngDisabled: "host_form.$invalid"//true //Disable when $pristine or $invalid, optional and when can_edit = false, for permission reasons
}
}
}
};
}

2
awx/ui/client/src/forms/JobTemplates.js
View File

@ -204,7 +204,7 @@ export default
},
job_tags: {
label: 'Job Tags',
type: 'text',
type: 'textarea',
rows: 1,
addRequired: false,
editRequired: false,

1
awx/ui/client/src/portal-mode/portal-mode.block.less
View File

@ -18,7 +18,6 @@
}
.PortalMode-filter{
position: absolute;
top: 45px;
right: 35px;
.btn.btn-xs {

2
awx/ui/client/src/search/tagSearch.block.less
View File

@ -61,7 +61,7 @@
border-top-right-radius: 0px;
z-index: 50000;
max-height: 200px;
overflow-y: scroll;
overflow-y: auto;
box-shadow: 2px 2px 2px 0px rgba(0, 0, 0, 0.1);
}

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

@ -770,7 +770,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += "<div class=\"";
html += (options.modal || options.id) ? "col-lg-12" : "col-lg-8 col-lg-offset-2";
html += "\">\n";
html += "<div class=\"alert";
html += "<div class=\"Form-alertblock";
html += (field.closeable === undefined || field.closeable === true) ? " alert-dismissable" : "";
html += "\" ";
html += (field.ngShow) ? this.attr(field, 'ngShow') : "";
@ -1943,6 +1943,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
for (act in collection.fieldActions) {
fAction = collection.fieldActions[act];
html += "<button id=\"" + ((fAction.id) ? fAction.id : act + "-action") + "\" ";
html += (fAction.awToolTip) ? 'aw-tool-tip="' + fAction.awToolTip + '"' : '';
html += (fAction.dataPlacement) ? 'data-placement="' + fAction.dataPlacement + '"' : '';
html += (fAction.href) ? "href=\"" + fAction.href + "\" " : "";
html += (fAction.ngClick) ? this.attr(fAction, 'ngClick') : "";
html += (fAction.ngHref) ? this.attr(fAction, 'ngHref') : "";
@ -1950,6 +1952,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += " class=\"List-actionButton ";
html += (act === 'delete') ? "List-actionButton--delete" : "";
html += "\"";
html += ">";
if (fAction.iconClass) {
html += "<i class=\"" + fAction.iconClass + "\"></i>";

8
awx/ui/client/src/standard-out/standard-out.block.less
View File

@ -113,13 +113,17 @@ standard-out-log {
}
.StandardOut-actionButton:hover {
background-color: @list-actn-bg-hov !important;
background-color: @list-actn-bg-hov;
color: @list-actn-icn-hov;
}
.StandardOut-actionButton--active {
background-color: @list-actn-bg-hov !important;
background-color: @list-actn-bg-hov;
color: @list-actn-icn-hov;
&:hover {
background-color: @default-link-hov;
}
}
.StandardOut-actionButton + a {