Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
scratch-www
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
scratch-www
Commits
a4e9db92
Commit
a4e9db92
authored
Jul 01, 2016
by
Connor Hudson
Committed by
GitHub
Jul 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #656 from technoboy10/gh651-stagingalert
Fix GH-651: Orangeify navbar when SCRATCH_ENV=staging
parents
262569c7
2206cb97
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
35 additions
and
9 deletions
+35
-9
src/components/dropdown/dropdown.scss
src/components/dropdown/dropdown.scss
+7
-3
src/components/navigation/container/navigation.scss
src/components/navigation/container/navigation.scss
+7
-3
src/components/navigation/www/navigation.jsx
src/components/navigation/www/navigation.jsx
+2
-1
src/components/navigation/www/navigation.scss
src/components/navigation/www/navigation.scss
+12
-0
src/components/page/www/page.jsx
src/components/page/www/page.jsx
+5
-1
webpack.config.js
webpack.config.js
+2
-1
No files found.
src/components/dropdown/dropdown.scss
View file @
a4e9db92
...
...
@@ -15,6 +15,10 @@
font-size
:
.8125rem
;
font-weight
:
normal
;
&
.staging
{
background-color
:
$ui-orange
;
}
&
.open
{
display
:
block
;
}
...
...
src/components/navigation/container/navigation.scss
View file @
a4e9db92
...
...
@@ -11,6 +11,10 @@
box-shadow
:
0
0
3px
$box-shadow-gray
;
background-color
:
$ui-blue
;
&
.staging
{
background-color
:
$ui-orange
;
}
width
:
100%
;
/* NOTE: Height should match offset settings in main.scss file */
...
...
src/components/navigation/www/navigation.jsx
View file @
a4e9db92
...
...
@@ -253,7 +253,8 @@ var Navigation = React.createClass({
<
Dropdown
as=
"ul"
isOpen=
{
this
.
state
.
accountNavOpen
}
onRequestClose=
{
this
.
closeAccountNav
}
>
onRequestClose=
{
this
.
closeAccountNav
}
className=
{
process
.
env
.
SCRATCH_ENV
}
>
<
li
>
<
a
href=
{
this
.
getProfileUrl
()
}
>
<
FormattedMessage
id=
"general.profile"
/>
...
...
src/components/navigation/www/navigation.scss
View file @
a4e9db92
@import
"../../../colors"
;
#navigation
{
&
.staging
{
.messages
{
.message-count
{
display
:
none
;
&
.show
{
background-color
:
$ui-blue
;
}
}
}
}
.logo
{
margin-right
:
10px
;
...
...
src/components/page/www/page.jsx
View file @
a4e9db92
var
React
=
require
(
'
react
'
);
var
classNames
=
require
(
'
classnames
'
);
var
Navigation
=
require
(
'
../../navigation/www/navigation.jsx
'
);
var
Footer
=
require
(
'
../../footer/www/footer.jsx
'
);
...
...
@@ -6,9 +7,12 @@ var Footer = require('../../footer/www/footer.jsx');
var
Page
=
React
.
createClass
({
type
:
'
Page
'
,
render
:
function
()
{
var
classes
=
classNames
({
'
staging
'
:
process
.
env
.
SCRATCH_ENV
==
'
staging
'
});
return
(
<
div
className=
"page"
>
<
div
id=
"navigation"
>
<
div
id=
"navigation"
className=
{
classes
}
>
<
Navigation
/>
</
div
>
<
div
id=
"view"
>
...
...
webpack.config.js
View file @
a4e9db92
...
...
@@ -116,7 +116,8 @@ module.exports = {
'
process.env.NODE_ENV
'
:
'
"
'
+
(
process
.
env
.
NODE_ENV
||
'
development
'
)
+
'
"
'
,
'
process.env.SENTRY_DSN
'
:
'
"
'
+
(
process
.
env
.
SENTRY_DSN
||
''
)
+
'
"
'
,
'
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
.
OccurenceOrderPlugin
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment