fixed global colors

This commit is contained in:
John Mitchell
2016-05-03 13:05:49 -04:00
committed by Leigh Johnson
parent 81fec1b7a2
commit db176d34ba
15 changed files with 57 additions and 50 deletions

View File

@@ -641,7 +641,7 @@ dd {
} }
.form-control.ng-dirty.ng-pristine { .form-control.ng-dirty.ng-pristine {
border-color: @default-second-border; border-color: @d7grey;
box-shadow: none; box-shadow: none;
} }
@@ -2007,7 +2007,7 @@ tr td button i {
} }
.form-control { .form-control {
border-color: @default-second-border; border-color: @d7grey;
background-color: #f6f6f6; background-color: #f6f6f6;
color: @default-data-txt; color: @default-data-txt;
transition: border-color 0.3s; transition: border-color 0.3s;
@@ -2015,7 +2015,7 @@ tr td button i {
} }
.form-control + .select2 .select2-selection { .form-control + .select2 .select2-selection {
border-color: @default-second-border !important; border-color: @d7grey !important;
background-color: #f6f6f6 !important; background-color: #f6f6f6 !important;
color: @default-data-txt !important; color: @default-data-txt !important;
transition: border-color 0.3s !important; transition: border-color 0.3s !important;

View File

@@ -65,7 +65,7 @@
height:20px; height:20px;
font-size: 20px; font-size: 20px;
background-color:@default-bg; background-color:@default-bg;
color:@default-second-border; color:@d7grey;
transition: color 0.2s; transition: color 0.2s;
line-height:1; line-height:1;
} }
@@ -220,7 +220,7 @@
} }
.Form-inputButton { .Form-inputButton {
border-color: @default-second-border; border-color: @d7grey;
color: @default-data-txt; color: @default-data-txt;
} }

View File

@@ -30,7 +30,7 @@ table.ui-datepicker-calendar {
line-height: 1; line-height: 1;
opacity: 1; opacity: 1;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
color:@default-second-border; color:@d7grey;
} }
.close:hover{ .close:hover{
color:@default-icon; color:@default-icon;

View File

@@ -228,7 +228,7 @@ table, tbody {
border-top-left-radius: 5px!important; border-top-left-radius: 5px!important;
border-bottom-left-radius: 5px!important; border-bottom-left-radius: 5px!important;
height: 34px!important; height: 34px!important;
border-color: @default-second-border; border-color: @d7grey;
color: @default-icon; color: @default-icon;
background-color: @default-bg; background-color: @default-bg;
border-right: none; border-right: none;

View File

@@ -8,18 +8,19 @@
*/ */
@import "src/shared/branding/colors.less"; @import "src/shared/branding/colors.less";
@import "src/shared/branding/colors.default.less";
html { height: 100%; } html { height: 100%; }
body { body {
font-family: 'Open Sans', sans-serif; font-family: 'Open Sans', sans-serif;
font-weight: 400; font-weight: 400;
color: @black; color: @default-data-txt;
padding-top: 100px; padding-top: 100px;
min-height: 100%; min-height: 100%;
padding-bottom: 50px; padding-bottom: 50px;
position: relative; position: relative;
background-color: #f6f6f6; background-color: @default-secondary-bg;
} }
.container-fluid { .container-fluid {
@@ -107,7 +108,7 @@ body {
position: relative; position: relative;
top: 1px; top: 1px;
left: 10px; left: 10px;
color: @black; color: @default-data-txt;
text-transform:capitalize; text-transform:capitalize;
} }
#account-menu { #account-menu {

View File

@@ -97,7 +97,7 @@
.AddPermissions-separator { .AddPermissions-separator {
margin-top: 20px 0px; margin-top: 20px 0px;
width: 100%; width: 100%;
border-bottom: 1px solid @default-second-border; border-bottom: 1px solid @d7grey;
} }
.AddPermissions-roleRow { .AddPermissions-roleRow {
@@ -124,7 +124,7 @@
.AddPermissions-roleType { .AddPermissions-roleType {
border-radius: 5px; border-radius: 5px;
padding: 0px 6px; padding: 0px 6px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
font-size: 10px; font-size: 10px;
color: @default-interface-txt; color: @default-interface-txt;
text-transform: uppercase; text-transform: uppercase;
@@ -171,7 +171,7 @@
background-color: @default-bg; background-color: @default-bg;
border-radius: 5px; border-radius: 5px;
color: @default-interface-txt; color: @default-interface-txt;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
cursor: pointer; cursor: pointer;
} }
@@ -190,7 +190,7 @@
border-radius: 5px; border-radius: 5px;
padding: 15px; padding: 15px;
padding-bottom: 0px; padding-bottom: 0px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
color: @default-interface-txt; color: @default-interface-txt;
} }

View File

@@ -16,7 +16,7 @@
border-radius: 5px; border-radius: 5px;
padding: 2px 10px; padding: 2px 10px;
margin: 4px 0px; margin: 4px 0px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
font-size: 12px; font-size: 12px;
color: @default-interface-txt; color: @default-interface-txt;
text-transform: uppercase; text-transform: uppercase;
@@ -37,7 +37,7 @@
} }
.RoleList-deleteContainer { .RoleList-deleteContainer {
border: 1px solid @default-second-border; border: 1px solid @d7grey;
border-left-color: @default-bg; border-left-color: @default-bg;
background-color: @default-bg; background-color: @default-bg;
border-top-right-radius: 5px; border-top-right-radius: 5px;

View File

@@ -1,5 +1,5 @@
/** @define Dashboard */ /** @define Dashboard */
@import "awx/ui/client/src/shared/branding/colors.default.less"; @import "../shared/branding/colors.default.less";
.Dashboard { .Dashboard {
display: flex; display: flex;
@@ -19,7 +19,7 @@
} }
.Dashboard-list { .Dashboard-list {
border: 1px solid #e1e1e1; border: 1px solid @default-border;
border-radius: 5px; border-radius: 5px;
margin-top: 20px; margin-top: 20px;
width: 50%; width: 50%;

View File

@@ -137,7 +137,7 @@
.JobDetail-tableToggle{ .JobDetail-tableToggle{
padding-left:10px; padding-left:10px;
padding-right: 10px; padding-right: 10px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
} }
.JobDetail-tableToggle.active{ .JobDetail-tableToggle.active{

View File

@@ -16,7 +16,7 @@
border-radius: 5px; border-radius: 5px;
padding: 2px 10px; padding: 2px 10px;
margin: 4px 0px; margin: 4px 0px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
font-size: 12px; font-size: 12px;
color: @default-interface-txt; color: @default-interface-txt;
text-transform: uppercase; text-transform: uppercase;
@@ -37,7 +37,7 @@
} }
.LabelList-deleteContainer { .LabelList-deleteContainer {
border: 1px solid @default-second-border; border: 1px solid @d7grey;
border-left-color: @default-bg; border-left-color: @default-bg;
background-color: @default-bg; background-color: @default-bg;
border-top-right-radius: 5px; border-top-right-radius: 5px;

View File

@@ -48,7 +48,7 @@
height:20px; height:20px;
font-size: 20px; font-size: 20px;
background-color:@default-bg; background-color:@default-bg;
color:@default-second-border; color:@d7grey;
transition: color 0.2s; transition: color 0.2s;
line-height:1; line-height:1;
} }

View File

@@ -21,7 +21,7 @@
.TagSearch-typeDropdown { .TagSearch-typeDropdown {
color: @default-interface-txt; color: @default-interface-txt;
flex: initial; flex: initial;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
padding: 0px 10px; padding: 0px 10px;
@@ -55,7 +55,7 @@
top: 34px; top: 34px;
font-size: 14px; font-size: 14px;
border-radius: 5px; border-radius: 5px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
background: white; background: white;
padding: 5px 0; padding: 5px 0;
border-top-left-radius: 0px; border-top-left-radius: 0px;
@@ -86,13 +86,13 @@
} }
.TagSearch-dropdownItem.is-selected { .TagSearch-dropdownItem.is-selected {
background-color: @default-button-hov; background-color: @default-no-iterms-bord;
} }
.TagSearch-searchTermContainer { .TagSearch-searchTermContainer {
flex: initial; flex: initial;
width: ~"calc(100% - 70px)"; width: ~"calc(100% - 70px)";
border: 1px solid @default-second-border; border: 1px solid @d7grey;
border-left: 0px; border-left: 0px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
@@ -147,7 +147,7 @@
flex: initial; flex: initial;
margin-left: auto; margin-left: auto;
padding: 8px 10px; padding: 8px 10px;
border-left: 1px solid @default-second-border; border-left: 1px solid @d7grey;
background-color: @default-bg; background-color: @default-bg;
cursor: pointer; cursor: pointer;
border-top-right-radius: 5px; border-top-right-radius: 5px;
@@ -174,7 +174,7 @@
border-radius: 5px; border-radius: 5px;
padding: 2px 10px; padding: 2px 10px;
margin: 4px 0px; margin: 4px 0px;
border: 1px solid @default-second-border; border: 1px solid @d7grey;
font-size: 12px; font-size: 12px;
color: @default-interface-txt; color: @default-interface-txt;
text-transform: uppercase; text-transform: uppercase;
@@ -195,7 +195,7 @@
} }
.TagSearch-deleteContainer { .TagSearch-deleteContainer {
border: 1px solid @default-second-border; border: 1px solid @d7grey;
border-left-color: @default-bg; border-left-color: @default-bg;
background-color: @default-bg; background-color: @default-bg;
border-top-right-radius: 5px; border-top-right-radius: 5px;

View File

@@ -4,23 +4,29 @@
@default-icon: #B7B7B7; @default-icon: #B7B7B7;
@default-icon-hov: #D7D7D7; // also selected button @default-icon-hov: #D7D7D7; // also selected button
@default-border: #E8E8E8; @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-bg: #FFFFFF; // also selected btn txt
@default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth @default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth
@default-tertiary-bg: #FAFAFA; // hover bg, alt-list @default-tertiary-bg: #FAFAFA; // hover bg, alt-list
@default-err: #FF5850; @default-err: #D9534F; // used to be FF5850
@default-err-hov: #FF1105; @default-err-hov: #C9302C; // used to be FF1105
@default-succ: #3CB878; @default-succ: #3CB878; //used to be 3CB878
@default-succ-hov: #60D66F; @default-succ-hov: #449D44; //used to be 60D66F
@default-succ-disabled: lighten(@default-succ, 30); @default-succ-disabled: #D7D7D7; // no different than other disableds...remove sometime
@default-link: #1678C4; @default-link: #337AB7; // used to be 1678C4
@default-link-hov: #4498DA; @default-link-hov: #286090; // used to be 4498DA
@default-button-hov: #F2F2F2;
@default-list-header-bg:#EBEBEB; @default-list-header-bg:#EBEBEB;
@default-no-items-bord: #F6F6F6; @default-no-items-bord: #F6F6F6; // also white button hovers
@default-as-detail-txt: #707070; @default-stdout-txt: #707070;
@default-dark: #000000; @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 // layout
@page-bg: @default-secondary-bg; @page-bg: @default-secondary-bg;
@@ -55,7 +61,7 @@
@list-actn-bord-hov: @default-link; @list-actn-bord-hov: @default-link;
@list-row-select-bord: @default-link; @list-row-select-bord: @default-link;
@list-pagin-text: @default-interface-txt; @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-bord-act: @default-icon-hov;
@list-pagin-bg-act: @default-icon-hov; @list-pagin-bg-act: @default-icon-hov;
@list-title-txt: @default-interface-txt; @list-title-txt: @default-interface-txt;
@@ -63,7 +69,7 @@
@list-srch-inpt-bg: @default-secondary-bg; @list-srch-inpt-bg: @default-secondary-bg;
@list-srch-inpt-txt: @default-data-txt; @list-srch-inpt-txt: @default-data-txt;
@list-srch-inpt-ph-txt: @default-icon; @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-inpt-focus: @default-link;
@list-srch-btn-icon: @default-icon; @list-srch-btn-icon: @default-icon;
@list-srch-btn-bg: @default-bg; @list-srch-btn-bg: @default-bg;
@@ -87,7 +93,7 @@
@login-notice-title: @default-interface-txt; @login-notice-title: @default-interface-txt;
@login-notice-bg: @default-secondary-bg; @login-notice-bg: @default-secondary-bg;
@login-notice-border: @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 // login modal third party auth
@third-party-label: @default-interface-txt; @third-party-label: @default-interface-txt;
@@ -102,16 +108,16 @@
@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-secondary-bg: @default-secondary-bg;
@field-border: @default-second-border; @field-border: @d7grey;
@field-border-sel: @default-link; @field-border-sel: @default-link;
@field-dropdown-icon: @default-icon; @field-dropdown-icon: @default-icon;
@field-button-bg: @default-bg; @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-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: @default-button-hov; @code-mirror-gutter: @default-no-iterms-bord;
@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;
@@ -166,4 +172,4 @@
@panel-border: @default-border; @panel-border: @default-border;
// activity stream details modal // activity stream details modal
@as-detail-changes-txt: @default-as-detail-txt; @as-detail-changes-txt: @default-stdout-txt;

View File

@@ -47,7 +47,7 @@
&-groupHeadingRow { &-groupHeadingRow {
background-color: @default-icon-hov; background-color: @default-icon-hov;
padding: 1em 12px; padding: 1em 12px;
color: @default-as-detail-txt; color: @default-interface-txt;
font-size: 14px; font-size: 14px;
} }
@@ -116,7 +116,7 @@
flex-wrap: wrap; flex-wrap: wrap;
align-items: flex-end; align-items: flex-end;
font-size: 14px; font-size: 14px;
color: @default-as-detail-txt; color: @default-interface-txt;
text-transform: uppercase; text-transform: uppercase;
&-host { &-host {

View File

@@ -48,7 +48,7 @@
} }
&:hover { &:hover {
background-color: @default-as-detail-txt; background-color: @default-interface-txt;
} }
} }
} }