Skip to content

Commit ac1bec6

Browse files
committed
Merge branch 'staging' of https://github.com/oslabs-beta/ReacType into staging
2 parents 00c1da1 + c4a488d commit ac1bec6

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@
135135
"babel-preset-react": "^6.24.1",
136136
"babel-preset-stage-0": "^6.24.1",
137137
"clean-webpack-plugin": "^0.1.19",
138+
"concurrently": "^5.1.0",
138139
"copy-webpack-plugin": "^4.5.2",
139140
"cross-env": "^5.2.0",
140141
"css-loader": "^0.28.11",

src/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import '../public/styles/style.css';
33
import AppContainer from '../containers/AppContainer';
44

55
export const App: React.SFC = () => (
6-
<div className="app">
6+
<div className='app'>
77
<div>
88
<header style={{ height: '40px', width: '100%' }}>ReacType</header>
99
<AppContainer />

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)