Skip to content

Commit 1c9d3d0

Browse files
committed
Add simple navigation without page transitions
1 parent 67bed65 commit 1c9d3d0

12 files changed

+47
-10035
lines changed

.jshintrc

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
{
2-
"esnext": true
2+
"esnext": true,
3+
"browser": true,
4+
"globalstrict": true
35
}

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ ENV TERM=xterm-256color
1111
ENV NODE_ENV=production
1212

1313
COPY package.json /usr/local/src/package.json
14-
COPY npm-shrinkwrap.json /usr/local/src/npm-shrinkwrap.json
1514
RUN npm install --production
1615

1716
COPY gulpfile.js /usr/local/src/gulpfile.js

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tag ?= 0.1.2
1+
tag ?= 0.2.0
22
image_name ?= ustwo/ustwo.com-frontend
33
container ?= us2
44
vm ?= dev
55
image = $(image_name):$(tag)
6-
mount = -v $$(pwd)/node_modules:/usr/local/src/node_modules -v $$(pwd)/src:/usr/local/src/src -v $$(pwd)/npm-shrinkwrap.json:/usr/local/src/npm-shrinkwrap.json -v $$(pwd)/package.json:/usr/local/src/package.json -v $$(pwd)/gulpfile.js:/usr/local/src/gulpfile.js
6+
mount = -v $$(pwd)/node_modules:/usr/local/src/node_modules -v $$(pwd)/src:/usr/local/src/src -v $$(pwd)/package.json:/usr/local/src/package.json -v $$(pwd)/gulpfile.js:/usr/local/src/gulpfile.js
77
.PHONY : browsersync restart rm styleguide watch
88

99
# Build container
@@ -85,7 +85,7 @@ stop :
8585

8686
# Update packages inside container
8787
install :
88-
docker run -p 8888:8888 --name $(container) $(mount) $(image) npm install
88+
docker run -p 8888:8888 --name $(container) $(base_mount) $(image) npm install
8989

9090
# Update packages inside container
9191
update :

npm-shrinkwrap.json

-9,963
This file was deleted.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"pluralize": "1.1.2",
5454
"react": "0.13.3",
5555
"react-style-guide": "1.1.5",
56-
"react-transition-manager": "1.2.2",
56+
"react-transition-manager": "1.2.3",
5757
"reactify": "1.1.1",
5858
"route-pattern": "0.0.6",
5959
"scrollmagic": "2.0.5",

src/assets/scss/_app.scss

-34
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
html,
2-
body,
3-
#pageContent,
4-
.app,
5-
.app__stage,
6-
.app__stage__page-container {
7-
height: 100%;
8-
width: 100%;
9-
}
10-
11-
121
.app {
132

143
.nav-wrapper {
@@ -31,29 +20,6 @@ body,
3120
height: 100%;
3221
width: 100%;
3322

34-
&.add {
35-
opacity: 0;
36-
transition: opacity 0.5s ease-in-out;
37-
38-
&.show {
39-
opacity: 1;
40-
}
41-
&.hide {
42-
opacity: 0;
43-
}
44-
}
45-
}
46-
}
47-
&__stage {
48-
49-
&__page-container {
50-
position: absolute;
51-
top: 0;
52-
left: 0;
53-
overflow-y: scroll;
54-
overflow-x: hidden;
55-
-webkit-overflow-scrolling: touch;
56-
5723
&.add {
5824
opacity: 0;
5925
transition: opacity 0.5s ease-in-out;

src/assets/scss/modules/_navigation.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.header {
22
display: block;
3-
position: fixed;
3+
position: absolute;
44
top: 0;
55
right: 0;
66
left: 0;

src/node_modules/app.js

+4-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node_modules/elements/navigation-link.js

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node_modules/elements/navigation-overlay-link.js

+6-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node_modules/flux/router.js

+6-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/node_modules/modules/navigation.js

+17-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)