Skip to content

Commit dca78bd

Browse files
authored
Merge pull request #27 from tonyito/mvp
Touched up component card animation and package.json
2 parents a157dde + 6233966 commit dca78bd

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"Sean Sadykoff",
1616
"Shlomo Porges",
1717
"Sophia Huttner",
18-
"Tolga Mizrakci",
18+
"Tolga Mizrakci",
1919
"Tony Ito-Cole"
20-
],
20+
],
2121
"repository": {
2222
"type": "git",
2323
"url": "https://github.com/team-reactype/ReacType"
@@ -134,6 +134,7 @@
134134
"babel-preset-react": "^6.24.1",
135135
"babel-preset-stage-0": "^6.24.1",
136136
"clean-webpack-plugin": "^0.1.19",
137+
"concurrently": "^5.1.0",
137138
"copy-webpack-plugin": "^4.5.2",
138139
"cross-env": "^5.2.0",
139140
"css-loader": "^0.28.11",

src/components/LeftColExpansionPanel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ const LeftColExpansionPanel = (props: LeftColExpPanPropsInt) => {
7979
{/* {This is the component responsible for the collapsing transition animation for each component card} */}
8080
<Collapse
8181
in={focusedToggle}
82-
collapsedHeight={70} //The type for the Collapse component is asking for a string, but if you put in a string and not a number, the component itself breaks.
82+
collapsedHeight={'70px'}
83+
timeout={500} //The type for the Collapse component is asking for a string, but if you put in a string and not a number, the component itself breaks.
8384
>
8485
{/* NOT SURE WHY COLOR: RED IS USED, TRIED REMOVING IT AND NO VISIBLE CHANGE OCCURED. */}
8586
<Grid

0 commit comments

Comments
 (0)