Added links to portfolio

2024-07-31 18:11:40 -05:00 · 2024-07-31 18:11:40 -05:00 · beab033fd7
parent 684e05fd5f
commit beab033fd7
4 changed files with 381 additions and 22 deletions
--- a/dist/index.html
+++ b/dist/index.html
@ -1,6 +1,356 @@
-<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>logan's site</title><style>@font-face {
+<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>logan's site</title><style>/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+   ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+  margin: 0;
+}
+
+/**
+ * Render the `main` element consistently in IE.
+ */
+
+main {
+  display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+  border-style: none;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+  overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+  text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type=&quot;button&quot;],
+[type=&quot;reset&quot;],
+[type=&quot;submit&quot;] {
+  -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type=&quot;button&quot;]::-moz-focus-inner,
+[type=&quot;reset&quot;]::-moz-focus-inner,
+[type=&quot;submit&quot;]::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type=&quot;button&quot;]:-moz-focusring,
+[type=&quot;reset&quot;]:-moz-focusring,
+[type=&quot;submit&quot;]:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ *    `fieldset` elements in all browsers.
+ */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type=&quot;checkbox&quot;],
+[type=&quot;radio&quot;] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type=&quot;number&quot;]::-webkit-inner-spin-button,
+[type=&quot;number&quot;]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type=&quot;search&quot;] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type=&quot;search&quot;]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+   ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+  display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
+   ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+  display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+  display: none;
+}
+
+</style><style>@font-face {
  font-family: 'merriweather';
-  src: url(/res/merriweather-regular.ttf);
+  src: url(/res/merriweather-regular.woff2);
 }

@font-face {
@ -69,9 +419,10 @@ code {
  text-align: center;
 }

-ul {
+.twocols{
  display: inline-block;
  columns: 2;
+  text-align: left;
  -webkit-columns: 2;
  -moz-columns: 2;
 }
@ -119,7 +470,7 @@ h1,h2 {
 }


-</style></head><body><div class="container flex"><main class="tile big"><h1>logan's site</h1><hr><div class="flex"><div class="third"><h2>me</h2>
+</style></head><body><div class="container flex"><main class="tile big"><h1>logan's site</h1><hr><div class="flex"><div class="half"><h2>me</h2>
              I am a programming and philosophy
              enthusiast. Once upon a time i was a
              competitive debater on a few local and
@ -128,4 +479,8 @@ h1,h2 {
              get the hang of it. Currently in the
              process of discovering my love for
              hypertext and the world wide web!
-            </div><div class="third text_center"><h2>interests</h2><ul class="twocol"><li><a>books</a></li><li><a>music</a></li><li><a>software</a></li><li><a>websites</a></li></ul></div><div class="third"><h2>blog</h2><ul class="twocol"></ul></div></div></main></div></body></html>
+            <h2>migration</h2>
+                I am currently in the process of migrating my git repositories
+                and portfolio to be entirely self hosted. Some features and 
+                integrations are still a work in progress. Fishbowl will return soon!
+            </div><div class="half"><h2>portfolio</h2><ul><li><a href="https://git.lgatlin.dev/">my git server</a></li><li><a href="https://git.lgatlin.dev/logan/http-server">http web server</a></li><li><a href="https://git.lgatlin.dev/logan/html-templater">html templating language</a></li><li><a href="https://git.lgatlin.dev/logan/fishbowl">kinematic image processing</a></li><li><a href="https://git.lgatlin.dev/logan/forte">stack based assembly language</a></li><li><a href="https://git.lgatlin.dev/logan/nrange">n dimensional cartesian product</a></li><li><a href="https://git.lgatlin.dev/logan/stocks">stock trading algorithm</a></li></ul></div></div></main></div></body></html>
--- a/dist/res/merriweather-regular.woff2
+++ b/dist/res/merriweather-regular.woff2
--- a/src/main.css
+++ b/src/main.css
@ -1,6 +1,6 @@
@font-face {
  font-family: 'merriweather';
-  src: url(/res/merriweather-regular.ttf);
+  src: url(/res/merriweather-regular.woff2);
 }

@font-face {
@ -69,9 +69,10 @@ code {
  text-align: center;
 }

-ul {
+.twocols{
  display: inline-block;
  columns: 2;
+  text-align: left;
  -webkit-columns: 2;
  -moz-columns: 2;
 }
--- a/src/main.rs
+++ b/src/main.rs
@ -12,7 +12,7 @@ fn head() -> Markup {
      meta name="viewport" content="width=device-width, initial-scale=1.0";
      meta http-equiv="X-UA-Compatible" content="ie=edge";
      title { "logan's site" };
-      // style { (include_str!("normalize.css")) }
+      style { (include_str!("normalize.css")) }
      style { (PreEscaped(include_str!("main.css"))) }
    }
  }
@ -52,7 +52,7 @@ fn index() -> Markup {
        h1 {"logan's site"}
        hr;
        div .flex {
-          div .third {
+          div .half {
            h2 {"me"}
            "
              I am a programming and philosophy
@ -64,20 +64,23 @@ fn index() -> Markup {
              process of discovering my love for
              hypertext and the world wide web!
            "
+            h2 {"migration"}
+            "
+                I am currently in the process of migrating my git repositories
+                and portfolio to be entirely self hosted. Some features and 
+                integrations are still a work in progress. Fishbowl will return soon!
+            "
          }
-          div .third .text_center {
-            h2 {"interests"}
-            ul .twocol {
-              li { a { "books" } }
-              li { a { "music" } }
-              li { a { "software" } }
-              li { a { "websites" } }
-            }
-          }
-          div .third {
-            h2 {"blog"}
-            ul .twocol {
-
+          div .half {
+            h2 {"portfolio"}
+            ul {
+              li { a href="https://git.lgatlin.dev/" { "my git server" } }
+              li { a href="https://git.lgatlin.dev/logan/http-server" { "http web server" } }
+              li { a href="https://git.lgatlin.dev/logan/html-templater" { "html templating language" } }
+              li { a href="https://git.lgatlin.dev/logan/fishbowl" { "kinematic image processing" } }
+              li { a href="https://git.lgatlin.dev/logan/forte" { "stack based assembly language" }}
+              li { a href="https://git.lgatlin.dev/logan/nrange" { "n dimensional cartesian product" }}
+              li { a href="https://git.lgatlin.dev/logan/stocks" { "stock trading algorithm" }}
            }
          }
        }