Merge branch 'master' into about

BrianENguyen · Nov 28, 2021 · 48de938 · 48de938
2 parents 1adc594 + 7d0d212
commit 48de938
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 65 deletions.
diff --git a/dist/css/app.7cac792d.css b/dist/css/app.7cac792d.css
diff --git a/dist/css/app.c78e671e.css b/dist/css/app.c78e671e.css
diff --git a/dist/css/chunk-vendors.99d9968a.css → dist/css/chunk-vendors.7d156cba.css b/dist/css/chunk-vendors.99d9968a.css → dist/css/chunk-vendors.7d156cba.css
diff --git a/dist/favicon.ico b/dist/favicon.ico
diff --git a/dist/index.html b/dist/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>csulb-tc-website</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><script src="https://kit.fontawesome.com/9ba7525b6f.js" crossorigin="anonymous"></script><link href="/css/app.c78e671e.css" rel="preload" as="style"><link href="/css/chunk-vendors.99d9968a.css" rel="preload" as="style"><link href="/js/app.ba26b63a.js" rel="preload" as="script"><link href="/js/chunk-vendors.e3f2ff10.js" rel="preload" as="script"><link href="/css/chunk-vendors.99d9968a.css" rel="stylesheet"><link href="/css/app.c78e671e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but csulb-tc-website doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.e3f2ff10.js"></script><script src="/js/app.ba26b63a.js"></script></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="./logo.ico"><title>csulb-tc-website</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><script src="https://kit.fontawesome.com/9ba7525b6f.js" crossorigin="anonymous"></script><link href="/css/app.7cac792d.css" rel="preload" as="style"><link href="/css/chunk-vendors.7d156cba.css" rel="preload" as="style"><link href="/js/app.4f78f61e.js" rel="preload" as="script"><link href="/js/chunk-vendors.2de3720a.js" rel="preload" as="script"><link href="/css/chunk-vendors.7d156cba.css" rel="stylesheet"><link href="/css/app.7cac792d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but csulb-tc-website doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.2de3720a.js"></script><script src="/js/app.4f78f61e.js"></script></body></html>
diff --git a/dist/js/app.4f78f61e.js b/dist/js/app.4f78f61e.js
diff --git a/dist/js/app.4f78f61e.js.map b/dist/js/app.4f78f61e.js.map
diff --git a/dist/js/app.ba26b63a.js b/dist/js/app.ba26b63a.js
diff --git a/dist/js/app.ba26b63a.js.map b/dist/js/app.ba26b63a.js.map
diff --git a/dist/js/chunk-vendors.2de3720a.js b/dist/js/chunk-vendors.2de3720a.js
diff --git a/dist/js/chunk-vendors.2de3720a.js.map b/dist/js/chunk-vendors.2de3720a.js.map
diff --git a/dist/js/chunk-vendors.e3f2ff10.js b/dist/js/chunk-vendors.e3f2ff10.js
diff --git a/dist/js/chunk-vendors.e3f2ff10.js.map b/dist/js/chunk-vendors.e3f2ff10.js.map
diff --git a/dist/logo.ico b/dist/logo.ico
diff --git a/src/components/UI/CardWrapper.vue b/src/components/UI/CardWrapper.vue
@@ -15,6 +15,7 @@ export default {};
   margin: 2% 5%;
 }
 .card_wrapper_content {
-  margin: 100px;
+  margin-top: 100px;
+  margin-bottom: 100px;
 }
 </style>
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
@@ -16,7 +16,6 @@ import Introduction from '../components/Introduction';
 import UpcomingEvents from '../components/UpcomingEvents';
 import Quote from '../components/Quote';
 import RecentPhotos from '../components/RecentPhotos';
-// import PhotoCard from '../components/PhotoCard.vue';
 import CardWrapper from '../components/UI/CardWrapper.vue';
 
 export default {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>csulb-tc-website</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><script src="https://kit.fontawesome.com/9ba7525b6f.js" crossorigin="anonymous"></script><link href="/css/app.c78e671e.css" rel="preload" as="style"><link href="/css/chunk-vendors.99d9968a.css" rel="preload" as="style"><link href="/js/app.ba26b63a.js" rel="preload" as="script"><link href="/js/chunk-vendors.e3f2ff10.js" rel="preload" as="script"><link href="/css/chunk-vendors.99d9968a.css" rel="stylesheet"><link href="/css/app.c78e671e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but csulb-tc-website doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.e3f2ff10.js"></script><script src="/js/app.ba26b63a.js"></script></body></html>
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="./logo.ico"><title>csulb-tc-website</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><script src="https://kit.fontawesome.com/9ba7525b6f.js" crossorigin="anonymous"></script><link href="/css/app.7cac792d.css" rel="preload" as="style"><link href="/css/chunk-vendors.7d156cba.css" rel="preload" as="style"><link href="/js/app.4f78f61e.js" rel="preload" as="script"><link href="/js/chunk-vendors.2de3720a.js" rel="preload" as="script"><link href="/css/chunk-vendors.7d156cba.css" rel="stylesheet"><link href="/css/app.7cac792d.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but csulb-tc-website doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.2de3720a.js"></script><script src="/js/app.4f78f61e.js"></script></body></html>