Skip to content

Commit e2871b4

Browse files
DownloadIcon wrapper replaced with svg (#793)
- DownloadIcon wrapper replaced with correct svg For context, Max's explanation is: - the original download.svg was exported without the whitespace so it was a 16x16px rather than a 24x24px - without the white space all the icons will be different sizes - we will probably find other icons that have previously been exported incorrectly and will need to be replaced
1 parent f11ec30 commit e2871b4

File tree

8 files changed

+14
-25
lines changed

8 files changed

+14
-25
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3636

3737
### Fixed
3838

39+
- Correct download.svg replaces DownloadIcon component (#793)
3940
- Container rather than media query breakpoints for the web component (#776)
4041
- `FileMenu` alignment (#720)
4142
- Edit icon not showing in ContextMenu (#720)

src/assets/icons/download.svg

+3
Loading

src/assets/stylesheets/DesignSystemButton.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@use './rpf_design_system/colours' as *;
1+
@use "./rpf_design_system/colours" as *;
22

33
:root * {
44
--rpf-button-primary-background-color: #{$rpf-teal-primary-default};
@@ -179,3 +179,7 @@
179179
}
180180
}
181181
}
182+
183+
.rpf-button__icon {
184+
display: flex;
185+
}

src/components/Menus/Sidebar/DownloadPanel/DownloadPanel.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
44
import SidebarPanel from "../SidebarPanel";
55
import DownloadButton from "../../../DownloadButton/DownloadButton";
66
import DesignSystemButton from "../../../DesignSystemButton/DesignSystemButton";
7-
import DownloadIcon from "../../../../utils/DownloadIcon";
7+
import DownloadIcon from "../../../../assets/icons/download.svg";
88

99
import {
1010
logInEvent,

src/components/Menus/Sidebar/ProjectsPanel/ProjectsPanel.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
66
import "../../../../assets/stylesheets/ProjectsPanel.scss";
77
import ProjectName from "../../../ProjectName/ProjectName";
88
import ProjectInfo from "./ProjectInfo/ProjectInfo";
9-
import DownloadIcon from "../../../../utils/DownloadIcon";
9+
import DownloadIcon from "../../../../assets/icons/download.svg";
1010
import DownloadButton from "../../../DownloadButton/DownloadButton";
1111
import SaveButton from "../../../SaveButton/SaveButton";
1212
import { useSelector } from "react-redux";

src/components/Menus/Sidebar/Sidebar.jsx

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import HomeIcon from "../../../assets/icons/home.svg";
1212
import ImageIcon from "../../../assets/icons/image.svg";
1313
import InfoIcon from "../../../assets/icons/info.svg";
1414
import SettingsIcon from "../../../assets/icons/settings.svg";
15-
import DownloadIcon from "../../../utils/DownloadIcon";
15+
import DownloadIcon from "../../../assets/icons/download.svg";
1616
import StepsIcon from "../../../assets/icons/steps.svg";
1717
import ProjectsPanel from "./ProjectsPanel/ProjectsPanel";
1818

@@ -26,8 +26,6 @@ import InstructionsPanel from "./InstructionsPanel/InstructionsPanel";
2626
const Sidebar = ({ options = [] }) => {
2727
const { t } = useTranslation();
2828

29-
const DownloadIcon24x24 = () => <DownloadIcon width={24} height={24} />;
30-
3129
let menuOptions = [
3230
{
3331
name: "projects",
@@ -59,7 +57,7 @@ const Sidebar = ({ options = [] }) => {
5957
},
6058
{
6159
name: "download",
62-
icon: DownloadIcon24x24,
60+
icon: DownloadIcon,
6361
title: t("sidebar.download"),
6462
position: "top",
6563
panel: DownloadPanel,

src/components/ProjectBar/ProjectBar.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import "../../assets/stylesheets/ProjectBar.scss";
22
import { useSelector } from "react-redux";
33
import { useTranslation } from "react-i18next";
44
import SaveStatus from "../SaveStatus/SaveStatus";
5-
import DownloadIcon from "../../utils/DownloadIcon";
5+
import DownloadIcon from "../../assets/icons/download.svg";
66
import ProjectName from "../ProjectName/ProjectName";
77
import DownloadButton from "../DownloadButton/DownloadButton";
88
import SaveButton from "../SaveButton/SaveButton";

src/utils/DownloadIcon.jsx

-17
This file was deleted.

0 commit comments

Comments
 (0)