Skip to content

Commit

Permalink
Merge pull request #9 from wechulisimiyu/dev
Browse files Browse the repository at this point in the history
merge
  • Loading branch information
Pr33t3sh committed Apr 22, 2024
2 parents fbe490a + 8369e4b commit 0dff2e6
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 26 deletions.
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"connect-mongo": "^5.1.0",
"cors": "^2.8.5",
"dotenv": "^16.4.5",
"ejs": "^3.1.9",
"ejs": "^3.1.10",
"ejs-mate": "^4.0.0",
"escape-string-regexp": "^5.0.0",
"express": "^4.19.2",
"express-mongo-sanitize": "^2.2.0",
"express-rate-limit": "^7.2.0",
"express-session": "^1.18.0",
"helmet": "^7.1.0",
"joi": "^17.12.2",
"joi": "^17.12.3",
"jsonwebtoken": "^9.0.2",
"method-override": "^3.0.0",
"mongoose": "^8.2.4",
Expand Down
10 changes: 1 addition & 9 deletions public/css/main.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/*
TemplateMo 575 Leadership Event
https://templatemo.com/tm-575-leadership-event
*/


/*---------------------------------------
CUSTOM PROPERTIES ( VARIABLES )
Expand All @@ -20,7 +12,7 @@ https://templatemo.com/tm-575-leadership-event
--p-color: #717275;
--highlight-icon-color: #ff0100;

--body-font-family: 'DM Sans', sans-serif;
--body-font-family: 'Lato', sans-serif;

--h1-font-size: 62px;
--h2-font-size: 48px;
Expand Down
4 changes: 3 additions & 1 deletion src/views/layout/boilerplate.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
<!-- CSS FILES -->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
<link
href="https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,100;0,300;0,400;0,700;0,900;1,100;1,300;1,400;1,700;1,900&display=swap"
rel="stylesheet">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link href="css/bootstrap-icons.css" rel="stylesheet">
<link href="css/main.css" rel="stylesheet">
Expand Down

0 comments on commit 0dff2e6

Please sign in to comment.