scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 09:35:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #656 from technoboy10/gh651-stagingalert

Browse source 
Fix GH-651: Orangeify navbar when SCRATCH_ENV=staging
This commit is contained in:
Connor Hudson 2016-07-01 08:36:51 -04:00 committed by GitHub
commit a4e9db929c
6 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,10 @@
font-size: .8125rem; font-size: .8125rem;
font-weight: normal; font-weight: normal;
&.staging {
background-color: $ui-orange;
}
&.open { &.open {
display: block; display: block;
} }

4
src/components/navigation/container/navigation.scss
View file

@ -11,6 +11,10 @@
box-shadow: 0 0 3px $box-shadow-gray; box-shadow: 0 0 3px $box-shadow-gray;
background-color: $ui-blue; background-color: $ui-blue;
&.staging {
background-color: $ui-orange;
}
width: 100%; width: 100%;
/* NOTE: Height should match offset settings in main.scss file */ /* NOTE: Height should match offset settings in main.scss file */

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

@ -253,7 +253,8 @@ var Navigation = React.createClass({
<Dropdown <Dropdown
as="ul" as="ul"
isOpen={this.state.accountNavOpen} isOpen={this.state.accountNavOpen}
onRequestClose={this.closeAccountNav}> onRequestClose={this.closeAccountNav}
className={process.env.SCRATCH_ENV}>
<li> <li>
<a href={this.getProfileUrl()}> <a href={this.getProfileUrl()}>
<FormattedMessage id="general.profile" /> <FormattedMessage id="general.profile" />

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

@ -1,6 +1,18 @@
@import "../../../colors"; @import "../../../colors";
#navigation { #navigation {
&.staging {
.messages {
.message-count {
display: none;
&.show {
background-color: $ui-blue;
}
}
}
}
.logo { .logo {
margin-right: 10px; margin-right: 10px;

6
src/components/page/www/page.jsx
View file

@ -1,4 +1,5 @@
var React = require('react'); var React = require('react');
var classNames = require('classnames');
var Navigation = require('../../navigation/www/navigation.jsx'); var Navigation = require('../../navigation/www/navigation.jsx');
var Footer = require('../../footer/www/footer.jsx'); var Footer = require('../../footer/www/footer.jsx');
@ -6,9 +7,12 @@ var Footer = require('../../footer/www/footer.jsx');
var Page = React.createClass({ var Page = React.createClass({
type: 'Page', type: 'Page',
render: function () { render: function () {
var classes = classNames({
'staging': process.env.SCRATCH_ENV == 'staging'
});
return ( return (
<div className="page"> <div className="page">
<div id="navigation"> <div id="navigation" className={classes}>
<Navigation /> <Navigation />
</div> </div>
<div id="view"> <div id="view">

3
webpack.config.js
View file

@ -116,7 +116,8 @@ module.exports = {
'process.env.NODE_ENV': '"' + (process.env.NODE_ENV || 'development') + '"', 'process.env.NODE_ENV': '"' + (process.env.NODE_ENV || 'development') + '"',
'process.env.SENTRY_DSN': '"' + (process.env.SENTRY_DSN || '') + '"', 'process.env.SENTRY_DSN': '"' + (process.env.SENTRY_DSN || '') + '"',
'process.env.API_HOST': '"' + (process.env.API_HOST || 'https://api.scratch.mit.edu') + '"', 'process.env.API_HOST': '"' + (process.env.API_HOST || 'https://api.scratch.mit.edu') + '"',
'process.env.SMARTY_STREETS_API_KEY': '"' + (process.env.SMARTY_STREETS_API_KEY || '') + '"' 'process.env.SMARTY_STREETS_API_KEY': '"' + (process.env.SMARTY_STREETS_API_KEY || '') + '"',
'process.env.SCRATCH_ENV': '"'+ (process.env.SCRATCH_ENV || 'development') + '"'
}), }),
new webpack.optimize.CommonsChunkPlugin('common', 'js/common.bundle.js'), new webpack.optimize.CommonsChunkPlugin('common', 'js/common.bundle.js'),
new webpack.optimize.OccurenceOrderPlugin() new webpack.optimize.OccurenceOrderPlugin()