Skip to content

Commit

Permalink
update icons
Browse files Browse the repository at this point in the history
  • Loading branch information
mattdean-digicatapult committed Sep 22, 2022
1 parent f150fdd commit f1adf6d
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 7 deletions.
5 changes: 5 additions & 0 deletions src/assets/images/cloud-upload-alt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/images/hacker-app-icon-morello.png
Binary file not shown.
1 change: 1 addition & 0 deletions src/assets/images/key.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/assets/images/keychain-strip.png
Binary file not shown.
8 changes: 8 additions & 0 deletions src/assets/images/unlock.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions src/components/demos/read/Demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Col, Row, DemoText, Container } from '../../shared/Common'
import Input from '../../shared/Input'
import ProgressBar from './ProgressBar'
import Modal from './Modal'
import KeychainIcon from '../../../assets/images/keychain-strip.png'
import KeyIcon from '../../../assets/images/key.svg'
import { Themes } from '../../../fixtures/themes'

const Wrapper = styled.div`
Expand All @@ -23,6 +23,10 @@ const Wrapper = styled.div`
`
const Button = styled.button((props) => props)

const Key = styled.img`
margin: 0px 25px 25px 0px;
`

export default function ReadDemo(props) {
const state = React.useContext(Context)

Expand Down Expand Up @@ -125,7 +129,7 @@ export default function ReadDemo(props) {
justifyContent={isMorello ? 'center' : 'flex-start'}
marginTop={isMorello ? '120px' : '0px'}
>
{isMorello && <img src={KeychainIcon} />}
{isMorello && <Key width={'50px'} src={KeyIcon} />}
<DemoText {...theme.font}>
This application will store your secret securely.
<br />
Expand Down Expand Up @@ -163,7 +167,7 @@ export default function ReadDemo(props) {
{readDemo.isSecretSet && isMorello && (
<Col size={10}>
<Row justifyContent={'center'} marginTop={'120px'}>
<img src={KeychainIcon} />
<Key width={'50px'} src={KeyIcon} />
<DemoText {...theme.font}>
This application will store your secret securely.
<br />
Expand Down
1 change: 1 addition & 0 deletions src/fixtures/demos.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export const demos = [
title: 'Is your password what you think it is?',
description: 'Out of Bounds write. CWE Score 65.93',
color: '#6C3838',
icon: bugIcon,
secretDesktop: [
{
name: 'Documents',
Expand Down
8 changes: 4 additions & 4 deletions src/fixtures/themes.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import backgroundImgOsx from '../assets/images/osx-background.png'
import iconOsx from '../assets/images/hacker-app-icon-morello.png'
import lockIconOsx from '../assets/images/lock.png'
import hackerIconOsx from '../assets/images/unlock.svg'
import lockIconOsx from '../assets/images/cloud-upload-alt.svg'

import backgroundImg from '../assets/images/background.png'
import iconImg from '../assets/images/hacker-app-icon.png'
import hackerIconImg from '../assets/images/hacker-app-icon.png'
import lockIconImg from '../assets/images/lock.png'

// LP TODO - a lot of properties are shared between morello and aarch64, abstract
Expand Down Expand Up @@ -128,7 +128,7 @@ export const Themes = (arch) => {
backgroundSize: 'cover',
},
icons: {
hackerIcon: isCheri ? iconOsx : iconImg,
hackerIcon: isCheri ? hackerIconOsx : hackerIconImg,
},
modal: {
button: isCheri
Expand Down

0 comments on commit f1adf6d

Please sign in to comment.