Skip to content

Commit

Permalink
Merge pull request #770 from ONEARMY/master
Browse files Browse the repository at this point in the history
wording update
  • Loading branch information
BenGamma authored Nov 15, 2019
2 parents 6a78ab7 + 174c7c1 commit c5a4f9b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
12 changes: 6 additions & 6 deletions src/components/DevHelpers/DevHelpers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ const DevHelpers = () => (
<>
{SITE !== 'production' && <DevTools />}
<Text
bg={'black'}
bg={theme.colors.red2}
color={'white'}
width={1}
py={2}
medium
txtcenter
style={{ zIndex: 9999, position: 'relative' }}
>
This is the alpha version (v{VERSION}) of onearmy platform,{' '}
You have early access to this platform !{' '}
<Link
color={theme.colors.blue}
target="_blank"
href="https://build.onearmy.world"
href="https://github.com/ONEARMY/community-platform"
>
click here
(v{VERSION})
</Link>{' '}
to help building it. /!\ This site is for development purposes, do not
share private information
Official launch is on 7th Jan 2020. Don’t share any of its contents yet.
We trust you :)
</Text>
</>
)
Expand Down
2 changes: 1 addition & 1 deletion src/pages/Maps/Content/Controls/GroupingFilter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class GroupingFilter extends React.Component<IProps, IState> {
? null
: entityType === 'place'
? 'Workspaces'
: 'Members'
: 'Others'
}}
hasSelectAll={false}
ItemRenderer={ItemRenderer}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/SignIn/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class SignInPage extends React.Component<IProps, IState> {
width={1}
>
<Heading medium width={1}>
Welcome back homie
Welcome back
</Heading>
</Flex>
<Flex
Expand Down
1 change: 1 addition & 0 deletions src/themes/styled.theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const colors = {
yellow: { base: '#fee77b', hover: '#ffde45' },
blue: '#83ceeb',
red: '#eb1b1f',
red2: '#f58d8e',
softblue: '#e2edf7',
bluetag: '#5683b0',
grey: '#61646b',
Expand Down

0 comments on commit c5a4f9b

Please sign in to comment.