shockrah/blog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflicts from css branch

Browse Source
This commit is contained in:
Medium Fries 2018-12-17 12:53:17 -08:00
commit 1d876c9289
11 changed files with 183 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.html
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>

36
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' ./page/bstyle.css
fi
cp ./markdown/template.md ./markdown/post/$1
vim -c "Goyo" ./markdown/post/$1
} }
page() { page() {
@ -34,25 +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() {
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 para

0
index.md → markdown/index.md
View File

16
markdown/post/style.md Normal file
View File

@ -0,0 +1,16 @@
[![Homepage](../img/banner.png)](../index.html)
# Wew lad new colors
It's been about a minute since I've done anything with this site but I figured what better time to randomly post things then now.
Before this update I mostly used some neato fonts but most of it was some boring Times New Roman thing, _now the site doesn'tlook like a homework essay_.
## But Why?
I partly wanted to get my Gitlab page a bit more active but also because I didn't like the self-conflicting style from before.
Instead of having a bunch of fonts that don't really go together I opted for fonts that are actually somewhat look nice next to each other.
I'm still gonna mess with the styling but the changes likely won't be whole reworks like this one was, however, I'll probably use this as a place to post some _bhop stuff as well_.
:^)

17
markdown/post/train.md Normal file
View File

@ -0,0 +1,17 @@
[![HomePage](../img/banner.png)](../index.html)
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`.

1
markdown/post/yes Normal file
View File

@ -0,0 +1 @@
[![HomePage](../img/banner.png)](../index.html)

1
markdown/template.md Normal file
View File

@ -0,0 +1 @@
[![HomePage](../img/banner.png)](../index.html)

52
page/bstyle.css
View File

@ -13,34 +13,61 @@ 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-repeat: repeat;
} }
/* Link stuff */ /* Link stuff */
/* default link color */
a { a {
color: #FDD491; color: #7bb3ff;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #EFE3C9; color: #9e379f;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
color: #F2DDB1; color: #3284f1;
} }
/* clicked on */ /* clicked on */
a:active { a:active {
color: #EFE3C9; color: #e5effd;
} }
/* only if a link was dragged but not went through or smthng */ /* only if a link was dragged but not went through or smthng */
a:focus { a:focus {
@ -69,7 +96,7 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #E3DCCD; color: #F1C6A7;
} }
img { img {
@ -77,7 +104,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,11 +140,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;
border-left: 0.5em #A40026 solid;
} }
hr { hr {
@ -185,7 +211,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 {

52
post/bstyle.css
View File

@ -7,32 +7,59 @@ html {
@font-face { @font-face {
font-family: 'Fixedsys'; font-family: 'Fixedsys';
src: url(../fonts/FSEX300.ttf); src: url(./fonts/FSEX300.ttf);
} }
@font-face { @font-face {
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-repeat: repeat;
} }
/* Link stuff */ /* Link stuff */
/* default link color */
a { a {
color: ##FDD491; 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 +96,7 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #E3DCCD; color: #F1C6A7;
} }
img { img {
@ -77,7 +104,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,11 +140,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;
border-left: 0.5em #A40026 solid;
} }
hr { hr {
@ -185,7 +211,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 {

50
style.css
View File

@ -13,34 +13,61 @@ 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-repeat: repeat;
} }
/* Link stuff */ /* Link stuff */
/* default link color */
a { a {
color: #FDD491; color: #7bb3ff;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #EFE3C9; color: #9e379f;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
color: #F2DDB1; color: #3284f1;
} }
/* clicked on */ /* clicked on */
a:active { a:active {
color: #EFE3C9; color: #e5effd;
} }
/* only if a link was dragged but not went through or smthng */ /* only if a link was dragged but not went through or smthng */
a:focus { a:focus {
@ -77,7 +104,7 @@ img {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: #FDD491; color: #493267;
line-height: 125%; line-height: 125%;
margin-top: 2em; margin-top: 2em;
font-weight: normal; font-weight: normal;
@ -113,11 +140,10 @@ h6 {
} }
blockquote { blockquote {
color: #F1C6A7; color: #3b444b;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
/*border-left: 0.5em #008fae solid;*/ border-left: 0.5em #493267 solid;
border-left: 0.5em #C10042 solid;
} }
hr { hr {
@ -185,7 +211,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 {

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>