scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #516 from rschamp/upgrade/react-15

Browse source 
Upgrade to React 15
This commit is contained in:
Ray Schamp 2016-05-31 09:23:49 -04:00
commit 0335fe1275
5 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package.json
View file

@ -60,13 +60,13 @@
"po2icu": "0.0.2",
"postcss-loader": "0.8.2",
"raven-js": "3.0.4",
"react": "0.14.0",
"react-dom": "0.14.0",
"react": "15.1.0",
"react-dom": "15.0.1",
"react-intl": "2.1.2",
"react-modal": "0.6.1",
"react-modal": "1.3.0",
"react-onclickoutside": "4.1.1",
"react-redux": "4.4.0",
"react-slick": "0.9.2",
"react-redux": "4.4.5",
"react-slick": "0.12.2",
"redux": "3.5.2",
"redux-thunk": "2.0.1",
"sass-lint": "1.5.1",

1
src/components/modal/modal.jsx
View file

@ -11,6 +11,7 @@ var defaultStyle = {
backgroundColor: 'rgba(0, 0, 0, .75)'
},
content: {
position: 'absolute',
overflow: 'visible',
borderRadius: '6px',
width: 500,

4
src/components/modal/modal.scss
View file

@ -1,6 +1,10 @@
@import "../../colors";
.ReactModal__Content {
&:focus {
outline: none;
}
iframe {
border: 0;
}

3
src/components/navigation/www/navigation.jsx
View file

@ -9,6 +9,7 @@ var sessionActions = require('../../../redux/session.js');
var Api = require('../../../mixins/api.jsx');
var Avatar = require('../../avatar/avatar.jsx');
var Button = require('../../forms/button.jsx');
var Dropdown = require('../../dropdown/dropdown.jsx');
var Input = require('../../forms/input.jsx');
var log = require('../../../lib/log.js');
@ -215,7 +216,7 @@ var Navigation = React.createClass({
<li className="search">
<form action="/search/google_results" method="get">
<Input type="submit" value="" />
<Button type="submit" className="btn-search" />
<Input type="text"
aria-label={formatMessage({id: 'general.search'})}
placeholder={formatMessage({id: 'general.search'})}

34
src/components/navigation/www/navigation.scss
View file

@ -39,7 +39,8 @@
margin: 0;
}
input {
input,
button {
display: inline-block;
margin-top: 5px;
outline: none;
@ -47,19 +48,6 @@
background-color: $active-gray;
height: 14px;
&[type=submit] {
position: absolute;
background-color: transparent;
background-image: url("/images/nav-search-glass.png");
background-repeat: no-repeat;
background-position: center center;
background-size: 14px 14px;
width: 40px;
height: 40px;
}
&[type=text] {
transition: .15s ease background-color;
padding: 0;
@ -85,6 +73,24 @@
}
}
}
.btn-search {
position: absolute;
box-shadow: none;
background-color: transparent;
background-image: url("/images/nav-search-glass.png");
background-repeat: no-repeat;
background-position: center center;
background-size: 14px 14px;
width: 40px;
height: 40px;
&:hover {
box-shadow: none;
}
}
}
}