From db176d34bad42d63b694f527a1dada1a8414aa7c Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 13:05:49 -0400 Subject: [PATCH] fixed global colors --- awx/ui/client/legacy-styles/ansible-ui.less | 6 +-- awx/ui/client/legacy-styles/forms.less | 4 +- .../legacy-styles/jquery-ui-overrides.less | 2 +- awx/ui/client/legacy-styles/lists.less | 2 +- awx/ui/client/legacy-styles/main-layout.less | 7 ++-- .../addPermissions/addPermissions.block.less | 8 ++-- awx/ui/client/src/access/roleList.block.less | 4 +- .../client/src/dashboard/dashboard.block.less | 4 +- .../src/job-detail/job-detail.block.less | 2 +- .../labels/labelsList.block.less | 4 +- .../survey-maker/survey-maker.block.less | 2 +- awx/ui/client/src/search/tagSearch.block.less | 14 +++---- .../src/shared/branding/colors.default.less | 42 +++++++++++-------- .../fact-data-table.block.less | 4 +- .../fact-module-filter.block.less | 2 +- 15 files changed, 57 insertions(+), 50 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index cfee86535e..24bbd7c45d 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -641,7 +641,7 @@ dd { } .form-control.ng-dirty.ng-pristine { - border-color: @default-second-border; + border-color: @d7grey; box-shadow: none; } @@ -2007,7 +2007,7 @@ tr td button i { } .form-control { - border-color: @default-second-border; + border-color: @d7grey; background-color: #f6f6f6; color: @default-data-txt; transition: border-color 0.3s; @@ -2015,7 +2015,7 @@ tr td button i { } .form-control + .select2 .select2-selection { - border-color: @default-second-border !important; + border-color: @d7grey !important; background-color: #f6f6f6 !important; color: @default-data-txt !important; transition: border-color 0.3s !important; diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 4f65172302..e8d7589b46 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -65,7 +65,7 @@ height:20px; font-size: 20px; background-color:@default-bg; - color:@default-second-border; + color:@d7grey; transition: color 0.2s; line-height:1; } @@ -220,7 +220,7 @@ } .Form-inputButton { - border-color: @default-second-border; + border-color: @d7grey; color: @default-data-txt; } diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less index 2f78c52051..f9748fc807 100644 --- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less +++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less @@ -30,7 +30,7 @@ table.ui-datepicker-calendar { line-height: 1; opacity: 1; text-shadow: 0 1px 0 @white; - color:@default-second-border; + color:@d7grey; } .close:hover{ color:@default-icon; diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 3c257e525c..14d4ea1c2e 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -228,7 +228,7 @@ table, tbody { border-top-left-radius: 5px!important; border-bottom-left-radius: 5px!important; height: 34px!important; - border-color: @default-second-border; + border-color: @d7grey; color: @default-icon; background-color: @default-bg; border-right: none; diff --git a/awx/ui/client/legacy-styles/main-layout.less b/awx/ui/client/legacy-styles/main-layout.less index 48d6709168..2aa3491b05 100644 --- a/awx/ui/client/legacy-styles/main-layout.less +++ b/awx/ui/client/legacy-styles/main-layout.less @@ -8,18 +8,19 @@ */ @import "src/shared/branding/colors.less"; +@import "src/shared/branding/colors.default.less"; html { height: 100%; } body { font-family: 'Open Sans', sans-serif; font-weight: 400; - color: @black; + color: @default-data-txt; padding-top: 100px; min-height: 100%; padding-bottom: 50px; position: relative; - background-color: #f6f6f6; + background-color: @default-secondary-bg; } .container-fluid { @@ -107,7 +108,7 @@ body { position: relative; top: 1px; left: 10px; - color: @black; + color: @default-data-txt; text-transform:capitalize; } #account-menu { diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.block.less b/awx/ui/client/src/access/addPermissions/addPermissions.block.less index 9352a04192..ea41f8d214 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.block.less +++ b/awx/ui/client/src/access/addPermissions/addPermissions.block.less @@ -97,7 +97,7 @@ .AddPermissions-separator { margin-top: 20px 0px; width: 100%; - border-bottom: 1px solid @default-second-border; + border-bottom: 1px solid @d7grey; } .AddPermissions-roleRow { @@ -124,7 +124,7 @@ .AddPermissions-roleType { border-radius: 5px; padding: 0px 6px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; font-size: 10px; color: @default-interface-txt; text-transform: uppercase; @@ -171,7 +171,7 @@ background-color: @default-bg; border-radius: 5px; color: @default-interface-txt; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; cursor: pointer; } @@ -190,7 +190,7 @@ border-radius: 5px; padding: 15px; padding-bottom: 0px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; color: @default-interface-txt; } diff --git a/awx/ui/client/src/access/roleList.block.less b/awx/ui/client/src/access/roleList.block.less index b3e1d635c9..e1384702c8 100644 --- a/awx/ui/client/src/access/roleList.block.less +++ b/awx/ui/client/src/access/roleList.block.less @@ -16,7 +16,7 @@ border-radius: 5px; padding: 2px 10px; margin: 4px 0px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; font-size: 12px; color: @default-interface-txt; text-transform: uppercase; @@ -37,7 +37,7 @@ } .RoleList-deleteContainer { - border: 1px solid @default-second-border; + border: 1px solid @d7grey; border-left-color: @default-bg; background-color: @default-bg; border-top-right-radius: 5px; diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 25943d19f4..75d9525040 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -1,5 +1,5 @@ /** @define Dashboard */ -@import "awx/ui/client/src/shared/branding/colors.default.less"; +@import "../shared/branding/colors.default.less"; .Dashboard { display: flex; @@ -19,7 +19,7 @@ } .Dashboard-list { - border: 1px solid #e1e1e1; + border: 1px solid @default-border; border-radius: 5px; margin-top: 20px; width: 50%; diff --git a/awx/ui/client/src/job-detail/job-detail.block.less b/awx/ui/client/src/job-detail/job-detail.block.less index a2b0d0b045..ee02d3d639 100644 --- a/awx/ui/client/src/job-detail/job-detail.block.less +++ b/awx/ui/client/src/job-detail/job-detail.block.less @@ -137,7 +137,7 @@ .JobDetail-tableToggle{ padding-left:10px; padding-right: 10px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; } .JobDetail-tableToggle.active{ diff --git a/awx/ui/client/src/job-templates/labels/labelsList.block.less b/awx/ui/client/src/job-templates/labels/labelsList.block.less index a736558b18..4e99567eaa 100644 --- a/awx/ui/client/src/job-templates/labels/labelsList.block.less +++ b/awx/ui/client/src/job-templates/labels/labelsList.block.less @@ -16,7 +16,7 @@ border-radius: 5px; padding: 2px 10px; margin: 4px 0px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; font-size: 12px; color: @default-interface-txt; text-transform: uppercase; @@ -37,7 +37,7 @@ } .LabelList-deleteContainer { - border: 1px solid @default-second-border; + border: 1px solid @d7grey; border-left-color: @default-bg; background-color: @default-bg; border-top-right-radius: 5px; diff --git a/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less b/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less index 027b1c53ae..02fe6252c6 100644 --- a/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less +++ b/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less @@ -48,7 +48,7 @@ height:20px; font-size: 20px; background-color:@default-bg; - color:@default-second-border; + color:@d7grey; transition: color 0.2s; line-height:1; } diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less index 29296b7cb3..1cc88d9221 100644 --- a/awx/ui/client/src/search/tagSearch.block.less +++ b/awx/ui/client/src/search/tagSearch.block.less @@ -21,7 +21,7 @@ .TagSearch-typeDropdown { color: @default-interface-txt; flex: initial; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; border-top-left-radius: 5px; border-bottom-left-radius: 5px; padding: 0px 10px; @@ -55,7 +55,7 @@ top: 34px; font-size: 14px; border-radius: 5px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; background: white; padding: 5px 0; border-top-left-radius: 0px; @@ -86,13 +86,13 @@ } .TagSearch-dropdownItem.is-selected { - background-color: @default-button-hov; + background-color: @default-no-iterms-bord; } .TagSearch-searchTermContainer { flex: initial; width: ~"calc(100% - 70px)"; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; border-left: 0px; border-top-right-radius: 5px; border-bottom-right-radius: 5px; @@ -147,7 +147,7 @@ flex: initial; margin-left: auto; padding: 8px 10px; - border-left: 1px solid @default-second-border; + border-left: 1px solid @d7grey; background-color: @default-bg; cursor: pointer; border-top-right-radius: 5px; @@ -174,7 +174,7 @@ border-radius: 5px; padding: 2px 10px; margin: 4px 0px; - border: 1px solid @default-second-border; + border: 1px solid @d7grey; font-size: 12px; color: @default-interface-txt; text-transform: uppercase; @@ -195,7 +195,7 @@ } .TagSearch-deleteContainer { - border: 1px solid @default-second-border; + border: 1px solid @d7grey; border-left-color: @default-bg; background-color: @default-bg; border-top-right-radius: 5px; diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 1713540c93..7db4511084 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -4,23 +4,29 @@ @default-icon: #B7B7B7; @default-icon-hov: #D7D7D7; // also selected button @default-border: #E8E8E8; -@default-second-border: #D7D7D7; +@d7grey: #D7D7D7; // used for random things, like the close button on top-right corner of panes @default-bg: #FFFFFF; // also selected btn txt @default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth @default-tertiary-bg: #FAFAFA; // hover bg, alt-list -@default-err: #FF5850; -@default-err-hov: #FF1105; -@default-succ: #3CB878; -@default-succ-hov: #60D66F; -@default-succ-disabled: lighten(@default-succ, 30); -@default-link: #1678C4; -@default-link-hov: #4498DA; -@default-button-hov: #F2F2F2; +@default-err: #D9534F; // used to be FF5850 +@default-err-hov: #C9302C; // used to be FF1105 +@default-succ: #3CB878; //used to be 3CB878 +@default-succ-hov: #449D44; //used to be 60D66F +@default-succ-disabled: #D7D7D7; // no different than other disableds...remove sometime +@default-link: #337AB7; // used to be 1678C4 +@default-link-hov: #286090; // used to be 4498DA @default-list-header-bg:#EBEBEB; -@default-no-items-bord: #F6F6F6; -@default-as-detail-txt: #707070; +@default-no-items-bord: #F6F6F6; // also white button hovers +@default-stdout-txt: #707070; @default-dark: #000000; +// TODO: not used yet! +@default-warning: #F0AD4E; +@default-warning-hov: #EC971F; +@default-unreachable: #FF0000; +@default-unreachable-hov:#D81F1F; +@default-white-button-bord:#E1E1E1; + // layout @page-bg: @default-secondary-bg; @@ -55,7 +61,7 @@ @list-actn-bord-hov: @default-link; @list-row-select-bord: @default-link; @list-pagin-text: @default-interface-txt; -@list-pagin-bord: @default-second-border; +@list-pagin-bord: @d7grey; @list-pagin-bord-act: @default-icon-hov; @list-pagin-bg-act: @default-icon-hov; @list-title-txt: @default-interface-txt; @@ -63,7 +69,7 @@ @list-srch-inpt-bg: @default-secondary-bg; @list-srch-inpt-txt: @default-data-txt; @list-srch-inpt-ph-txt: @default-icon; -@list-srch-inpt-bord: @default-second-border; +@list-srch-inpt-bord: @d7grey; @list-srch-inpt-focus: @default-link; @list-srch-btn-icon: @default-icon; @list-srch-btn-bg: @default-bg; @@ -87,7 +93,7 @@ @login-notice-title: @default-interface-txt; @login-notice-bg: @default-secondary-bg; @login-notice-border: @default-secondary-bg; -@login-notice-text: @default-as-detail-txt; +@login-notice-text: @default-stdout-txt; // login modal third party auth @third-party-label: @default-interface-txt; @@ -102,16 +108,16 @@ @field-input-text: @default-data-txt; @field-bg: @default-tertiary-bg; @field-secondary-bg: @default-secondary-bg; -@field-border: @default-second-border; +@field-border: @d7grey; @field-border-sel: @default-link; @field-dropdown-icon: @default-icon; @field-button-bg: @default-bg; -@field-button-hov: @default-button-hov; +@field-button-hov: @default-no-iterms-bord; @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: @default-button-hov; +@code-mirror-gutter: @default-no-iterms-bord; @radio-bg: @default-interface-txt; @field-lookup-btn-icon: @default-icon; @field-lookup-btn-bg: @default-bg; @@ -166,4 +172,4 @@ @panel-border: @default-border; // activity stream details modal -@as-detail-changes-txt: @default-as-detail-txt; +@as-detail-changes-txt: @default-stdout-txt; diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less index 08e6b73297..1b20cf5f8a 100644 --- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less +++ b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less @@ -47,7 +47,7 @@ &-groupHeadingRow { background-color: @default-icon-hov; padding: 1em 12px; - color: @default-as-detail-txt; + color: @default-interface-txt; font-size: 14px; } @@ -116,7 +116,7 @@ flex-wrap: wrap; align-items: flex-end; font-size: 14px; - color: @default-as-detail-txt; + color: @default-interface-txt; text-transform: uppercase; &-host { diff --git a/awx/ui/client/src/system-tracking/fact-module-filter.block.less b/awx/ui/client/src/system-tracking/fact-module-filter.block.less index 8aaf82d5f4..6b5d1bc7c3 100644 --- a/awx/ui/client/src/system-tracking/fact-module-filter.block.less +++ b/awx/ui/client/src/system-tracking/fact-module-filter.block.less @@ -48,7 +48,7 @@ } &:hover { - background-color: @default-as-detail-txt; + background-color: @default-interface-txt; } } }