Skip to content

Commit

Permalink
Imptofu tweaks (keybase#18705)
Browse files Browse the repository at this point in the history
* tweaks

* images, storybook
  • Loading branch information
cecileboucheron authored Aug 2, 2019
1 parent 6eefc42 commit defd511
Show file tree
Hide file tree
Showing 33 changed files with 20 additions and 19 deletions.
Binary file modified shared/images/icons/icon-email-add-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-email-add-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-email-add-96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-phone-number-add-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-phone-number-add-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-phone-number-add-96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-phone-number-remove-48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-phone-number-remove-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/icon-phone-number-remove-96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified shared/images/icons/[email protected]
Binary file modified shared/images/icons/[email protected]
12 changes: 6 additions & 6 deletions shared/settings/account/add-modals.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const Email = () => {
onChangeAllowSearch={onChangeAllowSearch}
onContinue={onContinue}
icon={
<Kb.Icon type={Styles.isMobile ? 'icon-email-add-64' : 'icon-email-add-48'} style={styles.icon} />
<Kb.Icon type={Styles.isMobile ? 'icon-email-add-96' : 'icon-email-add-64'} style={styles.icon} />
}
/>
</Kb.Box2>
Expand Down Expand Up @@ -165,7 +165,7 @@ export const Phone = () => {
onChangeAllowSearch={onChangeAllowSearch}
icon={
<Kb.Icon
type={Styles.isMobile ? 'icon-phone-number-add-64' : 'icon-phone-number-add-48'}
type={Styles.isMobile ? 'icon-phone-number-add-96' : 'icon-phone-number-add-64'}
style={styles.icon}
/>
}
Expand Down Expand Up @@ -305,13 +305,13 @@ const styles = Styles.styleSheetCreate({
},
icon: Styles.platformStyles({
isElectron: {
height: 48,
width: 48,
},
isMobile: {
height: 64,
width: 64,
},
isMobile: {
height: 96,
width: 96,
},
}),
verifyContainer: {
...Styles.padding(0, Styles.globalMargins.small),
Expand Down
4 changes: 2 additions & 2 deletions shared/settings/account/confirm-delete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ type Props = {

const getIcon = (props: Props) => {
if (props.type === 'email') {
return Styles.isMobile ? 'icon-email-remove-64' : 'icon-email-remove-48'
return Styles.isMobile ? 'icon-email-remove-96' : 'icon-email-remove-64'
}
return Styles.isMobile ? 'icon-phone-number-remove-64' : 'icon-phone-number-remove-48'
return Styles.isMobile ? 'icon-phone-number-remove-96' : 'icon-phone-number-remove-64'
}
const getPrompt = (props: Props) => {
return props.type === 'email'
Expand Down
2 changes: 1 addition & 1 deletion shared/settings/account/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const EmailPhone = (props: Props) => (
<Kb.ButtonBar align="flex-start" style={styles.buttonBar}>
<Kb.Button mode="Secondary" onClick={props.onAddEmail} label="Add email" small={true} />
{flags.sbsContacts && (
<Kb.Button mode="Secondary" onClick={props.onAddPhone} label="Add phone" small={true} />
<Kb.Button mode="Secondary" onClick={props.onAddPhone} label="Add phone number" small={true} />
)}
</Kb.ButtonBar>
</SettingsSection>
Expand Down
1 change: 1 addition & 0 deletions shared/settings/manage-contacts.native.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ const ManageContacts = (_: Props) => {

const styles = Styles.styleSheetCreate({
buttonBar: {
marginTop: Styles.globalMargins.tiny,
minHeight: undefined,
width: undefined,
},
Expand Down
2 changes: 1 addition & 1 deletion shared/signup/phone-number/verify.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ const styles = Styles.styleSheetCreate({
backgroundColor: Styles.globalColors.blue,
position: 'relative',
},
headerText: {color: Styles.globalColors.blueDark},
headerText: {color: Styles.globalColors.black_50},
iconVerticalAlign: Styles.platformStyles({
isElectron: {
position: 'relative',
Expand Down
18 changes: 9 additions & 9 deletions shared/stories/__tests__/__snapshots__/Storyshots.test.js.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit defd511

Please sign in to comment.