Merge branch 'css' into posting

This commit is contained in:
Medium Fries 2018-12-22 21:22:55 -08:00
commit 527f2d1308
6 changed files with 147 additions and 40 deletions

View File

@ -1,5 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<!-- Load an icon library to show a hamburger menu (bars) on small screens -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<div class="topnav" id="myTopnav">
<a href="#home" class="active">Home</a>
<a href="https://gitlab.com/shockrahwow">Site Source</a>
<a href="#contact">Contact</a>
<a href="#about">About</a>
<a href="javascript:void(0);" class="icon" onclick="myFunction()">
<i class="fa fa-bars"></i>
</a>
</div>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" /> <meta http-equiv="Content-Style-Type" content="text/css" />
@ -9,8 +23,6 @@
<link rel="stylesheet" href="style.css" type="text/css" /> <link rel="stylesheet" href="style.css" type="text/css" />
</head> </head>
<body> <body>
<p><a href="./index.html"><img src="./img/banner.png" alt="Homepage" /></a></p>
<h1 id="welcome-to-my-comfy-town">Welcome to my Comfy Town</h1>
<h2 id="cool-stuff-about-me">Cool stuff about me</h2> <h2 id="cool-stuff-about-me">Cool stuff about me</h2>
<h3 id="links-to-find-me"><strong><a href="./page/links.html">Links to find me</a></strong></h3> <h3 id="links-to-find-me"><strong><a href="./page/links.html">Links to find me</a></strong></h3>
<blockquote> <blockquote>

18
make.sh
View File

@ -11,15 +11,12 @@ post() {
fi fi
} }
# mainly to create new post files updatestyle() {
writep() { # make sure that all sub styles are kept up to date with the root stylesheet
if [ -z $1 ] cp style.css ./page/bstyle.css
then sed -i 's/./fonts/../fonts//g' ./page/bstyle.css
echo 'No filename given' cp style.css ./post/bstyle.css
exit 0 sed -i 's/./fonts/../fonts//g' ./post/bstyle.css
fi
cp ./markdown/template.md ./markdown/post/$1
vim -c "Goyo" ./markdown/post/$1
} }
page() { page() {
@ -34,7 +31,10 @@ page() {
# literally just updates the index file nothing else # literally just updates the index file nothing else
index() { index() {
# base index file
pandoc ./markdown/index.md --css style.css -s -o index.html # typing succs pandoc ./markdown/index.md --css style.css -s -o index.html # typing succs
# next we inject the navbar html stuff
sed -i '7r ./templates/navbar.html' index.html
} }
help() { help() {

View File

@ -13,26 +13,55 @@ html {
font-family: 'Freemono'; font-family: 'Freemono';
src: url(../fonts/FreeMono.otf); src: url(../fonts/FreeMono.otf);
} }
/* sick nav bar */
.topnav {
overflow: hidden;
}
.topnav a {
float: left;
display: block;
/* text color */
color: #f2f2f2;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
}
.topnav a:hover {
background-color: #493267;
color: #faebd7;
}
.active {
background-color: #0e1111;
color: #faebd7;
}
.topnav .icon {
display:none;
}
/* now some stuff for the text */
body { body {
color: #444; /* regular tex color(for the front page it won't matter much since everything is blockquotes*/
color: #373854;
background-color: #faebd7;
font-family: Fixedsys; font-family: Fixedsys;
font-size: 12px; font-size: 12px;
line-height: 1.7; line-height: 1.7;
padding: 1em; padding: 1em;
margin: auto; margin: auto;
max-width: 42em; max-width: 42em;
background-image: url("../img/backt.png"); /*background-image: url("./img/backt.png");*/
background-repeat: repeat; background-repeat: repeat;
} }
/* Link stuff */ /* Link stuff */
/* default link color */
a { a {
color: #06e; color: #7bb3ff;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #0047a6; color: #9e379f;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
@ -69,7 +98,6 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #969696;
} }
img { img {
@ -77,7 +105,7 @@ img {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: #e1e1e1; color: #493267;
line-height: 125%; line-height: 125%;
margin-top: 2em; margin-top: 2em;
font-weight: normal; font-weight: normal;
@ -113,10 +141,10 @@ h6 {
} }
blockquote { blockquote {
color: #d8d8d8; color: #3b444b;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
border-left: 0.5em #008fae solid; border-left: 0.5em #493267 solid;
} }
hr { hr {
@ -130,10 +158,10 @@ hr {
} }
pre, code, kbd, samp { pre, code, kbd, samp {
background-color: #000; background-color: lightblue;
border-radius: 8px; border-radius: 8px;
padding: 8px; padding: 8px;
color: #00cc03; color: #000;
font-family: Freemono, monospace, monospace; font-family: Freemono, monospace, monospace;
_font-family: 'courier new', monospace; _font-family: 'courier new', monospace;
font-size: 0.98em; font-size: 0.98em;
@ -184,7 +212,7 @@ sub {
ul, ol { ul, ol {
margin: 1em 0; margin: 1em 0;
padding: 0 0 0 2em; padding: 0 0 0 2em;
color: #858585; color: #a3a3a3;
} }
li p:last-child { li p:last-child {

View File

@ -13,26 +13,55 @@ html {
font-family: 'Freemono'; font-family: 'Freemono';
src: url(../fonts/FreeMono.otf); src: url(../fonts/FreeMono.otf);
} }
/* sick nav bar */
.topnav {
overflow: hidden;
}
.topnav a {
float: left;
display: block;
/* text color */
color: #f2f2f2;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
}
.topnav a:hover {
background-color: #493267;
color: #faebd7;
}
.active {
background-color: #0e1111;
color: #faebd7;
}
.topnav .icon {
display:none;
}
/* now some stuff for the text */
body { body {
color: #444; /* regular tex color(for the front page it won't matter much since everything is blockquotes*/
color: #373854;
background-color: #faebd7;
font-family: Fixedsys; font-family: Fixedsys;
font-size: 12px; font-size: 12px;
line-height: 1.7; line-height: 1.7;
padding: 1em; padding: 1em;
margin: auto; margin: auto;
max-width: 42em; max-width: 42em;
background-image: url("../img/backt.png"); /*background-image: url("./img/backt.png");*/
background-repeat: repeat; background-repeat: repeat;
} }
/* Link stuff */ /* Link stuff */
/* default link color */
a { a {
color: #06e; color: #7bb3ff;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #0047a6; color: #9e379f;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
@ -69,7 +98,6 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #969696;
} }
img { img {
@ -77,7 +105,7 @@ img {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: #e1e1e1; color: #493267;
line-height: 125%; line-height: 125%;
margin-top: 2em; margin-top: 2em;
font-weight: normal; font-weight: normal;
@ -113,10 +141,10 @@ h6 {
} }
blockquote { blockquote {
color: #d8d8d8; color: #3b444b;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
border-left: 0.5em #008fae solid; border-left: 0.5em #493267 solid;
} }
hr { hr {
@ -130,10 +158,10 @@ hr {
} }
pre, code, kbd, samp { pre, code, kbd, samp {
background-color: #000; background-color: lightblue;
border-radius: 8px; border-radius: 8px;
padding: 8px; padding: 8px;
color: #00cc03; color: #000;
font-family: Freemono, monospace, monospace; font-family: Freemono, monospace, monospace;
_font-family: 'courier new', monospace; _font-family: 'courier new', monospace;
font-size: 0.98em; font-size: 0.98em;
@ -184,7 +212,7 @@ sub {
ul, ol { ul, ol {
margin: 1em 0; margin: 1em 0;
padding: 0 0 0 2em; padding: 0 0 0 2em;
color: #858585; color: #a3a3a3;
} }
li p:last-child { li p:last-child {

View File

@ -13,26 +13,55 @@ html {
font-family: 'Freemono'; font-family: 'Freemono';
src: url(./fonts/FreeMono.otf); src: url(./fonts/FreeMono.otf);
} }
/* sick nav bar */
.topnav {
overflow: hidden;
}
.topnav a {
float: left;
display: block;
/* text color */
color: #f2f2f2;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
}
.topnav a:hover {
background-color: #493267;
color: #faebd7;
}
.active {
background-color: #0e1111;
color: #faebd7;
}
.topnav .icon {
display:none;
}
/* now some stuff for the text */
body { body {
color: #444; /* regular tex color(for the front page it won't matter much since everything is blockquotes*/
color: #373854;
background-color: #faebd7;
font-family: Fixedsys; font-family: Fixedsys;
font-size: 12px; font-size: 12px;
line-height: 1.7; line-height: 1.7;
padding: 1em; padding: 1em;
margin: auto; margin: auto;
max-width: 42em; max-width: 42em;
background-image: url("./img/backt.png"); /*background-image: url("./img/backt.png");*/
background-repeat: repeat; background-repeat: repeat;
} }
/* Link stuff */ /* Link stuff */
/* default link color */
a { a {
color: #06e; color: #7bb3ff;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #0047a6; color: #9e379f;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
@ -76,7 +105,7 @@ img {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: #e1e1e1; color: #493267;
line-height: 125%; line-height: 125%;
margin-top: 2em; margin-top: 2em;
font-weight: normal; font-weight: normal;
@ -112,10 +141,11 @@ h6 {
} }
blockquote { blockquote {
color: #d8d8d8; /* this bit for the text color */
color: #3b444b;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
border-left: 0.5em #008fae solid; border-left: 0.5em #493267 solid;
} }
hr { hr {

9
templates/navbar.html Normal file
View File

@ -0,0 +1,9 @@
<div class="topnav" id="myTopnav">
<a href="#home" class="active">Home</a>
<a href="https://gitlab.com/shockrahwow">Site Source</a>
<a href="./page/links.html">Contact</a>
<a href="./page/about.html">About</a>
<i class="fa fa-bars"></i>
</a>
</div>