Skip to content

Commit

Permalink
update theme
Browse files Browse the repository at this point in the history
  • Loading branch information
sarahd93 committed Jul 30, 2019
1 parent 67e4975 commit aee582a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports[`ComplianceStatusBar tests should render 1`] = `
.c1 {
height: 13px;
width: 75%;
background: #f0a519;
background: #fdc300;
}
@media print {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ describe('ComplianceStatusBar tests', () => {
const {getByTestId} = render(<ComplianceStatusBar complianceStatus={75} />);
const progress = getByTestId('progress');

expect(progress).toHaveStyleRule('background', Theme.warnYellow);
expect(progress).toHaveStyleRule('background', Theme.goldYellow);
});

test('should render background for low compliance', () => {
Expand Down
2 changes: 1 addition & 1 deletion gsa/src/web/components/bar/compliancestatusbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const ComplianceStatusBar = ({complianceStatus}) => {
} else if (complianceStatus <= 50) {
type = Theme.errorRed;
} else {
type = Theme.warnYellow;
type = Theme.goldYellow;
}
return (
<ProgressBar title={text} progress={complianceStatus} background={type}>
Expand Down
4 changes: 2 additions & 2 deletions gsa/src/web/utils/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ const Theme = {
/* source styleguide */
lightGreen: '#87d050',
green: '#66c430',
paleGreen: '#99BE48',

lightGray: '#c8d3d9', // used by: disabled inputs
mediumGray: '#787878',
darkGray: '#393637',

goldYellow: '#fdc300',
warnYellow: '#f0a519',
redBrown: '#a54317',

/* source own */
Expand All @@ -48,6 +46,8 @@ const Theme = {
mediumBlue: '#5897fb', // used by active/hovered items in Select
blue: '#0000ff', // used by: links

paleGreen: '#99BE48', // used by: compliance status bar

/* source ? */
darkGreen: '#519032', // RGB: 81, 144, 50
darkGreenTransparent: 'rgba(81, 144, 50, 0.8)', // corresponds to darkGreen
Expand Down

0 comments on commit aee582a

Please sign in to comment.