Skip to content

Commit 9767a74

Browse files
committed
Merge branch 'release-1.0.4' into release
2 parents 8e2b520 + b12e60f commit 9767a74

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+20467
-14151
lines changed

Diff for: .github/FUNDING.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
custom: https://processingfoundation.org/support
1+
github: processing
2+
custom: https://processingfoundation.org/

Diff for: Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ COPY .babelrc index.js nodemon.json ./
1414
COPY ./webpack ./webpack
1515
COPY client ./client
1616
COPY server ./server
17+
COPY translations/locales ./translations/locales
1718
CMD ["npm", "start"]
1819

1920
FROM development as build

Diff for: client/common/Icons.jsx

-51
This file was deleted.

Diff for: client/common/Icons.stories.jsx

-18
This file was deleted.

Diff for: client/common/icons.jsx

+27-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3+
import styled from 'styled-components';
4+
import { prop } from '../theme';
35
import SortArrowUp from '../images/sort-arrow-up.svg';
46
import SortArrowDown from '../images/sort-arrow-down.svg';
57
import Github from '../images/github.svg';
68
import Google from '../images/google.svg';
79
import Plus from '../images/plus-icon.svg';
810
import Close from '../images/close.svg';
11+
import Exit from '../images/exit.svg';
912
import DropdownArrow from '../images/down-filled-triangle.svg';
13+
import Preferences from '../images/preferences.svg';
14+
import Play from '../images/triangle-arrow-right.svg';
1015

1116
// HOC that adds the right web accessibility props
1217
// https://www.scottohara.me/blog/2019/05/22/contextual-images-svgs-and-a11y.html
@@ -15,16 +20,33 @@ import DropdownArrow from '../images/down-filled-triangle.svg';
1520
// Need to add size to these - like small icon, medium icon, large icon. etc.
1621
function withLabel(SvgComponent) {
1722
const Icon = (props) => {
23+
const StyledIcon = styled(SvgComponent)`
24+
&&& {
25+
color: ${prop('Icon.default')};
26+
& g, & path, & polygon {
27+
opacity: 1;
28+
fill: ${prop('Icon.default')};
29+
}
30+
&:hover {
31+
color: ${prop('Icon.hover')};
32+
& g, & path, & polygon {
33+
opacity: 1;
34+
fill: ${prop('Icon.hover')};
35+
}
36+
}
37+
}
38+
`;
39+
1840
const { 'aria-label': ariaLabel } = props;
1941
if (ariaLabel) {
20-
return (<SvgComponent
42+
return (<StyledIcon
2143
{...props}
2244
aria-label={ariaLabel}
2345
role="img"
2446
focusable="false"
2547
/>);
2648
}
27-
return (<SvgComponent
49+
return (<StyledIcon
2850
{...props}
2951
aria-hidden
3052
focusable="false"
@@ -48,4 +70,7 @@ export const GithubIcon = withLabel(Github);
4870
export const GoogleIcon = withLabel(Google);
4971
export const PlusIcon = withLabel(Plus);
5072
export const CloseIcon = withLabel(Close);
73+
export const ExitIcon = withLabel(Exit);
5174
export const DropdownArrowIcon = withLabel(DropdownArrow);
75+
export const PreferencesIcon = withLabel(Preferences);
76+
export const PlayIcon = withLabel(Play);

0 commit comments

Comments
 (0)