Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
yuvalbl committed May 12, 2021
2 parents 6992966 + 2786236 commit d2eda36
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 6 deletions.
5 changes: 4 additions & 1 deletion docs/Release.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Updating all environments (Production & Demo) are prefeable, although per-envron
### Create a Release

#### Before starting

1. Checkout `dev` branch and `git pull`
1. Make sure you update `version` field in `package.json` for `dev` branch

Expand All @@ -20,7 +21,9 @@ so if last release was `v0.2.0`, next release should be `v0.3.0`.

#### Step 2: Publish a Release on `dev` branch ( / `demo` etc)

Follow [Creating a release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release) steps 1 - 6.
Go to [create a new release](https://github.com/hasadna/anyway-newsflash-infographics/releases/new) and create a release with the version number and `Target:master`.

If you're new to github releases, follow [Creating a release](https://help.github.com/en/github/administering-a-repository/managing-releases-in-a-repository#creating-a-release) steps 1 - 6.

If you want to add changes to your release after creation, You may either:

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "anyway-newsflash-infographics",
"version": "0.4.0",
"version": "0.4.1",
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.3",
Expand Down
3 changes: 2 additions & 1 deletion src/components/molecules/DialogWithHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ interface IProps {
const useStyles = makeStyles((theme: Theme) =>
createStyles({
dialogHeader: {
padding: theme.spacing(0, 1.5, 0, 3),
padding: 0,
paddingInlineStart: theme.spacing(3),
borderBottom: `2px solid ${shadowColor}`,
},
bar: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const HeadOnCollisionsComparisonWidget: FC<IProps> = ({ data, segmetText, usePer
const { t } = useTranslation();
const bigPieData = data.items.specific_road_segment_fatal_accidents;
const smallPieData = data.items.all_roads_fatal_accidents;
const roadNumberSegment: string = ` ${t('route')} ${store.newsFlashWidgetsMetaRoadNumber}`;
const roadNumberSegment: string = ` ${t('onUrban.route')} ${store.newsFlashWidgetsMetaRoadNumber}`;
const descSegment: string = roadNumberSegment == null ? '' : segmetText.substr(roadNumberSegment.length);
return (
<Box height={'100%'} display="flex" flexDirection="column" mr={'80px'}>
Expand Down
4 changes: 3 additions & 1 deletion src/components/organisms/AboutDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ const AboutDialog: FC<IProps> = ({ isShowing, onClose }) => {
<Typography.Body5>
{t('aboutDialog.We believe')}
&nbsp;
<a href={t('aboutDialog.linkUrl')}>{t('aboutDialog.linkText')}</a>
<a href={t('aboutDialog.linkUrl')} target="_blank" rel="noopener noreferrer">
{t('aboutDialog.linkText')}
</a>
</Typography.Body5>
</Box>
</article>
Expand Down
2 changes: 1 addition & 1 deletion src/components/organisms/CardEditorDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const CardEditor: FC<IProps> = ({ isOpen, onClose, widgetName, text }) => {
);

return (
<DialogWithHeader fullWidth={true} isShowing={isOpen} onClose={onClose} title={t('cardEditor.title')}>
<DialogWithHeader fullWidth={true} isShowing={isOpen} onClose={onClose} title={t('cardEditor.edit')}>
<Box display="flex">
<Box px={2} display="flex" flexDirection="column" flexBasis={200} minWidth={200} boxSizing="border-box">
<Box mt={2} display="flex" flexDirection="column">
Expand Down
1 change: 1 addition & 0 deletions src/components/organisms/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const useStyles = makeStyles({
linkItem: {
borderLeft: `2px solid ${silverSmokeColor}`,
cursor: 'pointer',
transition: 'color 0.3s',
'&:hover': {
color: `${skyBlueColor}`,
},
Expand Down

0 comments on commit d2eda36

Please sign in to comment.