Skip to content

Commit

Permalink
Merge pull request #8 from decentraland/fix/mobile-navbar
Browse files Browse the repository at this point in the history
feat: a lot of stuff
  • Loading branch information
Juan Cazala authored Jun 29, 2018
2 parents b01da77 + 238062e commit 1a58753
Show file tree
Hide file tree
Showing 62 changed files with 737 additions and 321 deletions.
6 changes: 6 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,15 @@ jobs:
working_directory: /tmp/ui

steps:
- restore_cache:
keys:
- lib-{{ .Branch }}-{{ .Revision }}
- restore_cache:
keys:
- storybook-static-{{ .Branch }}-{{ .Revision }}
- run:
name: Copy styles from lib
command: cp ./lib/styles.css ./storybook-static
- run:
name: Deploy to now.sh
command: npm init --yes && npm install now --no-save && cd storybook-static && ../node_modules/.bin/now --token $NOW_TOKEN --public && ../node_modules/.bin/now alias ui.decentraland.org --token $NOW_TOKEN
Expand Down
206 changes: 5 additions & 201 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@storybook/addon-options": "^4.0.0-alpha.10",
"@storybook/addon-storyshots": "^4.0.0-alpha.10",
"@storybook/addon-storyshots-puppeteer": "^4.0.0-alpha.10",
"@storybook/addon-storysource": "^3.4.8",
"@storybook/addon-storysource": "^4.0.0-alpha.10",
"@storybook/addons": "^4.0.0-alpha.10",
"@storybook/react": "^4.0.0-alpha.10",
"@types/jest": "^23.1.1",
Expand Down
6 changes: 6 additions & 0 deletions src/assets/chevron-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Blockie/Blockie.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ storiesOf('Blockie', module)
))
.add('In a paragraph', () => (
<p>
You have transfered <Mana size="tiny">1,000</Mana> to{' '}
You've transfered <Mana inline>1,000</Mana> to{' '}
<Blockie scale={3} seed={address}>
<Address value={address} strong />
</Blockie>.
Expand Down
Loading

0 comments on commit 1a58753

Please sign in to comment.