on master help sign in
update iconography
commita41a9b0c71f2168ded2c90a4be968dce6542ce9b authorLiam Fitzgerald <liam@urizen.co> dateSat 7 Mar 2020, 11:58 (7 years ago) parent99fd83c
4 files changed+9−14
src/assets/copy.svg+2−6 src/components/MiniBackButton.js+2−4 src/components/View.js+3−2 src/views/Points.js+2−2
src/assets/copy.svg+2−6
@@ -1,7 +1,3 @@
1−<svg class="svg-icon" viewBox="0 0 20 20">
2− <path fill="black" d="M18.378,1.062H3.855c-0.309,0-0.559,0.25-0.559,0.559c0,0.309,0.25,0.559,0.559,0.559h13.964v13.964
3− c0,0.309,0.25,0.559,0.559,0.559c0.31,0,0.56-0.25,0.56-0.559V1.621C18.938,1.312,18.688,1.062,18.378,1.062z M16.144,3.296H1.621
4− c-0.309,0-0.559,0.25-0.559,0.559v14.523c0,0.31,0.25,0.56,0.559,0.56h14.523c0.309,0,0.559-0.25,0.559-0.56V3.855
5− C16.702,3.546,16.452,3.296,16.144,3.296z M15.586,17.262c0,0.31-0.25,0.558-0.56,0.558H2.738c-0.309,0-0.559-0.248-0.559-0.558
6− V4.972c0-0.309,0.25-0.559,0.559-0.559h12.289c0.31,0,0.56,0.25,0.56,0.559V17.262z"></path>
1+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
2+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 3H4V10H6V6V5H7H9V3ZM10 5H12H13V6V13V14H12H7H6V13V11H4H3V10V3V2H4H9H10V3V5ZM7 6H12V13H7V6Z" fill="black"/>
73</svg>
src/components/MiniBackButton.js+2−4
@@ -2,12 +2,10 @@ import React from 'react';
22import cn from 'classnames';
33import { IconButton } from 'indigo-react';
44
5−import { ReactComponent as Back } from 'assets/back.svg';
6−
75export default ({ className, isExit = false, ...rest }) => {
86 return (
9− <IconButton {...rest}>
10− {isExit ? '⏏' : <Back className={cn('black', className)} />}
7+ <IconButton className={cn('black', className)} {...rest}>
8+ {'<-'}
119 </IconButton>
1210 );
1311};
src/components/View.js+3−2
@@ -14,6 +14,7 @@ function View({
1414 children,
1515 inset = false,
1616 full = false,
17+ hideBack = false,
1718 pop,
1819 ...rest
1920}) {
@@ -75,12 +76,12 @@ function View({
7576 col
7677 style={{ width: '48px' }}
7778 className={cn(insetPadding)}>
78− {showBackButton && (
79+ {showBackButton && !hideBack && (
7980 <MiniBackButton
8081 hpadding={!isMobile}
8182 vpadding={isMobile}
8283 onClick={goBack}
83− className="mt2"
84+ className="mt1"
8485 />
8586 )}
8687 </Flex.Item>
src/views/Points.js+2−2
@@ -231,7 +231,7 @@ export default function Points() {
231231 !starReleasing)
232232 ) {
233233 return (
234− <View inset pop={pop}>
234+ <View inset>
235235 <Grid>
236236 <Grid.Item full as={HelpText} className="mt8 t-center">
237237 <Blinky /> Loading...
@@ -242,7 +242,7 @@ export default function Points() {
242242 }
243243
244244 return (
245− <View pop={pop} inset>
245+ <View inset pop={pop} hideBack>
246246 <NavHeader>
247247 <CopiableAddress
248248 text={address}