Fix merge conflicts.

Author: tbrockman

.gitignore

@@ -4,5 +4,4 @@ _site
 Gemfile.lock
 node_modules
 env
-__pycache__
-meta.json
+__pycache__

_config.yml

@@ -16,7 +16,7 @@
 title: theo, softserve developer
 email: iam@theo.lol
 description: >- # this means to ignore newlines until "baseurl:"
-  a Canadian software engineer living in the US
+  blog and website of a Canadian software engineer living in the US
 # baseurl: https://tbrockman.github.io/
 # Build settings
 markdown: kramdown
@@ -42,4 +42,3 @@ exclude:
   - vendor/ruby/
   - scripts
   - tmp
-  - jsnix

_sass/home.scss

@@ -15,6 +15,16 @@ $font-family-primary: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono,
         margin-right: -0.05em;}
 }
 
+@font-face {
+    font-family: "Roboto";
+    src: url("assets/fonts/Roboto/Roboto-Medium.ttf");
+}
+
+@font-face {
+    font-family: "RobotoMono";
+    src: url("assets/fonts/RobotoMono/RobotoMono-pwl.ttf")
+}
+
 .page-container {
     background-color:#252525 !important;
     max-width: initial !important;
@@ -36,21 +46,6 @@ $font-family-primary: Consolas, Menlo, Monaco, Lucida Console, Liberation Mono,
     }
 }
 
-body {
-    height: 100vh;
+#terminal > .input-row {
+    display: flex;
 }
-
-:root {
-    line-height: 1.5;
-    font-weight: 400;
-    font-size: 15px;
-  
-    color-scheme: light dark;
-    color: rgba(255, 255, 255, 0.87);
-    background-color: #242424;
-  
-    font-synthesis: none;
-    text-rendering: optimizeLegibility;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-}

_sass/navbar.scss

@@ -3,7 +3,6 @@ $color-secondary: #252525;
 $color-mouseover: #fff;
 $breakpoint-main: 1400px;
 $breakpoint-mobile: 800px;
-$navbar-height: 157.5px;
 
 @media(max-width: $breakpoint-mobile) {
     .navbar {
@@ -18,7 +17,7 @@ $navbar-height: 157.5px;
     }
 
     div.page-container {
-        margin-top: $navbar-height !important;
+        margin-top: 114px !important;
     }
 }
 
@@ -28,7 +27,6 @@ $navbar-height: 157.5px;
         z-index: 10;
         flex-direction: column;
         transition: all 0.2s ease-in;
-        height: 157.5px;
         // animation: slide-right-close-nav 0.2s ease-in-out;
 
         .container {
@@ -106,10 +104,11 @@ $navbar-height: 157.5px;
     a.fa {
         font-size: 3rem !important;
         color: #252525;
+        margin-top: 10px !important;
     }
 
     div.page-container {
-        margin-top: $navbar-height;
+        margin-top: 146px;
     }
 }