Skip to content
This repository has been archived by the owner on Jun 17, 2021. It is now read-only.

Upgrade to styled-components v4.2.0 #374

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Upgrade to styled-components v4.2.0 #374

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a5b0670
migrate from #269
superhawk610 Mar 28, 2019
91b7fb7
Update snapshots & fix ProjectName.test
AWolf81 Apr 24, 2019
6a7471a
Merge master
AWolf81 Apr 24, 2019
d0f6590
use semantic color constants
AWolf81 Apr 24, 2019
e898da0
add React-beautiful-dnd & update React
AWolf81 Apr 24, 2019
7123aac
Merge branch 'master' into sc-v4
AWolf81 Apr 24, 2019
46eb73c
revert styled-components props arrow function
AWolf81 Apr 24, 2019
2a63787
fix flow by accepting null as type in setRef method
AWolf81 Apr 24, 2019
ad19f95
fix forwardRef warning by using an icon wrapper to animate the icon
AWolf81 Apr 25, 2019
d7a6ee0
improve animation by changing animated wrapper to animated.div & inte…
AWolf81 Apr 25, 2019
6bcfc6a
fix selectedIcon status - change to includes as the path from src can…
AWolf81 Apr 25, 2019
f55c40e
simplify status & fix flow
AWolf81 Apr 25, 2019
58c8849
add interpolation to fix ProjectName offset issue
AWolf81 May 5, 2019
56da823
change selectedIcon check so it returns status default if undefined
AWolf81 May 5, 2019
22c7637
fix Wrapper animation by using animated.div
AWolf81 May 6, 2019
615a74d
Fix animation for ProgressBar and Toggle
melanieseltzer May 7, 2019
c990f20
Get rid of warnings
melanieseltzer May 7, 2019
6a93dd8
Fix BigClickableButton animation
melanieseltzer May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .storybook/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ import { configure, addDecorator } from '@storybook/react';
import { COLORS } from '../src/constants';
import Wrapper from './components/Wrapper';

import '../src/global-styles';
import GlobalStyles from '../src/components/GlobalStyles';

const WrapperDecorator = storyFn => <Wrapper>{storyFn()}</Wrapper>;
const WrapperDecorator = storyFn => (
<Fragment>
<GlobalStyles />
<Wrapper>{storyFn()}</Wrapper>
</Fragment>
);

addDecorator(WrapperDecorator);

Expand Down
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"gatsby-cli": "1.1.58",
"js-yaml": "3.12.0",
"ps-tree": "1.2.0",
"react-beautiful-dnd": "10.1.1",
"react-beautiful-dnd": "11.0.1",
"react-custom-scrollbars": "4.2.1",
"rimraf": "2.6.2",
"yarn": "1.12.3"
Expand Down Expand Up @@ -94,8 +94,8 @@
"electron-builder": "20.31.3",
"electron-ipc-mock": "0.0.3",
"electron-log": "2.2.17",
"enzyme": "3.8.0",
"enzyme-adapter-react-16": "1.8.0",
"enzyme": "3.9.0",
"enzyme-adapter-react-16": "1.12.1",
"enzyme-to-json": "3.3.4",
"eslint": "5.7.0",
"eslint-config-react-app": "3.0.4",
Expand All @@ -107,7 +107,7 @@
"eslint-plugin-react": "7.11.1",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "1.1.6",
"flow-bin": "0.83.0",
"flow-bin": "0.95.1",
"foreman": "2.0.0",
"fs-extra": "5.0.0",
"graphql": "0.12.3",
Expand All @@ -133,10 +133,10 @@
"prettier": "1.13.7",
"raf": "3.4.0",
"random-seed": "0.3.0",
"react": "16.3.2",
"react": "16.8.6",
"react-dev-utils": "6.0.0-next.66cc7a90",
"react-docgen": "2.21.0",
"react-dom": "16.3.2",
"react-dom": "16.8.6",
"react-icons-kit": "1.1.5",
"react-instantsearch": "5.1.0",
"react-motion": "0.5.2",
Expand All @@ -161,7 +161,7 @@
"sass-loader": "7.0.0",
"slug": "0.9.1",
"style-loader": "0.19.1",
"styled-components": "3.2.6",
"styled-components": "4.2.0",
"svgr": "1.8.1",
"sw-precache-webpack-plugin": "0.11.4",
"thread-loader": "1.1.2",
Expand Down
Loading