Skip to content

Commit

Permalink
Merge pull request #134 from easteregg/add-design-elements-to-reports
Browse files Browse the repository at this point in the history
Reports page design changes
  • Loading branch information
negarn committed Jul 3, 2019
2 parents 0fed562 + ab10694 commit d857ea7
Show file tree
Hide file tree
Showing 60 changed files with 1,428 additions and 303 deletions.
14 changes: 14 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@
"react-pose": "4.0.8",
"react-router-dom": "5.0.0",
"react-transition-group": "2.4.0",
"react-window": "^1.8.3",
"sinon": "7.2.2",
"smartcharts-beta": "0.4.36",
"tt-react-custom-scrollbars": "4.2.1-tt2",
Expand Down
1 change: 1 addition & 0 deletions src/images/app/portfolio/underlying-icons/ic-FRXGBPNZD.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/images/app/portfolio/underlying-icons/ic-FRXUSDMXN.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ import React from 'react';
import Icon from 'Assets/icon.jsx';
import { localize } from '_common/localize';

const FooterIcon = (use_icon) => use_icon || 'IconCalendarToday';

const CalendarFooter = ({
footer,
has_today_btn,
has_range_selection,
duration_date,
is_minimum,
onClick,
use_icon,
}) => (
<React.Fragment>
{ (has_today_btn || footer || has_range_selection) &&
Expand All @@ -18,7 +21,7 @@ const CalendarFooter = ({
{ has_range_selection && <span className='calendar__text'>{ `${!is_minimum ? localize('Duration: ') : ''}${duration_date}` }</span> }
{ has_today_btn &&
<Icon
icon='IconCalendarToday'
icon={FooterIcon(use_icon)}
className='calendar__icon'
onClick={onClick}
/>
Expand All @@ -35,6 +38,7 @@ CalendarFooter.propTypes = {
has_today_btn : PropTypes.bool,
is_minimum : PropTypes.bool,
onClick : PropTypes.func,
use_icon : PropTypes.string,
};

export default CalendarFooter;
Loading

0 comments on commit d857ea7

Please sign in to comment.