Skip to content

Commit bd55af6

Browse files
committed
1/21 media mobile header,home,projects complete
1 parent 6ac7360 commit bd55af6

29 files changed

+539
-173
lines changed

package-lock.json

Lines changed: 33 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@
4545
"react-app-polyfill": "^0.2.0",
4646
"react-dev-utils": "^7.0.1",
4747
"react-dom": "^16.7.0",
48+
"react-responsive": "^6.0.1",
4849
"react-router-dom": "^4.3.1",
4950
"resolve": "1.8.1",
5051
"sass-loader": "7.1.0",
52+
"scss-loader": "0.0.1",
5153
"style-loader": "0.23.0",
5254
"terser-webpack-plugin": "1.1.0",
5355
"url-loader": "1.1.1",

src/App.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React from 'react';
22
import { BrowserRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
33
import Home from './pages/home'
44
import './App.css'
5+
import Projects from './pages/projects'
56
import UC from './components/underConstruction'
67

78
export default function App(props){
@@ -11,6 +12,7 @@ export default function App(props){
1112
<Router>
1213
<Switch>
1314
<Route exact path="/" component={Home}/>
15+
<Route path="/projects" component={Projects}/>
1416
</Switch>
1517
</Router>
1618
</div>

src/assets/JSLogo.png

10 KB
Loading

src/assets/nodejsLogo.png

15.7 KB
Loading

src/components/cssStarBackground/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import React from 'react'
22
import './stars.css'
33
export default function index() {
44
return (
5-
<div class="backgroundStar">
6-
<div class="stars"></div>
7-
<div class="twinkling"></div>
5+
<div className="backgroundStar">
6+
<div className="stars"></div>
7+
<div className="twinkling"></div>
88
</div>
99
)
1010
}

src/components/cssStarBackground/stars.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
}
3535
.backgroundStar {
3636
position: fixed;
37+
width: 100%;
38+
height: 100vh;
3739
z-index: -3;
3840
top:0;
3941
left:0;
4042
right:0;
4143
bottom:0;
42-
width: 100%;
43-
height: 100vh;
4444
}
4545
.stars, .twinkling {
4646
position:absolute;

src/components/footer/footer.module.sass

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
@import url("https://fonts.googleapis.com/css?family=Josefin+Slab|Roboto+Slab")
2+
@import '../../modules/mediaQuery/app'
3+
24
.outbox
35
z-index: 1
46
background: white
@@ -44,6 +46,12 @@
4446
margin-top: 10px
4547
margin-bottom: 10px
4648

49+
@media screen and (max-width: $mobileM)
50+
.content_title
51+
font-size: 15px
52+
.content_context
53+
font-size: 10px
54+
4755
.menu .contact .social
4856
display: flex
4957
flex-direction: column

src/components/footer/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ export default function index() {
3737
<p>Social</p>
3838
</div>
3939
<div className={styles.content_context}>
40-
<a target="blank" href="https://github.com/levelopers">Github</a>
41-
<a target="blank" href="https://www.linkedin.com/in/dongsheng-yin-97b992136/">Linkedin</a>
40+
<a target="blank_github" href="https://github.com/levelopers">Github</a>
41+
<a target="blank_linkedin" href="https://www.linkedin.com/in/dongsheng-yin-97b992136/">Linkedin</a>
4242
</div>
4343
</div>
4444
</div>

src/components/header/header.module.sass

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
@import '../../modules/mediaQuery/app'
22
@import url("https://fonts.googleapis.com/css?family=Indie+Flower|ZCOOL+KuaiLe")
3+
34
.outbox
45
font-family: 'ZCOOL KuaiLe', cursive
56
font-size: 25px
7+
width: 100%
68
height: 10vh
79
display: flex
8-
flex-direction: row
10+
justify-content: space-between
911
z-index: 1
1012
background-color: white
1113
box-shadow: 0 1px 5px 1px orange
@@ -36,17 +38,25 @@
3638
text-decoration: none
3739
color: black
3840

39-
// .toggleButton
40-
// @include device(tablet)
41-
// display: none
41+
.toggle_button
42+
display: none
43+
44+
45+
@media screen and (max-width: $tablet)
46+
.logo
47+
min-width: 100px
48+
font-size: 20px
49+
50+
.toggle_button
51+
display: flex
52+
align-items: center
53+
margin-right: 20px
54+
font-size: 10px
4255

43-
// .toggle_nav
44-
// @include device(tablet)
45-
// display: none
46-
// height: 0
47-
// display: flex
48-
// transition: max-height 0.2s ease-out
49-
// .responsive
50-
// @include device(tablet)
51-
// display: none
52-
// height: 0
56+
.header_nav
57+
font-size: 10px
58+
display: flex
59+
justify-content: flex-start
60+
margin-left: 20px
61+
62+

0 commit comments

Comments
 (0)