custom fonts and logo

14 files changed, 66 insertions, 4 deletions

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..2fca2710
--- /dev/null
+++ b/.DS_Store
diff --git a/public/.DS_Store b/public/.DS_Store
new file mode 100644
index 00000000..5b5bea06
--- /dev/null
+++ b/public/.DS_Store
diff --git a/public/css/fonts.css b/public/css/fonts.css
new file mode 100644
index 00000000..037f1971
--- /dev/null
+++ b/public/css/fonts.css
@@ -0,0 +1,48 @@
+@font-face {
+    font-family: 'TimesPixelated';
+    font-size: 16px;
+    src: url('../fonts/TIMES16-Regular.woff');
+    font-weight: normal;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'TimesPixelated';
+    font-size: 16px;
+    src: url('../fonts/TIMES16-Italic.woff');
+    font-weight: normal;
+    font-style: italic;
+}
+
+@font-face {
+    font-family: 'TimesPixelated';
+    font-size: 16px;
+    src: url('../fonts/TIMES16-Bold.woff');
+    font-weight: bold;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'TimesPixelated';
+    font-size: 24px;
+    src: url('../fonts/TIMES24-Bold.woff');
+    font-weight: bold;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'TimesPixelated';
+    font-size: 32px;
+    src: url('../fonts/TIMES32-Bold.woff');
+    font-weight: bold;
+    font-style: normal;
+}
+
+@font-face {
+    font-family: 'CourierPixelated';
+    font-size: 16px;
+    src: url('../fonts/COUR16-Regular.woff');
+    font-weight: normal;
+    font-style: normal;
+}
+
diff --git a/public/css/main.css b/public/css/main.css
index b7c5a4f9..75dd6cc7 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -7,10 +7,11 @@ body {
     background-color: #fafafa;
     padding: 0;
     min-width: calc(100vw - 16px);
+    font-family: 'TimesPixelated';
 }
 
 .sidebar {
-    background-color: rgb(162, 201, 255);
+    background-color: #bad9ff;
     padding: 20px;
     overflow-x: hidden;
     overflow-y: auto;
@@ -34,8 +35,19 @@ body {
     margin-top: 0;
 }
 
+.title {
+    display: block;
+}
+
+.title > img {
+    width: 10rem;
+    display: block;
+    margin: 0px auto 10px auto;
+    pointer-events: none;
+}
+
 .alert {
-    background-color: rgb(255, 202, 162);
+    background-color: #ffd4bd;
     padding: 20px;
     border: 1px solid #191919;
 }
@@ -43,6 +55,7 @@ body {
 lebel, input, textarea, select {
     display: block;
     margin: 5px 0px;
+    font-family: 'TimesPixelated';
 }
 
 input[type = 'submit'] {
diff --git a/public/fonts/COUR16-Regular.woff b/public/fonts/COUR16-Regular.woff
new file mode 100644
index 00000000..858c44b2
--- /dev/null
+++ b/public/fonts/COUR16-Regular.woff
diff --git a/public/fonts/TIMES16-Bold.woff b/public/fonts/TIMES16-Bold.woff
new file mode 100644
index 00000000..81e97b1c
--- /dev/null
+++ b/public/fonts/TIMES16-Bold.woff
diff --git a/public/fonts/TIMES16-Italic.woff b/public/fonts/TIMES16-Italic.woff
new file mode 100644
index 00000000..0fd1329b
--- /dev/null
+++ b/public/fonts/TIMES16-Italic.woff
diff --git a/public/fonts/TIMES16-Regular.woff b/public/fonts/TIMES16-Regular.woff
new file mode 100644
index 00000000..ab254288
--- /dev/null
+++ b/public/fonts/TIMES16-Regular.woff
diff --git a/public/fonts/TIMES24-Bold.woff b/public/fonts/TIMES24-Bold.woff
new file mode 100644
index 00000000..9ac372cf
--- /dev/null
+++ b/public/fonts/TIMES24-Bold.woff
diff --git a/public/fonts/TIMES32-Bold.woff b/public/fonts/TIMES32-Bold.woff
new file mode 100644
index 00000000..b48e4f58
--- /dev/null
+++ b/public/fonts/TIMES32-Bold.woff
diff --git a/public/images/.DS_Store b/public/images/.DS_Store
new file mode 100644
index 00000000..c7779435
--- /dev/null
+++ b/public/images/.DS_Store
diff --git a/public/images/logo.png b/public/images/logo.png
new file mode 100644
index 00000000..56366c3d
--- /dev/null
+++ b/public/images/logo.png
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index b60bc82c..804991cd 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>That Computer Scientist - <%= title %></title>
+    <link rel="stylesheet" href="css/fonts.css">
     <link rel="stylesheet" href="css/main.css">
   </head>
   <body>
\ No newline at end of file
diff --git a/views/partials/sidebar.ejs b/views/partials/sidebar.ejs
index 04eccdf9..dedea20b 100644
--- a/views/partials/sidebar.ejs
+++ b/views/partials/sidebar.ejs
@@ -1,6 +1,6 @@
 <div class="sidebar">
-  <a href="/" class="title">
-    <h1>That Computer Scientist</h1>
+    <a href="/" class="title">
+        <img src="images/logo.png" alt="That Computer Scientist Logo">
     <!-- Login Box -->
     </a>
     <% if (locals.username) { %>