diff --git a/img/backt.png b/img/backt.png index aa706f5..0b2b0a1 100644 Binary files a/img/backt.png and b/img/backt.png differ diff --git a/make.sh b/make.sh index 80be495..d4821f3 100755 --- a/make.sh +++ b/make.sh @@ -1,10 +1,11 @@ # compiles new post into target directory +rootDir='./_site/' post() { # check directory existence if [ -f markdown/post/$1 ] then - # compile the new post and drop it in ./post/ - pandoc markdown/post/$1 --css bstyle.css -s -o post/${1%.*}.html + # CSS file is always relative to the target html location + pandoc markdown/post/$1 --css style.css -s -o $rootDir/post/${1%.*}.html else # error message incase file was not found echo "File \"$1\" not found in markdown/post" @@ -12,18 +13,24 @@ post() { } 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 + # Updating index style + cp style.css $rootDir/style.css + sed -i 's/.\/fonts/..\/fonts/g' $rootDir/style.css + + # Updating page style + cp style.css $rootDir/page/style.css + sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css + + # Updating post style + cp style.css $rootDir/post/style.css + sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css } page() { # we want to enforce maintainence of directory structure if [ -f markdown/pages/$1 ] then - pandoc markdown/pages/$1 --css bstyle.css -s -o page/${1%.*}.html + pandoc markdown/pages/$1 --css style.css -s -o $rootDir/page/${1%.*}.html else echo "File \"$1\" not found in markdown/pages" fi @@ -32,28 +39,19 @@ 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 + pandoc ./markdown/index.md --css style.css -s -o $rootDir/index.html # typing succs # next we inject the navbar html stuff - sed -i '7r ./templates/navbar.html' index.html + sed -i '7r ./templates/navbar.html' $rootDir/index.html } -help() { - case $1 in - type) - echo -e "[post, page] \n\tThe kind of page you want to add to the site" - echo "Different types result in different compilation locations" - ;; - target) - echo "The file that you want to actually compile to html" - ;; - flag) - echo -e "Available flags:\n\tr - rebuilds file, does not update index.html\n\tn - builds file, updates index.html" - echo -e "\t*Pages will not update index.html*" - ;; - *) - echo "./make.sh type target.md flag" - esac -} - -# taking function names as para +# taking function names as param "$@" + +if [ -z $1 ] +then + echo './make.sh post file.md - make new post' + echo './make.sh updatestyle - update & sync style sheets' + echo './make.sh page file.md - make new page' + echo './make.sh index - update index' +fi + diff --git a/markdown/pages/about.md b/markdown/pages/about.md index a132f65..ab0dd5e 100644 --- a/markdown/pages/about.md +++ b/markdown/pages/about.md @@ -1,6 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - -# About Me +# [About Me](../index.html) _really though what did you expect a blog post?_ @@ -24,4 +22,3 @@ Not being dead or a fern are probably my top two things I enjoy right ahead of n Honestly I like making stuff in software, _but hardware is also cool(just exepensive_). CTF challenges are lots of fun as well, but I've yet to document my findings on one as many have weird rules about sharing, and I feel weird about it as well. - diff --git a/markdown/pages/links.md b/markdown/pages/links.md index 5c0eb2b..380ca6e 100644 --- a/markdown/pages/links.md +++ b/markdown/pages/links.md @@ -1,6 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - -# Links and places to find me online +# [Links and places to find me online](../index.html) ### Professional Links/Business inquires @@ -8,6 +6,10 @@ I would highly prefer that you contact me via email so that I may get to the mes * email: alejandros714@protonmail.com +_A quick side note that I am much more active on gitlab than github_ +* Gitlab Account: https://github.com/shockrahwow +* Github Account: https://gitlab.com/shockrahwow + ### Social Medias Links _List of places to contanct me or find me doing random things in general_ diff --git a/markdown/post/bash-1.md b/markdown/post/bash-1.md index 4ae64b8..77da0aa 100644 --- a/markdown/post/bash-1.md +++ b/markdown/post/bash-1.md @@ -1,5 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - +# [Bash is weird sometimes](../index.html) # Bash is weird sometimes diff --git a/markdown/post/mapping.md b/markdown/post/mapping.md index b2ada85..56a8eff 100644 --- a/markdown/post/mapping.md +++ b/markdown/post/mapping.md @@ -1,4 +1,4 @@ -[![HomePage](../img/banner.png)](../index.html) +# [Mapping Again](../index.html) [Link to the map I discuss here](https://steamcommunity.com/sharedfiles/filedetails/?id=1329660201) diff --git a/markdown/post/neatgit.md b/markdown/post/neatgit.md new file mode 100644 index 0000000..0a3258d --- /dev/null +++ b/markdown/post/neatgit.md @@ -0,0 +1,15 @@ +# [Git and Vim for Notes](../index.html) + +It's no fun looking for a good note-taking program for school since so many of them seem to just kinda succ. +The good thing however is that you don't really need a good note taking program like you need a good text editor. +In case you haven't yet considered it, I'll show you how you can make _your favorite text editor_ the comfiest note taker out there. +Of course I want to also show you how to get your stuff synced between multiple devices, because that's also super useful. + +## Editing, Syncing, File Formats Galore + +In my case [vim](https://www.vim.org/) is my go-to editor that I use for basically everything. +This is partly due to the fact that I am just efficient using it and partly that I have some plugins which make it super nice for basically every type of text editing that I could ever want or need. + +There's all sorts of plugins for vim that you can find out in the ether. +Utilities like spell-checkers, auto-complete, and in the case of this post, _Goyo_, a special plugin to make vim more distraction free to focus on your work. + diff --git a/markdown/post/open.md b/markdown/post/open.md index cfc284c..cf85d45 100644 --- a/markdown/post/open.md +++ b/markdown/post/open.md @@ -1,6 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - -# All done setting up +# [All done setting up](../index.html) Finally after some struggling with various git clients and learning to use some new tools the source code for this website is finally up and hosted on Gitlab. diff --git a/markdown/post/phil.md b/markdown/post/phil.md index e93bc0b..7c36b1a 100644 --- a/markdown/post/phil.md +++ b/markdown/post/phil.md @@ -1,6 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - -# No Non-free JS here +# [No Non-free JS here](../index.html) To explain succintly, I don't like Javascript, especially considering how much power it has on a user's browser. Namely the issue being that while it used to mainly be focused around making websites look pretty it now also serves to execute malicious code; luckily I don't think that is too common but that fact alone makes JS for me, something which should be avoided. diff --git a/markdown/post/qca1.md b/markdown/post/qca1.md index b5e559c..23f5458 100644 --- a/markdown/post/qca1.md +++ b/markdown/post/qca1.md @@ -1,6 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - -# Quake Champions Academy Back from the Dead +# [Quake Champions Academy Back from the Dead](../index.html) Finally after nearly a year I've started working on my Quake Chamions Academy project again but this time I have some specific goals in mind besides just, run lots of community events. diff --git a/markdown/post/qute.md b/markdown/post/qute.md index c0995af..0956703 100644 --- a/markdown/post/qute.md +++ b/markdown/post/qute.md @@ -1,6 +1,4 @@ -[![Homepage](../img/banner.png)](../index.html) - -# A Taste of QuteBrowser +# [A Taste of QuteBrowser](../index.html) I finally sat down and started fully using [Qutebrowser](https://www.qutebrowser.org/) and to be honest, it's great. I had tried using it before but I never bothered to learn how to to use it nor did I try to rice it to be liking. diff --git a/page/bstyle.css b/page/style.css similarity index 84% rename from page/bstyle.css rename to page/style.css index 75a3c4d..06e2c15 100644 --- a/page/bstyle.css +++ b/page/style.css @@ -13,55 +13,26 @@ 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 { - /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ - color: #373854; - background-color: #faebd7; + color: #444; 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: #7bb3ff; + color: #06e; text-decoration: none; } /* visited link */ a:visited { - color: #9e379f; + color: #0047a6; } /* hovering link */ a:hover { @@ -98,6 +69,7 @@ a::selection { p { margin: 1em 0; + color: #969696; } img { @@ -105,7 +77,7 @@ img { } h1, h2, h3, h4, h5, h6 { - color: #493267; + color: #e1e1e1; line-height: 125%; margin-top: 2em; font-weight: normal; @@ -141,10 +113,10 @@ h6 { } blockquote { - color: #3b444b; + color: #d8d8d8; margin: 0; padding-left: 3em; - border-left: 0.5em #493267 solid; + border-left: 0.5em #008fae solid; } hr { @@ -158,10 +130,10 @@ hr { } pre, code, kbd, samp { - background-color: lightblue; + background-color: #000; border-radius: 8px; padding: 8px; - color: #000; + color: #00cc03; font-family: Freemono, monospace, monospace; _font-family: 'courier new', monospace; font-size: 0.98em; @@ -212,7 +184,7 @@ sub { ul, ol { margin: 1em 0; padding: 0 0 0 2em; - color: #a3a3a3; + color: #858585; } li p:last-child { diff --git a/post/bstyle.css b/post/style.css similarity index 84% rename from post/bstyle.css rename to post/style.css index 75a3c4d..06e2c15 100644 --- a/post/bstyle.css +++ b/post/style.css @@ -13,55 +13,26 @@ 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 { - /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ - color: #373854; - background-color: #faebd7; + color: #444; 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: #7bb3ff; + color: #06e; text-decoration: none; } /* visited link */ a:visited { - color: #9e379f; + color: #0047a6; } /* hovering link */ a:hover { @@ -98,6 +69,7 @@ a::selection { p { margin: 1em 0; + color: #969696; } img { @@ -105,7 +77,7 @@ img { } h1, h2, h3, h4, h5, h6 { - color: #493267; + color: #e1e1e1; line-height: 125%; margin-top: 2em; font-weight: normal; @@ -141,10 +113,10 @@ h6 { } blockquote { - color: #3b444b; + color: #d8d8d8; margin: 0; padding-left: 3em; - border-left: 0.5em #493267 solid; + border-left: 0.5em #008fae solid; } hr { @@ -158,10 +130,10 @@ hr { } pre, code, kbd, samp { - background-color: lightblue; + background-color: #000; border-radius: 8px; padding: 8px; - color: #000; + color: #00cc03; font-family: Freemono, monospace, monospace; _font-family: 'courier new', monospace; font-size: 0.98em; @@ -212,7 +184,7 @@ sub { ul, ol { margin: 1em 0; padding: 0 0 0 2em; - color: #a3a3a3; + color: #858585; } li p:last-child { diff --git a/rebuild.sh b/rebuild.sh new file mode 100755 index 0000000..4a4f3ee --- /dev/null +++ b/rebuild.sh @@ -0,0 +1,17 @@ +# Because sometimes you just have to rebuild everything +rootDir='./_site/' +post() { + for file in ./markdown/post/* + do + fileName=$(basename $file) + pandoc $file --css style.css -s -o $rootDir/post/${fileName%.*}.html + done +} + +page() { + for file in ./markdown/pages/* + do + pandoc $file --css style.css -s -o $rootDir/page/${fileName%.*}.html + done +} +"$@" diff --git a/style.css b/style.css index b20f9eb..be61572 100644 --- a/style.css +++ b/style.css @@ -49,12 +49,10 @@ body { padding: 1em; margin: auto; max-width: 42em; - /*background-image: url("./img/backt.png");*/ - background-repeat: repeat; } /* Link stuff */ - /* default link color */ +/* default link color */ a { color: #7bb3ff; text-decoration: none; @@ -98,6 +96,7 @@ a::selection { p { margin: 1em 0; + color: #F1C6A7; } img { @@ -145,7 +144,7 @@ blockquote { color: #3b444b; margin: 0; padding-left: 3em; - border-left: 0.5em #493267 solid; + border-left: 0.5em #008fae solid; } hr { @@ -159,10 +158,10 @@ hr { } pre, code, kbd, samp { - background-color: lightblue; - border-radius: 8px; - padding: 8px; - color: #000; + background-color: #000; + /*border-radius: 8px; */ + padding: 4px; + color: #EECA3E; font-family: Freemono, monospace, monospace; _font-family: 'courier new', monospace; font-size: 0.98em;