diff --git a/index.html b/index.html index d894347..d510ce7 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,19 @@ + + + + +
+ Home + Site Source + Contact + About + + + +
+ @@ -9,8 +23,6 @@ -

Homepage

-

Welcome to my Comfy Town

Cool stuff about me

diff --git a/make.sh b/make.sh index 641a397..80be495 100755 --- a/make.sh +++ b/make.sh @@ -11,15 +11,12 @@ post() { fi } -# mainly to create new post files -writep() { - if [ -z $1 ] - then - echo 'No filename given' - exit 0 - fi - cp ./markdown/template.md ./markdown/post/$1 - vim -c "Goyo" ./markdown/post/$1 +updatestyle() { + # make sure that all sub styles are kept up to date with the root stylesheet + cp style.css ./page/bstyle.css + sed -i 's/./fonts/../fonts//g' ./page/bstyle.css + cp style.css ./post/bstyle.css + sed -i 's/./fonts/../fonts//g' ./post/bstyle.css } page() { @@ -34,7 +31,10 @@ page() { # literally just updates the index file nothing else index() { + # base index file 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() { diff --git a/page/bstyle.css b/page/bstyle.css index 06e2c15..75a3c4d 100644 --- a/page/bstyle.css +++ b/page/bstyle.css @@ -13,26 +13,55 @@ html { font-family: 'Freemono'; 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 { - 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-size: 12px; line-height: 1.7; padding: 1em; margin: auto; max-width: 42em; - background-image: url("../img/backt.png"); + /*background-image: url("./img/backt.png");*/ background-repeat: repeat; } /* Link stuff */ + /* default link color */ a { - color: #06e; + color: #7bb3ff; text-decoration: none; } /* visited link */ a:visited { - color: #0047a6; + color: #9e379f; } /* hovering link */ a:hover { @@ -69,7 +98,6 @@ a::selection { p { margin: 1em 0; - color: #969696; } img { @@ -77,7 +105,7 @@ img { } h1, h2, h3, h4, h5, h6 { - color: #e1e1e1; + color: #493267; line-height: 125%; margin-top: 2em; font-weight: normal; @@ -113,10 +141,10 @@ h6 { } blockquote { - color: #d8d8d8; + color: #3b444b; margin: 0; padding-left: 3em; - border-left: 0.5em #008fae solid; + border-left: 0.5em #493267 solid; } hr { @@ -130,10 +158,10 @@ hr { } pre, code, kbd, samp { - background-color: #000; + background-color: lightblue; border-radius: 8px; padding: 8px; - color: #00cc03; + color: #000; font-family: Freemono, monospace, monospace; _font-family: 'courier new', monospace; font-size: 0.98em; @@ -184,7 +212,7 @@ sub { ul, ol { margin: 1em 0; padding: 0 0 0 2em; - color: #858585; + color: #a3a3a3; } li p:last-child { diff --git a/post/bstyle.css b/post/bstyle.css index 06e2c15..75a3c4d 100644 --- a/post/bstyle.css +++ b/post/bstyle.css @@ -13,26 +13,55 @@ html { font-family: 'Freemono'; 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 { - 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-size: 12px; line-height: 1.7; padding: 1em; margin: auto; max-width: 42em; - background-image: url("../img/backt.png"); + /*background-image: url("./img/backt.png");*/ background-repeat: repeat; } /* Link stuff */ + /* default link color */ a { - color: #06e; + color: #7bb3ff; text-decoration: none; } /* visited link */ a:visited { - color: #0047a6; + color: #9e379f; } /* hovering link */ a:hover { @@ -69,7 +98,6 @@ a::selection { p { margin: 1em 0; - color: #969696; } img { @@ -77,7 +105,7 @@ img { } h1, h2, h3, h4, h5, h6 { - color: #e1e1e1; + color: #493267; line-height: 125%; margin-top: 2em; font-weight: normal; @@ -113,10 +141,10 @@ h6 { } blockquote { - color: #d8d8d8; + color: #3b444b; margin: 0; padding-left: 3em; - border-left: 0.5em #008fae solid; + border-left: 0.5em #493267 solid; } hr { @@ -130,10 +158,10 @@ hr { } pre, code, kbd, samp { - background-color: #000; + background-color: lightblue; border-radius: 8px; padding: 8px; - color: #00cc03; + color: #000; font-family: Freemono, monospace, monospace; _font-family: 'courier new', monospace; font-size: 0.98em; @@ -184,7 +212,7 @@ sub { ul, ol { margin: 1em 0; padding: 0 0 0 2em; - color: #858585; + color: #a3a3a3; } li p:last-child { diff --git a/style.css b/style.css index ff8d3fa..b20f9eb 100644 --- a/style.css +++ b/style.css @@ -13,26 +13,55 @@ html { font-family: 'Freemono'; 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 { - 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-size: 12px; line-height: 1.7; padding: 1em; margin: auto; max-width: 42em; - background-image: url("./img/backt.png"); + /*background-image: url("./img/backt.png");*/ background-repeat: repeat; } /* Link stuff */ + /* default link color */ a { - color: #06e; + color: #7bb3ff; text-decoration: none; } /* visited link */ a:visited { - color: #0047a6; + color: #9e379f; } /* hovering link */ a:hover { @@ -76,7 +105,7 @@ img { } h1, h2, h3, h4, h5, h6 { - color: #e1e1e1; + color: #493267; line-height: 125%; margin-top: 2em; font-weight: normal; @@ -112,10 +141,11 @@ h6 { } blockquote { - color: #d8d8d8; + /* this bit for the text color */ + color: #3b444b; margin: 0; padding-left: 3em; - border-left: 0.5em #008fae solid; + border-left: 0.5em #493267 solid; } hr { diff --git a/templates/navbar.html b/templates/navbar.html new file mode 100644 index 0000000..fcc3061 --- /dev/null +++ b/templates/navbar.html @@ -0,0 +1,9 @@ +
+ Home + Site Source + Contact + About + + +
+