disinclined.org / git / disinclined.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 731961c)
Better organize head{,er} files
authorDylan Lloyd <dylan@disinclined.org>
Fri, 3 Feb 2023 22:20:46 +0000 (17:20 -0500)
committerDylan Lloyd <dylan@disinclined.org>
Fri, 3 Feb 2023 22:20:46 +0000 (17:20 -0500)
_includes/head.html patch | blob | history
_includes/header.html [new file with mode: 0644] patch | blob
_includes/html-header.html [deleted file] patch | blob | history
_layouts/default.html patch | blob | history
main.scss patch | blob | history

diff --git a/_includes/head.html b/_includes/head.html
index a4a3557..8157fbe 100644 (file)
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -1 +1,10 @@
-<a class=title href="{{site.baseurl}}">{{site.name}}</a>
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
+  <meta property='og:title' content='{{ site.title }}'>
+  <meta property='og:url' content='{{ site.url }}'>
+
+  <title>{{ site.title }}</title>
+  <link rel="icon" href="/favicon.ico" type="image/png">
+  <link href='main.css' rel='stylesheet' type='text/css'>
+  <script src='/assets/index.js'></script>
+</head>
diff --git a/_includes/header.html b/_includes/header.html
new file mode 100644 (file)
index 0000000..fa04c60
--- /dev/null
+++ b/_includes/header.html
@@ -0,0 +1,3 @@
+<div id=header>
+  <a class=title href="{{site.baseurl}}">{{site.name}}</a>
+</div>
diff --git a/_includes/html-header.html b/_includes/html-header.html
deleted file mode 100644 (file)
index 8157fbe..0000000
--- a/_includes/html-header.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-  <meta property='og:title' content='{{ site.title }}'>
-  <meta property='og:url' content='{{ site.url }}'>
-
-  <title>{{ site.title }}</title>
-  <link rel="icon" href="/favicon.ico" type="image/png">
-  <link href='main.css' rel='stylesheet' type='text/css'>
-  <script src='/assets/index.js'></script>
-</head>
diff --git a/_layouts/default.html b/_layouts/default.html
index f6b6be7..33cdced 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,15 +1,13 @@
 <!DOCTYPE html>
 <html lang="{{ page.lang | default: site.lang | default: "en" }}">
 
-  {%- include html-header.html -%}
+  {%- include head.html -%}
 
   <body>
 
-    {%- include head.html -%}
-
     <main>
       <div id="wrapper">
-        <a class=title href="{{site.baseurl}}">{{site.name}}</a>
+        {%- include header.html %}
         {{ content }}
       </div>
     </main>
diff --git a/main.scss b/main.scss
index c408248..8fe29f7 100644 (file)
--- a/main.scss
+++ b/main.scss
@@ -82,13 +82,26 @@ li {
 }
 
 
+// ----------------------------------
+// Header
+// ----------------------------------
+
+#header a:visited {
+    color: black;
+}
+
+
 // ----------------------------------
 // Primary Structure
 // ----------------------------------
 
+html {
+    margin: 20px;
+}
 
 body {
     margin-top: 30px;
+    font-size: 110%;
 }
 
 main {
@@ -96,18 +109,17 @@ main {
     margin:0px auto 0;
 }
 
-.title {
+#header .title {
     font-family:'bree_serifregular';
     font-size: 404%;
+    margin-left: -1%;
 }
 
 #wrapper {
     width:725px;
     min-height:300px;
     margin-bottom:20px;
-    margin-right:15px;
     text-align:left;
-    padding:5px 5px 25px 20px;
 }
 
 
my website