diff --git a/README.md b/README.md index e297391..c0bfe10 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,24 @@ Below is a description of what each directory contains and why. ## ~/ -* `index.md` - markdown of the main page, is rendered using `make.sh` into an html file which is then used on neocities - * `index.html` - the main page where most links can be found in the site -* `notes.md` - random notes that I use to remind myself of how things work on occasion. - * `make.sh` - build file for basically everything -## /markdown +* `build.sh` - build script that basically does what `make.sh` but in a lazy(stupid) as hell way + +## ./markdown Container for all/post articles and/or posts to the site, including but not limited to the homepage, site philosophy post and others. These are then rendered into actual html files using the `make.sh` file. -## /post - -Stylesheets for the actual posts as well as the previously mentioned html render files which pandoc produces. - -## /img +## ./img Images used for the site go here + +## ./fonts + +Fonts that are really cool + +## ./_site + +Though this directory doesn't show up on in the repository it's where the public files go once they are built and ready for the actualy website diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..e88edee --- /dev/null +++ b/build.sh @@ -0,0 +1,69 @@ +# Because sometimes you just have to rebuild everything +rootDir='./_site/' + +index() { + pandoc ./markdown/index.md --css style.css -s -o $rootDir/index.html +} + +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 +} + +style() { + # Updating index style + cp style.css $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/post/style.css + +} + +yeet() { + post + page + style + # finally we'll upload the site itself to neocities + neocities push _site/ +} + + +# Setups site directory from scratch +init() { + mkdir -p "$rootDir/page/" "$rootDir/post/" "$rootDir/fonts/" "$rootDir/img/" + + cp ./img/* "$rootDir/img/" + cp ./fonts/* "$rootDir/fonts/" + + post + page + index + style +} + +"$@" + +if [ -z $1 ] +then + echo './build.sh init - create website from scratch' + echo './build.sh post - builds posts' + echo './build.sh page - builds pages' + echo './build.sh style - builds style' + echo './build.sh yeet - upload to neocties' +fi + diff --git a/make.sh b/make.sh index d4821f3..34639ef 100755 --- a/make.sh +++ b/make.sh @@ -15,15 +15,14 @@ post() { updatestyle() { # 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 + 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 + sed -i 's/(.\/fonts/(..\/fonts/g' $rootDir/post/style.css } page() { diff --git a/markdown/index.md b/markdown/index.md index 78f48fd..3ce15c2 100644 --- a/markdown/index.md +++ b/markdown/index.md @@ -1,4 +1,4 @@ -# This is definitely not a blog +# [This is definitely not a blog](./index.html) ### **[Wot in tarnation happend to the style](./post/style.html)** > _September 21, 2018_ \ diff --git a/markdown/post/bash-1.md b/markdown/post/bash-1.md index 77da0aa..8129786 100644 --- a/markdown/post/bash-1.md +++ b/markdown/post/bash-1.md @@ -1,7 +1,5 @@ # [Bash is weird sometimes](../index.html) -# Bash is weird sometimes - Bash is actually pretty nice but is... weird sometimes. \ Take this for instance: `alias v='vim'` This is an actual bind I use daily however if you don't have tab-completion setup for vim you know that tab-completion usually results in: diff --git a/markdown/post/inthefile.md b/markdown/post/inthefile.md deleted file mode 100644 index 953677d..0000000 --- a/markdown/post/inthefile.md +++ /dev/null @@ -1,58 +0,0 @@ -# [In the file](../index.html) - -* first draft of this little writing - -## Preamble Note -Before I go into any detail at all I should mention that in fact this whole post is somewhat of a rant on a pet peeve of mine. -At the same time I want to discuss why this mostly exists as a problem I have with the """_absolute state_""" of computer science education. - -## I'm in the file what now? - -I've lost track of how many times this has been thrown my by students learning about the commandline in a \*nix environment. -It's not that I loathe this phrasing but, I completely loathe it. -Something about it feels as though many don't realize that they're not actually saying anything with this phrase. -It's like going to change your oil and saying, "_alright im in the engine_". - -For those trying to learn "the _commandline/terminal_" I have on piece of advice: a directory is a folder. -To be honest I know this stems from students being taught """_the commandline_""" with literally 0 context given. -I use a terminal for everything, hell this whole website was built in the termianl but, even I don't know what people mean when they say, "I know the commandline". -All I know is that they refer to Linux _stuff_ but even then I'm not completely sure what that is supposed to mean. - -## The part where I blame academia - -How many times has academia managed to fist its way into every crevice of the world with no complaints I'll never know, but I do know it sucks for everyone. -I say this because for learning theory academia has always been great, structuring that which needed it most. -For _everything_ outside of that realm, eh. - -It seems like at least in CSU Monterey Bay the staff have a hard-on for Unix but have little idea of how to teach it. - -### Another section for my prosed solution so its easy find - -Stop directly teaching how to use the commandline. -Instead setup students in a situation where commandline utilities would be the easiest to setup or the best choice to use. - -> B-b-but if we do that they might not do it pro- - -_Stop_, they're going to fuck things up regardless, at least this way they'll learn the dumb meme you're targeting but in a practical manner. -Trust me whatever they end up learning, they _will not_ forget. -Details sure; everyone forgets details, but at least most students(apart from the stupid ones) will know at least some basic tricks to help them later in (CS) life. - -## Pet Peeve - -Nearly everytime I help another student with command line _stuff_ I hold back cringe upon hearing the phrase, "_I'm in the file what do i do now????_". -If anyone can decipher the meaning of this phrase I would love to know but as of right now I'm stumped. -It reminds of when a mechanic friend of mine told me of how he can't stand hering customers say, "_yea the engine is on the fritz_". - -## Filesystems are vry hrd - -Recently at my university more and more of the curriculum has been focused on teaching student of the Unix command line environment. -This entails a few things: - -1. Teach students some basic utility in case they find themselves needing to do some remote work -2. Exposure to new tools(_more on this point in another section_) - -Though the prospect may be enticing its the execution which ruins the whole thing. -Primarily the problem with teaching unix to students is the lack of context. -Tools like _Git_, _Bash_, or even an editor like _Nano_ end up being confusing to students for some new arbitrary reason. -When I say that these things are confusing I mean I've literally had a student ask me, "_What's the point of Git even? I don't get why we're learning this_". - diff --git a/markdown/post/neatgit.md b/markdown/post/neatgit.md deleted file mode 100644 index 0a3258d..0000000 --- a/markdown/post/neatgit.md +++ /dev/null @@ -1,15 +0,0 @@ -# [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/notes.md b/notes.md deleted file mode 100644 index fa79acc..0000000 --- a/notes.md +++ /dev/null @@ -1,24 +0,0 @@ -# Building - -using pandoc script `make.sh` -bash make.sh inputFile styleSheet outputFile - -1. Full path to the file from the script location \ - -2. Path to style sheet relative to where the output file *will be* located \ - -3. Full path to the output file \ - - -# Todo section - -* site banner which is easier to click on for mobile users, also so that it looks pretty for the site in general - -* Housekeeping - updating site css as time goes on so that I looks good and whatnot - -* make script to handle automatically targetting a given file and producing the proper html output file. The only one which may need something special is the index page since it might need some kind of menu to navigate to other places in the site like links/blog/about etc - -# Daily Todo/Order list - -Layer for index updater which cats out the proper headers/title from a finished markdown post and into the markdown file so that we can compile it like normal - diff --git a/page/style.css b/page/style.css new file mode 100644 index 0000000..23450b7 --- /dev/null +++ b/page/style.css @@ -0,0 +1,351 @@ +html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} + +@font-face { + font-family: 'Fixedsys'; + src: url(../fonts/FSEX300.ttf); +} +@font-face { + font-family: 'Freemono'; + src: url(../fonts/FreeMono.otf); +} +body { +<<<<<<< HEAD:page/bstyle.css + /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ + color: #3b444b; + background-color: #faebd7; +======= + color: #444; +>>>>>>> struct:page/style.css + font-family: Fixedsys; + font-size: 12px; + line-height: 1.7; + padding: 1em; + margin: auto; + max-width: 42em; + background-image: url("../img/backt.png"); + background-repeat: repeat; +} + +/* Link stuff */ +a { + color: #06e; + text-decoration: none; +} +/* visited link */ +a:visited { + color: #0047a6; +} +/* hovering link */ +a:hover { + color: #3284f1; +} +/* clicked on */ +a:active { + color: #e5effd; +} +/* only if a link was dragged but not went through or smthng */ +a:focus { + outline: thin dotted; +} + +*::-moz-selection { + background: rgba(255, 255, 0, 0.3); + color: #000; +} + +*::selection { + background: rgba(255, 255, 0, 0.3); + color: #000; +} + +a::-moz-selection { + background: rgba(255, 255, 0, 0.3); + color: #0645ad; +} + +a::selection { + background: rgba(255, 255, 0, 0.3); + color: #0645ad; +} + +p { + margin: 1em 0; + color: #969696; +} + +img { + max-width: 100%; +} + +h1, h2, h3, h4, h5, h6 { + color: #e1e1e1; + line-height: 125%; + margin-top: 2em; + font-weight: normal; +} + +h4, h5, h6 { + font-weight: bold; +} + +h1 { + font-family: "Fixedsys"; + font-size: 2.5em; +} + +h2 { + font-size: 2em; +} + +h3 { + font-size: 1.5em; +} + +h4 { + font-size: 1.2em; +} + +h5 { + font-size: 1em; +} + +h6 { + font-size: 0.9em; +} + +blockquote { +<<<<<<< HEAD:page/bstyle.css + /* this bit for the text color */ + color: #3b444b; +======= + color: #d8d8d8; +>>>>>>> struct:page/style.css + margin: 0; + padding-left: 3em; + border-left: 0.5em #008fae solid; +} + +hr { + display: block; + height: 2px; + border: 0; + border-top: 1px solid #aaa; + border-bottom: 1px solid #eee; + margin: 1em 0; + padding: 0; +} + +pre, code, kbd, samp { + background-color: #000; + border-radius: 8px; + padding: 8px; + color: #00cc03; + font-family: Freemono, monospace, monospace; + _font-family: 'courier new', monospace; + font-size: 0.98em; +} + +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +b, strong { + font-weight: bold; +} + +dfn { + font-style: italic; +} + +ins { + background: #ff9; + color: #000; + text-decoration: none; +} + +mark { + background: #ff0; + color: #000; + font-style: italic; + font-weight: bold; +} + +sub, sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +ul, ol { + margin: 1em 0; + padding: 0 0 0 2em; + color: #858585; +} + +li p:last-child { + margin-bottom: 0; +} + +ul ul, ol ol { + margin: .3em 0; +} + +dl { + margin-bottom: 1em; +} + +dt { + font-weight: bold; + margin-bottom: .8em; +} + +dd { + margin: 0 0 .8em 2em; +} + +dd:last-child { + margin-bottom: 0; +} + +img { + border: 0; + -ms-interpolation-mode: bicubic; + vertical-align: middle; +} + +figure { + display: block; + text-align: center; + margin: 1em 0; +} + +figure img { + border: none; + margin: 0 auto; +} + +figcaption { + font-size: 0.8em; + font-style: italic; + margin: 0 0 .8em; +} + +table { + margin-bottom: 2em; + border-bottom: 1px solid #ddd; + border-right: 1px solid #ddd; + border-spacing: 0; + border-collapse: collapse; +} + +table th { + padding: .2em 1em; + background-color: #eee; + border-top: 1px solid #ddd; + border-left: 1px solid #ddd; +} + +table td { + padding: .2em 1em; + border-top: 1px solid #ddd; + border-left: 1px solid #ddd; + vertical-align: top; +} + +.author { + font-size: 1.2em; + text-align: center; +} + +@media only screen and (min-width: 480px) { + body { + font-size: 14px; + } +} +@media only screen and (min-width: 768px) { + body { + font-size: 16px; + } +} +@media print { + * { + background: transparent !important; + color: black !important; + filter: none !important; + -ms-filter: none !important; + } + + body { + font-size: 12pt; + max-width: 100%; + } + + a, a:visited { + text-decoration: underline; + } + + hr { + height: 1px; + border: 0; + border-bottom: 1px solid black; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { + content: ""; + } + + pre, blockquote { + border: 1px solid #999; + padding-right: 1em; + page-break-inside: avoid; + } + + tr, img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + @page :left { + margin: 15mm 20mm 15mm 10mm; +} + + @page :right { + margin: 15mm 10mm 15mm 20mm; +} + + p, h2, h3 { + orphans: 3; + widows: 3; + } + + h2, h3 { + page-break-after: avoid; + } +} diff --git a/post/style.css b/post/style.css new file mode 100644 index 0000000..d367c60 --- /dev/null +++ b/post/style.css @@ -0,0 +1,351 @@ +html { + font-size: 100%; + overflow-y: scroll; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} + +@font-face { + font-family: 'Fixedsys'; + src: url(../fonts/FSEX300.ttf); +} +@font-face { + font-family: 'Freemono'; + src: url(../fonts/FreeMono.otf); +} +body { +<<<<<<< HEAD:post/bstyle.css + /* regular tex color(for the front page it won't matter much since everything is blockquotes*/ + color: #3b444b; + background-color: #faebd7; +======= + color: #444; +>>>>>>> struct:post/style.css + font-family: Fixedsys; + font-size: 12px; + line-height: 1.7; + padding: 1em; + margin: auto; + max-width: 42em; + background-image: url("../img/backt.png"); + background-repeat: repeat; +} + +/* Link stuff */ +a { + color: #06e; + text-decoration: none; +} +/* visited link */ +a:visited { + color: #0047a6; +} +/* hovering link */ +a:hover { + color: #3284f1; +} +/* clicked on */ +a:active { + color: #e5effd; +} +/* only if a link was dragged but not went through or smthng */ +a:focus { + outline: thin dotted; +} + +*::-moz-selection { + background: rgba(255, 255, 0, 0.3); + color: #000; +} + +*::selection { + background: rgba(255, 255, 0, 0.3); + color: #000; +} + +a::-moz-selection { + background: rgba(255, 255, 0, 0.3); + color: #0645ad; +} + +a::selection { + background: rgba(255, 255, 0, 0.3); + color: #0645ad; +} + +p { + margin: 1em 0; + color: #969696; +} + +img { + max-width: 100%; +} + +h1, h2, h3, h4, h5, h6 { + color: #e1e1e1; + line-height: 125%; + margin-top: 2em; + font-weight: normal; +} + +h4, h5, h6 { + font-weight: bold; +} + +h1 { + font-family: "Fixedsys"; + font-size: 2.5em; +} + +h2 { + font-size: 2em; +} + +h3 { + font-size: 1.5em; +} + +h4 { + font-size: 1.2em; +} + +h5 { + font-size: 1em; +} + +h6 { + font-size: 0.9em; +} + +blockquote { +<<<<<<< HEAD:post/bstyle.css + /* this bit for the text color */ + color: #3b444b; +======= + color: #d8d8d8; +>>>>>>> struct:post/style.css + margin: 0; + padding-left: 3em; + border-left: 0.5em #008fae solid; +} + +hr { + display: block; + height: 2px; + border: 0; + border-top: 1px solid #aaa; + border-bottom: 1px solid #eee; + margin: 1em 0; + padding: 0; +} + +pre, code, kbd, samp { + background-color: #000; + border-radius: 8px; + padding: 8px; + color: #00cc03; + font-family: Freemono, monospace, monospace; + _font-family: 'courier new', monospace; + font-size: 0.98em; +} + +pre { + white-space: pre; + white-space: pre-wrap; + word-wrap: break-word; +} + +b, strong { + font-weight: bold; +} + +dfn { + font-style: italic; +} + +ins { + background: #ff9; + color: #000; + text-decoration: none; +} + +mark { + background: #ff0; + color: #000; + font-style: italic; + font-weight: bold; +} + +sub, sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +ul, ol { + margin: 1em 0; + padding: 0 0 0 2em; + color: #858585; +} + +li p:last-child { + margin-bottom: 0; +} + +ul ul, ol ol { + margin: .3em 0; +} + +dl { + margin-bottom: 1em; +} + +dt { + font-weight: bold; + margin-bottom: .8em; +} + +dd { + margin: 0 0 .8em 2em; +} + +dd:last-child { + margin-bottom: 0; +} + +img { + border: 0; + -ms-interpolation-mode: bicubic; + vertical-align: middle; +} + +figure { + display: block; + text-align: center; + margin: 1em 0; +} + +figure img { + border: none; + margin: 0 auto; +} + +figcaption { + font-size: 0.8em; + font-style: italic; + margin: 0 0 .8em; +} + +table { + margin-bottom: 2em; + border-bottom: 1px solid #ddd; + border-right: 1px solid #ddd; + border-spacing: 0; + border-collapse: collapse; +} + +table th { + padding: .2em 1em; + background-color: #eee; + border-top: 1px solid #ddd; + border-left: 1px solid #ddd; +} + +table td { + padding: .2em 1em; + border-top: 1px solid #ddd; + border-left: 1px solid #ddd; + vertical-align: top; +} + +.author { + font-size: 1.2em; + text-align: center; +} + +@media only screen and (min-width: 480px) { + body { + font-size: 14px; + } +} +@media only screen and (min-width: 768px) { + body { + font-size: 16px; + } +} +@media print { + * { + background: transparent !important; + color: black !important; + filter: none !important; + -ms-filter: none !important; + } + + body { + font-size: 12pt; + max-width: 100%; + } + + a, a:visited { + text-decoration: underline; + } + + hr { + height: 1px; + border: 0; + border-bottom: 1px solid black; + } + + a[href]:after { + content: " (" attr(href) ")"; + } + + abbr[title]:after { + content: " (" attr(title) ")"; + } + + .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { + content: ""; + } + + pre, blockquote { + border: 1px solid #999; + padding-right: 1em; + page-break-inside: avoid; + } + + tr, img { + page-break-inside: avoid; + } + + img { + max-width: 100% !important; + } + + @page :left { + margin: 15mm 20mm 15mm 10mm; +} + + @page :right { + margin: 15mm 10mm 15mm 20mm; +} + + p, h2, h3 { + orphans: 3; + widows: 3; + } + + h2, h3 { + page-break-after: avoid; + } +} diff --git a/post/train.html b/post/train.html new file mode 100644 index 0000000..03d921b --- /dev/null +++ b/post/train.html @@ -0,0 +1,19 @@ + + + + + + + + + + + +

Trains are Neat

+

My Thanksgiving holiday came to a close recently which means I had to go back to university but since I was stuck on the train literally all day I figured why not spin some stuff that's pretty neat.

+

California Public transportation sucks. However, the train for long distance travel seems to be ""a small bit"" of an exception. I only put it like that because when there are no delays it feels like you're getting somewhere and there's no real worry about much else, just sit back and relax while you wait to get to your destination. California's public transportation system though, basically rekts all of this nearly everytime. When a train is delayed it keeps getting delayed. This means once you get on, it's going to keep getting delayed at nearly every stop.

+

The ride is at least comfy neverless. Bonus points if you take the surfliner train which goes along the coast for the majority of the central coast.

+

I didn't take pictures of the ocean because sleep but there was still some neat stuff to see, mainly tons of shoreline with a great spots that I've marked with my phone's GPS.

+

Here are the coords in case you're curious: 34.6277141, -120.6281343.

+ + diff --git a/rebuild.sh b/rebuild.sh deleted file mode 100755 index 4a4f3ee..0000000 --- a/rebuild.sh +++ /dev/null @@ -1,17 +0,0 @@ -# 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 be61572..82206e4 100644 --- a/style.css +++ b/style.css @@ -7,11 +7,11 @@ html { @font-face { font-family: 'Fixedsys'; - src: url(./fonts/FSEX300.ttf); + src: url(../fonts/FSEX300.ttf); } @font-face { font-family: 'Freemono'; - src: url(./fonts/FreeMono.otf); + src: url(../fonts/FreeMono.otf); } /* sick nav bar */ .topnav { @@ -21,7 +21,7 @@ html { float: left; display: block; /* text color */ - color: #f2f2f2; + color: #3b444b; text-align: center; padding: 14px 16px; text-decoration: none; @@ -41,7 +41,7 @@ html { /* 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; + color: #3b444b; background-color: #faebd7; font-family: Fixedsys; font-size: 12px; @@ -96,7 +96,7 @@ a::selection { p { margin: 1em 0; - color: #F1C6A7; + color: #3b444b; } img { diff --git a/markdown/post/yes b/templates/banner.md similarity index 100% rename from markdown/post/yes rename to templates/banner.md