Commit 3235eca 1 parent b435334 commit 3235eca Copy full SHA for 3235eca
File tree 11 files changed +165
-1
lines changed
11 files changed +165
-1
lines changed Original file line number Diff line number Diff line change
1
+ {
2
+ "git.ignoreLimitWarning" : true
3
+ }
Original file line number Diff line number Diff line change
1
+ import React from 'react'
2
+ import f from './../Friend/Friend.module.css'
3
+
4
+ const Friend = ( props ) => {
5
+ return (
6
+ < div >
7
+ < div className = { f . user } >
8
+ < img src = "http://klakson18.ru/wp-content/uploads/2016/12/06.png" alt = "user" />
9
+ </ div >
10
+ </ div >
11
+ )
12
+ }
13
+
14
+ export default Friend
Original file line number Diff line number Diff line change
1
+ .user {
2
+ margin-top : 15px ;
3
+ }
4
+
5
+ .user img {
6
+ width : 25px ;
7
+ border-radius : 50% ;
8
+ background : rgb (31 , 159 , 217 );
9
+ padding : 5px ;
10
+ }
Original file line number Diff line number Diff line change
1
+ import React from 'react'
2
+ import f from './../Friends/Friends.module.css'
3
+ import { NavLink } from "react-router-dom"
4
+ import Friend from './Friend/Friend'
5
+
6
+ const Friends = ( props ) => {
7
+ return (
8
+ < div >
9
+ < div className = { f . friends } >
10
+ < h1 > ***</ h1 >
11
+ < NavLink to = "/Friends" activeClassName = { f . activeLink } > Friends</ NavLink >
12
+ < div className = { f . friend__wraper } >
13
+ < Friend />
14
+ < Friend />
15
+ < Friend />
16
+ </ div >
17
+ </ div >
18
+ </ div >
19
+ )
20
+ }
21
+ export default Friends
Original file line number Diff line number Diff line change
1
+ .activeLink {
2
+ color : rgb (31 , 159 , 217 );
3
+ }
4
+
5
+ /* a {
6
+ display: block;
7
+ color: white;
8
+ font-size: 20px;
9
+ font-family: serif;
10
+ text-transform: uppercase;
11
+ transition: 0.5s ease;
12
+ margin-top: 10px;
13
+ margin-bottom: 10px;
14
+ letter-spacing: 4px;
15
+ } */
16
+
17
+ a : hover {
18
+ color : rgb (31 , 159 , 217 );
19
+ font-size : 22px ;
20
+ letter-spacing : 5px ;
21
+ }
22
+
23
+ .friends {
24
+ margin-top : 35px ;
25
+ }
26
+ .friends h1 {
27
+ color : red
28
+ }
29
+
30
+ .friend__wraper {
31
+ display : flex;
32
+ justify-content : space-around;
33
+ }
34
+
Original file line number Diff line number Diff line change 4
4
padding : 1em ;
5
5
}
6
6
7
- img {
7
+ . header img {
8
8
width : 140px ;
9
9
}
Original file line number Diff line number Diff line change
1
+ import React from 'react'
2
+ import f from './../Friend/Friend.module.css'
3
+
4
+ const Friend = ( props ) => {
5
+ return (
6
+ < div >
7
+ < div className = { f . user } >
8
+ < img src = "http://klakson18.ru/wp-content/uploads/2016/12/06.png" alt = "user" />
9
+ </ div >
10
+ </ div >
11
+ )
12
+ }
13
+
14
+ export default Friend
Original file line number Diff line number Diff line change
1
+ .user {
2
+ margin-top : 15px ;
3
+ }
4
+
5
+ .user img {
6
+ width : 25px ;
7
+ border-radius : 50% ;
8
+ background : rgb (31 , 159 , 217 );
9
+ padding : 5px ;
10
+ }
Original file line number Diff line number Diff line change
1
+ import React from 'react'
2
+ import f from './../FriendsNav/FriendsNav.module.css'
3
+ import { NavLink } from "react-router-dom"
4
+ import Friend from './Friend/Friend'
5
+
6
+ const FriendsNav = ( props ) => {
7
+ return (
8
+ < div >
9
+ < div className = { f . friends } >
10
+ < hr />
11
+ < NavLink to = "/Friends" activeClassName = { f . activeLink } > Friends</ NavLink >
12
+ < div className = { f . friend__wraper } >
13
+ < Friend />
14
+ < Friend />
15
+ < Friend />
16
+ </ div >
17
+ </ div >
18
+ </ div >
19
+ )
20
+ }
21
+ export default FriendsNav
Original file line number Diff line number Diff line change
1
+ .activeLink {
2
+ color : rgb (31 , 159 , 217 );
3
+ }
4
+
5
+ /* a {
6
+ display: block;
7
+ color: white;
8
+ font-size: 20px;
9
+ font-family: serif;
10
+ text-transform: uppercase;
11
+ transition: 0.5s ease;
12
+ margin-top: 10px;
13
+ margin-bottom: 10px;
14
+ letter-spacing: 4px;
15
+ } */
16
+
17
+ a : hover {
18
+ color : rgb (31 , 159 , 217 );
19
+ font-size : 22px ;
20
+ letter-spacing : 5px ;
21
+ }
22
+
23
+ .friends {
24
+ margin-top : 35px ;
25
+ }
26
+ .friends h1 {
27
+ color : red
28
+ }
29
+
30
+ .friend__wraper {
31
+ display : flex;
32
+ justify-content : space-around;
33
+ }
Original file line number Diff line number Diff line change 1
1
import React from 'react' ;
2
2
import n from './Navbar.module.css' ;
3
3
import { NavLink } from "react-router-dom" ;
4
+ import FriendsNav from './FriendsNav/FriendsNav' ;
4
5
5
6
const Navbar = ( ) => {
6
7
return (
@@ -20,6 +21,9 @@ const Navbar = () => {
20
21
< div className = "nav__item" >
21
22
< NavLink to = "/Setting" activeClassName = { n . activeLink } > Setting</ NavLink >
22
23
</ div >
24
+ < div className = "nav__item" >
25
+ < FriendsNav />
26
+ </ div >
23
27
</ nav >
24
28
) ;
25
29
}
You can’t perform that action at this time.
0 commit comments