Skip to content

Commit 75b5fb3

Browse files
committed
Changed some styles.
1 parent 87716f0 commit 75b5fb3

32 files changed

+15506
-112
lines changed

meetsy/package-lock.json

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

meetsy/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
"private": true,
55
"proxy": "http://localhost:3001",
66
"dependencies": {
7+
"@fortawesome/fontawesome-svg-core": "^1.2.35",
8+
"@fortawesome/free-solid-svg-icons": "^5.15.3",
9+
"@fortawesome/react-fontawesome": "^0.1.14",
710
"@material-ui/core": "^4.11.4",
811
"@material-ui/icons": "^4.11.2",
912
"@testing-library/jest-dom": "^5.11.10",
@@ -15,14 +18,17 @@
1518
"bootstrap": "^4.6.0",
1619
"faker": "^5.5.3",
1720
"firebase": "^8.4.1",
21+
"font-awesome": "^4.7.0",
1822
"jquery": "^3.6.0",
23+
"jss": "^10.6.0",
1924
"nodemon": "^2.0.7",
2025
"npm-run-all": "^4.1.5",
2126
"peer": "^0.6.1",
2227
"peerjs": "^1.3.2",
2328
"react": "^17.0.2",
2429
"react-bootstrap": "^1.5.2",
2530
"react-dom": "^17.0.2",
31+
"react-jss": "^10.6.0",
2632
"react-router-dom": "^5.2.0",
2733
"react-scripts": "4.0.3",
2834
"recompose": "^0.30.0",

meetsy/src/assets/bg.png

1010 KB
Loading

meetsy/src/assets/bg2.jpg

2.67 MB
Loading

meetsy/src/assets/bg3.jpg

4.29 MB
Loading

meetsy/src/assets/bg4.jpg

2.21 MB
Loading

meetsy/src/assets/icon-account.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import React from 'react';
2+
import '../../node_modules/font-awesome/css/font-awesome.min.css';
23

34
const icon = {
4-
height: '23px',
5+
height: '20px',
56
fill: '#efefef'
67
};
78

89

910
export default (props) => (
10-
<svg style={icon} xmlns="http://www.w3.org/2000/svg" class="bi bi-person-fill" viewBox="0 0 16 16">
11-
<path d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6z"/>
12-
</svg>
11+
<div>
12+
<i className ="fas fa-calendar"></i>
13+
</div>
1314
);

meetsy/src/assets/icon-arrow-up.js

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import React from 'react';
2+
3+
export default (props) => (
4+
<svg
5+
id={props.id}
6+
width={props.height || '15'}
7+
height={props.height || '15'}
8+
viewBox='0 0 640 640'
9+
fill='none'
10+
xmlns='http://www.w3.org/2000/svg'
11+
>
12+
<path
13+
d='M319.99 640L21.87 640L170.92 320L319.99 32.21L469.07 320L618.13 640L618.13 640L319.99 640Z'
14+
opacity='1'
15+
fill='#dfe0eb'
16+
fillOpacity='1'
17+
/>
18+
<path
19+
d='M469.07 478.15L544.52 640L335.64 640L93.64 640L170.92 478.15L319.99 158.15L469.07 478.15Z'
20+
opacity='1'
21+
fill='#ffffff'
22+
fillOpacity='1'
23+
/>
24+
</svg>
25+
);

meetsy/src/assets/icon-bookmark.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import React from 'react';
22

33
const icon = {
4-
height: '23px',
5-
fill: '#efefef'
4+
height: '18px',
5+
fill: 'gray',
6+
':hover': {
7+
fill: '#efefef !important',
8+
}
69
};
710

811

meetsy/src/assets/icon-calendar.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import React from 'react';
2+
import '../../node_modules/font-awesome/css/font-awesome.min.css';
3+
4+
const icon = {
5+
height: '20px',
6+
fill: '#efefef'
7+
};
8+
9+
10+
export default (props) => (
11+
<div>
12+
<i class ="fa fa-calendar"></i>
13+
</div>
14+
);

meetsy/src/assets/icon-call.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React from 'react';
2+
3+
const icon = {
4+
height: '20px',
5+
fill: 'gray'
6+
};
7+
8+
9+
export default (props) => (
10+
<svg xmlns="http://www.w3.org/2000/svg" style={icon} class="bi bi-telephone-fill" viewBox="0 0 16 16">
11+
<path fill-rule="evenodd" d="M1.885.511a1.745 1.745 0 0 1 2.61.163L6.29 2.98c.329.423.445.974.315 1.494l-.547 2.19a.678.678 0 0 0 .178.643l2.457 2.457a.678.678 0 0 0 .644.178l2.189-.547a1.745 1.745 0 0 1 1.494.315l2.306 1.794c.829.645.905 1.87.163 2.611l-1.034 1.034c-.74.74-1.846 1.065-2.877.702a18.634 18.634 0 0 1-7.01-4.42 18.634 18.634 0 0 1-4.42-7.009c-.362-1.03-.037-2.137.703-2.877L1.885.511z"/>
12+
</svg>
13+
);

meetsy/src/assets/icon-home.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22

33
const icon = {
4-
height: '23px',
4+
height: '18px',
55
fill: '#efefef'
66
};
77

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import React from 'react';
2+
3+
const icon = {
4+
height: '15px',
5+
fill: 'gray'
6+
};
7+
8+
9+
export default (props) => (
10+
<svg xmlns="http://www.w3.org/2000/svg" style ={icon} class="bi bi-bell-fill" viewBox="0 0 16 16">
11+
<path d="M8 16a2 2 0 0 0 2-2H6a2 2 0 0 0 2 2zm.995-14.901a1 1 0 1 0-1.99 0A5.002 5.002 0 0 0 3 6c0 1.098-.5 6-2 7h14c-1.5-1-2-5.902-2-7 0-2.42-1.72-4.44-4.005-4.901z"/>
12+
</svg>
13+
);

0 commit comments

Comments
 (0)