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

Merge pull request #57 from jlmitch5/colorAudit32End

Browse Source 
Color audit
This commit is contained in:
jlmitch5
2017-07-26 09:06:41 -04:00
committed by GitHub
parent f7f61c9be2 485848619b
commit 8bfe0bbef0
18 changed files with 124 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
awx/ui/client/legacy-styles/ansible-ui.less
View File

@@ -27,12 +27,6 @@ body.modal-open {
margin-right: 0; margin-right: 0;
} }
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
border-color: @b7grey;
}
/* Helper Classes */ /* Helper Classes */
.pad-right-sm { padding-right: 10px; } .pad-right-sm { padding-right: 10px; }
.pad-left-md { padding-left: 30px; } .pad-left-md { padding-left: 30px; }
@@ -607,13 +601,13 @@ dd {
.ui-widget-content a.help-link, .ui-widget-content a.help-link,
.ui-widget-content a.help-link:active, .ui-widget-content a.help-link:active,
.ui-widget-content a.help-link:visited { .ui-widget-content a.help-link:visited {
color: @grey; color: @default-icon;
text-decoration: none; text-decoration: none;
} }
.help-link:hover, .help-link:hover,
.ui-widget-content a.help-link:hover { .ui-widget-content a.help-link:hover {
color: @default-icon; color: @default-interface-txt;
text-decoration: none; text-decoration: none;
} }
@@ -2085,8 +2079,8 @@ tr td button i {
} }
.form-control { .form-control {
border-color: @d7grey; border-color: @b7grey;
background-color: @default-no-items-bord; background-color: @f2grey;
color: @default-data-txt; color: @default-data-txt;
transition: border-color 0.3s; transition: border-color 0.3s;
box-shadow: none; box-shadow: none;
@@ -2096,7 +2090,7 @@ tr td button i {
.form-control + .select2 .select2-selection { .form-control + .select2 .select2-selection {
border-color: @b7grey !important; border-color: @b7grey !important;
background-color: @default-bg !important; background-color: @f2grey !important;
color: @default-data-txt !important; color: @default-data-txt !important;
transition: border-color 0.3s !important; transition: border-color 0.3s !important;
box-shadow: none !important; box-shadow: none !important;
@@ -2108,7 +2102,7 @@ tr td button i {
} }
.form-control + .select2-container--disabled .select2-selection { .form-control + .select2-container--disabled .select2-selection {
background-color: @egrey !important; background-color: @ebgrey !important;
} }
.form-control:active, .form-control:focus { .form-control:active, .form-control:focus {
@@ -2146,7 +2140,7 @@ tr td button i {
.select2-container--disabled,.select2-container--disabled .select2-selection--single,.select2-container--disabled .select2-selection--multiple { .select2-container--disabled,.select2-container--disabled .select2-selection--single,.select2-container--disabled .select2-selection--multiple {
cursor: not-allowed; cursor: not-allowed;
opacity: 100; opacity: 100;
background: @egrey; background: @ebgrey;
border-radius: 5px; border-radius: 5px;
} }
@@ -2311,7 +2305,7 @@ html input[disabled] {
.select2-container--disabled .select2-selection, .select2-container--disabled .select2-selection,
.select2-container--disabled .select2-arrow { .select2-container--disabled .select2-arrow {
background: @egrey; background: @ebgrey;
} }
.btn.disabled,.btn[disabled],fieldset[disabled] .bt { .btn.disabled,.btn[disabled],fieldset[disabled] .bt {
@@ -2320,11 +2314,11 @@ html input[disabled] {
.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled { .ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled {
opacity: 1; opacity: 1;
background: @egrey; background: @ebgrey;
} }
input[disabled].ui-spinner-input { input[disabled].ui-spinner-input {
background-color: @egrey; background-color: @ebgrey;
} }
.CodeMirror-scroll { .CodeMirror-scroll {
@@ -2339,3 +2333,17 @@ input[disabled].ui-spinner-input {
.CodeMirror-lines { .CodeMirror-lines {
margin-bottom: 20px; margin-bottom: 20px;
} }
.btn-default {
border-color: @b7grey;
}
.btn-default:hover, .btn-default:focus, .btn-default:active, .btn-default.active, .open .dropdown-toggle.btn-default {
background-color: @f2grey;
border-color: @b7grey;
color: @default-interface-txt;
}
.ui-dialog .ui-dialog-content {
background: @default-bg;
}

2
awx/ui/client/legacy-styles/codemirror.less
View File

@@ -43,7 +43,7 @@ textarea[disabled="disabled"] + div[id*="-container"]{
.CodeMirror.cm-s-default, .CodeMirror.cm-s-default,
.CodeMirror-line { .CodeMirror-line {
background-color: @egrey; background-color: @ebgrey;
} }
.CodeMirror-gutters { .CodeMirror-gutters {

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

@@ -156,7 +156,7 @@
} }
.Form-tab--disabled { .Form-tab--disabled {
opacity: 0.4; opacity: 0.65;
} }
.Form-tab--disabled:hover { .Form-tab--disabled:hover {
@@ -200,7 +200,7 @@
.Form-formGroup { .Form-formGroup {
input.form-control { input.form-control {
background-color: @default-secondary-bg; background-color: @f2grey;
border-color: @b7grey; border-color: @b7grey;
border-radius: 5px; border-radius: 5px;
height: 30px; height: 30px;
@@ -247,7 +247,7 @@
left: -20px; left: -20px;
position: absolute; position: absolute;
width: 5px; width: 5px;
background-color: @default-border; background-color: @b7grey;
height: 100%; height: 100%;
} }
@@ -318,7 +318,7 @@
.ui-spinner { .ui-spinner {
height: 30px; height: 30px;
background-color: @field-secondary-bg !important; background-color: @f2grey !important;
border-radius: 5px; border-radius: 5px;
border:1px solid @field-border !important; border:1px solid @field-border !important;
color: @field-input-text; color: @field-input-text;
@@ -327,7 +327,7 @@
.ui-spinner-input { .ui-spinner-input {
color: @field-input-text; color: @field-input-text;
background-color: @field-secondary-bg; background-color: @f2grey;
} }
.ui-spinner-input:focus { .ui-spinner-input:focus {
@@ -366,13 +366,12 @@
border-left:1px solid @field-border; border-left:1px solid @field-border;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
background-color: @field-button-bg !important;
width: 30px!important; width: 30px!important;
height: 28px!important; height: 28px!important;
} }
.select2-container--disabled .select2-selection__arrow { .select2-container--disabled .select2-selection__arrow {
background: @egrey !important; background: @ebgrey !important;
} }
.select2-results__option { .select2-results__option {
@@ -420,19 +419,19 @@
.Form-passwordButton { .Form-passwordButton {
height: 30px; height: 30px;
color: @field-lookup-btn-icon!important; color: @default-interface-txt;
text-transform: uppercase; text-transform: uppercase;
line-height: 1; line-height: 1;
padding-left: 7px; padding-left: 7px;
padding-right: 7px; padding-right: 7px;
background-color: @field-lookup-btn-bg; background-color: @default-bg;
border:1px solid @field-border; border:1px solid @b7grey;
} }
.Form-passwordButton:hover { .Form-passwordButton:hover {
cursor: pointer; cursor: pointer;
background-color: @field-lookup-btn-hov-bg; background-color: @f2grey;
border: 1px solid @field-border; border: 1px solid @b7grey;
color: @field-lookup-btn-icon; color: @field-lookup-btn-icon;
} }
@@ -754,3 +753,8 @@ input[type='radio']:checked:before {
:-moz-placeholder { /* Firefox 18- */ :-moz-placeholder { /* Firefox 18- */
color: @b7grey; color: @b7grey;
} }
.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control {
border-color: @b7grey;
background: @ebgrey;
}

2
awx/ui/client/legacy-styles/jquery-ui-overrides.less
View File

@@ -223,5 +223,5 @@ table.ui-datepicker-calendar {
} }
.ui-state-disabled.ui-widget-content { .ui-state-disabled.ui-widget-content {
background-color: @egrey; background-color: @ebgrey !important;
} }

2
awx/ui/client/lib/theme/_mixins.less
View File

@@ -34,7 +34,7 @@
&, &:active, &:hover, &:focus { &, &:active, &:hover, &:focus {
color: @at-color-button-text-default; color: @at-color-button-text-default;
border-color: @at-color-input-border; border-color: @at-color-input-border;
background-color: @at-color-default; background-color: @at-gray-light-2x;
cursor: pointer; cursor: pointer;
} }
} }

5
awx/ui/client/lib/theme/_variables.less
View File

@@ -68,11 +68,11 @@
@at-color-input-disabled: @at-gray-light-2x; @at-color-input-disabled: @at-gray-light-2x;
@at-color-icon-dismiss: @at-gray-dark; @at-color-icon-dismiss: @at-gray-dark;
@at-color-icon-popover: @at-gray-dark-3x; @at-color-icon-popover: @at-gray-dark-4x;
@at-color-icon-hover: @at-gray-dark-5x; @at-color-icon-hover: @at-gray-dark-5x;
@at-color-panel-heading: @at-gray-dark-5x; @at-color-panel-heading: @at-gray-dark-5x;
@at-color-panel-border: @at-gray-dark; @at-color-panel-border: @at-gray-dark-2x;
@at-color-search-key-active: @at-blue; @at-color-search-key-active: @at-blue;
@@ -140,4 +140,3 @@
@at-line-height-short: 0.9; @at-line-height-short: 0.9;
@at-line-height-tall: 2; @at-line-height-tall: 2;
@at-line-height: 24px; @at-line-height: 24px;

2
awx/ui/client/src/app.js
View File

@@ -206,7 +206,7 @@ var awApp = angular.module('awApp', [
LoadConfig, Store, pendoService, Prompt, Rest, Wait, LoadConfig, Store, pendoService, Prompt, Rest, Wait,
ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService, ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
$filter, SocketService, AppStrings) { $filter, SocketService, AppStrings) {
console.log("This works fine!");
$rootScope.$state = $state; $rootScope.$state = $state;
$rootScope.$state.matches = function(stateName) { $rootScope.$state.matches = function(stateName) {
return $state.current.name.search(stateName) > 0; return $state.current.name.search(stateName) > 0;

2
awx/ui/client/src/home/dashboard/counts/dashboard-counts.block.less
View File

@@ -19,7 +19,7 @@
padding-right: 15px; padding-right: 15px;
border-radius: 5px; border-radius: 5px;
background-color: @db-panel-bg; background-color: @db-panel-bg;
border: 1px solid @db-panel-border; border: 1px solid @b7grey;
flex: 1 0 auto; flex: 1 0 auto;
max-width: ~"calc(16.6% - 15px)"; max-width: ~"calc(16.6% - 15px)";
flex-basis: ~"calc(16.6% - 15px)"; flex-basis: ~"calc(16.6% - 15px)";

2
awx/ui/client/src/home/dashboard/dashboard.block.less
View File

@@ -19,7 +19,7 @@
} }
.Dashboard-list { .Dashboard-list {
border: 1px solid @default-border; border: 1px solid @b7grey;
border-radius: 5px; border-radius: 5px;
margin-top: 20px; margin-top: 20px;
width: 50%; width: 50%;

2
awx/ui/client/src/home/dashboard/graphs/dashboard-graphs.block.less
View File

@@ -2,7 +2,7 @@
.DashboardGraphs { .DashboardGraphs {
margin-top: 20px; margin-top: 20px;
border: solid 1px @db-panel-border; border: solid 1px @b7grey;
border-radius: 5px; border-radius: 5px;
background-color: @db-panel-bg; background-color: @db-panel-bg;
padding-top:20px; padding-top:20px;

2
awx/ui/client/src/job-submission/job-submission.block.less
View File

@@ -106,7 +106,7 @@
cursor: default!important; cursor: default!important;
} }
.JobSubmission-step--disabled { .JobSubmission-step--disabled {
opacity: 0.4; opacity: 0.65;
cursor: not-allowed!important; cursor: not-allowed!important;
} }
.JobSubmission-formContainer { .JobSubmission-formContainer {

2
awx/ui/client/src/management-jobs/card/mgmtcards.block.less
View File

@@ -8,7 +8,7 @@
background-color: @default-bg; background-color: @default-bg;
padding: 20px; padding: 20px;
border-radius: 5px; border-radius: 5px;
border: 1px solid @default-border; border: 1px solid @b7grey;
align-items: baseline; align-items: baseline;
margin-top: 20px; margin-top: 20px;
width: 32%; width: 32%;

2
awx/ui/client/src/organizations/orgcards.block.less
View File

@@ -33,7 +33,7 @@
padding: 20px; padding: 20px;
padding-bottom: 0px; padding-bottom: 0px;
border-radius: 5px; border-radius: 5px;
border: 1px solid @default-border; border: 1px solid @b7grey;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-top: 20px; margin-top: 20px;

2
awx/ui/client/src/setup-menu/setup-item.block.less
View File

@@ -3,7 +3,7 @@
.SetupItem { .SetupItem {
background-color: @panel-bg; background-color: @panel-bg;
border-radius: 5px; border-radius: 5px;
border: 1px solid @btn-bord; border: 1px solid @b7grey;
min-height: 120px; min-height: 120px;
padding: 20px; padding: 20px;
margin-top: 20px; margin-top: 20px;

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

@@ -16,7 +16,7 @@
@default-link: #337AB7; @default-link: #337AB7;
@default-link-hov: #286090; @default-link-hov: #286090;
@default-list-header-bg:#EBEBEB; @default-list-header-bg:#EBEBEB;
@default-no-items-bord: #F6F6F6; // also white button hovers @default-no-items-bord: #F6F6F6;
@default-stdout-txt: #707070; @default-stdout-txt: #707070;
@default-dark: #000000; @default-dark: #000000;
@b7grey: #B7B7B7; @b7grey: #B7B7B7;
@@ -25,6 +25,8 @@
@f7grey: #F7F7F7; @f7grey: #F7F7F7;
@insights-yellow: #dedc4f; @insights-yellow: #dedc4f;
@f2grey: #f2f2f2; @f2grey: #f2f2f2;
@f6grey: #f6f6f6;
@ebgrey: #ebebeb;
@default-warning: #F0AD4E; @default-warning: #F0AD4E;
@@ -42,9 +44,9 @@
// buttons // buttons
@btn-bg: @default-bg; @btn-bg: @default-bg;
@btn-bord: @d7grey; @btn-bord: @b7grey;
@btn-txt: @default-interface-txt; @btn-txt: @default-interface-txt;
@btn-bg-hov: @default-tertiary-bg; @btn-bg-hov: @f2grey;
@btn-bg-sel: @default-icon-hov; @btn-bg-sel: @default-icon-hov;
@btn-bord-sel: @default-icon-hov; @btn-bord-sel: @default-icon-hov;
@btn-txt-sel: @default-bg; @btn-txt-sel: @default-bg;
@@ -131,35 +133,35 @@
@radio-bg: @default-interface-txt; @radio-bg: @default-interface-txt;
@field-lookup-btn-icon: @default-icon; @field-lookup-btn-icon: @default-icon;
@field-lookup-btn-bg: @default-bg; @field-lookup-btn-bg: @default-bg;
@field-lookup-btn-hov-bg:@default-tertiary-bg; @field-lookup-btn-hov-bg:@f2grey;
// footer // footer
@copyright-text: @default-interface-txt; @copyright-text: @default-interface-txt;
// main menu // main menu
@menu-bg: @default-bg; @menu-bg: @default-bg;
@menu-btm: @default-border; @menu-btm: @b7grey;
@menu-link-bg: @default-bg; @menu-link-bg: @default-bg;
@menu-link: @default-interface-txt; @menu-link: @default-interface-txt;
@menu-link-sides: @default-bg; @menu-link-sides: @default-bg;
@menu-link-bg-hov: @default-tertiary-bg; @menu-link-bg-hov: @default-tertiary-bg;
@menu-link-sides-hov: @default-tertiary-bg; @menu-link-sides-hov: @default-tertiary-bg;
@menu-link-btm: @default-border; @menu-link-btm: @b7grey;
@menu-link-btm-hov: @default-border; @menu-link-btm-hov: @b7grey;
@menu-link-icon: @default-icon; @menu-link-icon: @default-icon;
// breadcrumbs // breadcrumbs
@bc-bg: @default-bg; @bc-bg: @default-bg;
@bc-text: @default-interface-txt; @bc-text: @default-interface-txt;
@bc-border: @default-border; @bc-border: @b7grey;
@bc-link-icon: @default-icon; @bc-link-icon: @default-icon;
@bc-link-bg-hov: @default-tertiary-bg; @bc-link-bg-hov: @f2grey;
@bc-link-icon-focus: @default-link; @bc-link-icon-focus: @default-link;
@bc-link-side: @default-border; @bc-link-side: @default-border;
// dashboard // dashboard
@db-panel-bg: @default-bg; @db-panel-bg: @default-bg;
@db-panel-border: @default-border; @db-panel-border: @b7grey;
// dashboard counts // dashboard counts
@db-count-succ: @default-link; @db-count-succ: @default-link;
@@ -179,7 +181,7 @@
// panel // panel
@panel-bg: @default-bg; @panel-bg: @default-bg;
@panel-border: @default-border; @panel-border: @b7grey;
// activity stream details modal // activity stream details modal
@as-detail-changes-txt: @default-stdout-txt; @as-detail-changes-txt: @default-stdout-txt;

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

@@ -844,7 +844,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
} }
if (field.genMD5) { if (field.genMD5) {
html += "<span class=\"input-group-btn\"><button type=\"button\" class=\"btn btn-default Form-lookupButton\" ng-click=\"genMD5('" + fld + "')\" " + html += "<span class=\"input-group-btn\"><button type=\"button\" class=\"btn Form-lookupButton\" ng-click=\"genMD5('" + fld + "')\" " +
"aw-tool-tip=\"Generate " + field.label + "\" data-placement=\"top\" id=\"" + this.form.name + "_" + fld + "_gen_btn\">" + "aw-tool-tip=\"Generate " + field.label + "\" data-placement=\"top\" id=\"" + this.form.name + "_" + fld + "_gen_btn\">" +
"<i class=\"fa fa-magic\"></i></button></span>\n</div>\n"; "<i class=\"fa fa-magic\"></i></button></span>\n</div>\n";
} }
@@ -1371,7 +1371,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
html += `<div class="input-group Form-mixedInputGroup">`; html += `<div class="input-group Form-mixedInputGroup">`;
html += "<span class=\"input-group-btn\">\n"; html += "<span class=\"input-group-btn\">\n";
html += `<button type="button" class="Form-lookupButton btn btn-default" ng-click="${field.ngClick || defaultLookupNgClick}" html += `<button type="button" class="Form-lookupButton btn" ng-click="${field.ngClick || defaultLookupNgClick}"
${field.readonly || field.showonly} ${field.readonly || field.showonly}
${this.attr(field, "ngDisabled")} ${this.attr(field, "ngDisabled")}
id="${fld}-lookup-btn"><i class="fa fa-search"></i></button>`; id="${fld}-lookup-btn"><i class="fa fa-search"></i></button>`;

2
awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
View File

@@ -69,7 +69,7 @@
} }
.WorkflowResults-rightSide .WorkflowChart-svg { .WorkflowResults-rightSide .WorkflowChart-svg {
background-color: @default-secondary-bg; background-color: @f6grey;
border: 1px solid @d7grey; border: 1px solid @d7grey;
border-top: 0px; border-top: 0px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;

10
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less
View File

@@ -43,7 +43,7 @@
} }
.WorkflowMaker-contentHolder { .WorkflowMaker-contentHolder {
display: flex; display: flex;
border: 1px solid @d7grey; border: 1px solid @b7grey;
border-radius: 5px; border-radius: 5px;
height: ~"calc(100% - 85px)"; height: ~"calc(100% - 85px)";
} }
@@ -54,7 +54,8 @@
} }
.WorkflowMaker-contentRight { .WorkflowMaker-contentRight {
flex: 0 0 400px; flex: 0 0 400px;
border-left: 1px solid @d7grey; border-left: 1px solid @b7grey;
background: @default-bg;
padding: 20px; padding: 20px;
height: 100%; height: 100%;
overflow-y: scroll; overflow-y: scroll;
@@ -157,7 +158,8 @@
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
color: @default-interface-txt; color: @default-interface-txt;
border-bottom: 1px solid @d7grey; background: @default-bg;
border-bottom: 1px solid @b7grey;
} }
.WorkflowLegend-maker--left { .WorkflowLegend-maker--left {
flex: 1 0 auto; flex: 1 0 auto;
@@ -246,7 +248,7 @@
width: 293px; width: 293px;
background-color: @default-bg; background-color: @default-bg;
display: flex; display: flex;
border: 1px solid @d7grey; border: 1px solid @b7grey;
border-top: 0px; border-top: 0px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
margin-left: -1px; margin-left: -1px;