Merge branch 'master' of gitlab.com:shockrahwow/shockrah-city

This commit is contained in:
Medium Fries 2018-12-17 12:43:57 -08:00
commit 00108f7966
7 changed files with 72 additions and 31 deletions

View File

@ -11,12 +11,19 @@
<body> <body>
<p><a href="./index.html"><img src="./img/banner.png" alt="Homepage" /></a></p> <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> <h1 id="welcome-to-my-comfy-town">Welcome to my Comfy Town</h1>
<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>
<p><strong><a href="./page/about.html">About Me</a></strong><br /> <p><strong><a href="./page/about.html">About Me</a></strong><br />
<strong><a href="https://gitlab.com/shockrahwow/shockrah-city">Site Source Code</a></strong></p> <strong><a href="https://gitlab.com/AlejandroS/shockrah-city">Site Source Code</a></strong></p>
</blockquote> </blockquote>
<hr /> <hr />
<h3 id="wot-in-tarnation-happend-to-the-style"><strong><a href="./post/style.html">Wot in tarnation happend to the style</a></strong></h3>
<blockquote>
<em>September 21, 2018</em><br />
waddu heck man it looks all different<br />
</blockquote>
<h3 id="bash-is-weird-sometimes"><strong><a href="./post/bash-1.html">Bash is weird sometimes</a></strong></h3> <h3 id="bash-is-weird-sometimes"><strong><a href="./post/bash-1.html">Bash is weird sometimes</a></strong></h3>
<blockquote> <blockquote>
<em>July 22, 2018</em><br /> <em>July 22, 2018</em><br />

View File

@ -2,11 +2,17 @@
# Welcome to my Comfy Town # Welcome to my Comfy Town
## Cool stuff about me
### **[Links to find me](./page/links.html)** ### **[Links to find me](./page/links.html)**
> **[About Me](./page/about.html)** \ > **[About Me](./page/about.html)** \
> **[Site Source Code](https://gitlab.com/shockrahwow/shockrah-city)** > **[Site Source Code](https://gitlab.com/AlejandroS/shockrah-city)**
------- ------
### **[Wot in tarnation happend to the style](./post/style.html)**
> _September 21, 2018_ \
> waddu heck man it looks all different \
### **[Bash is weird sometimes](./post/bash-1.html)** ### **[Bash is weird sometimes](./post/bash-1.html)**
> _July 22, 2018_ \ > _July 22, 2018_ \

View File

@ -8,6 +8,10 @@ I would highly prefer that you contact me via email so that I may get to the mes
* email: alejandros714@protonmail.com * 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 ### Social Medias Links
_List of places to contanct me or find me doing random things in general_ _List of places to contanct me or find me doing random things in general_

View File

@ -27,20 +27,20 @@ body {
/* Link stuff */ /* Link stuff */
a { a {
color: #06e; color: #FDD491;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #0047a6; color: #EFE3C9;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
color: #3284f1; color: #F2DDB1;
} }
/* clicked on */ /* clicked on */
a:active { a:active {
color: #e5effd; color: #EFE3C9;
} }
/* 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 +69,7 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #969696; color: #E3DCCD;
} }
img { img {
@ -116,7 +116,8 @@ blockquote {
color: #d8d8d8; color: #d8d8d8;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
border-left: 0.5em #008fae solid; /*border-left: 0.5em #008fae solid;*/
border-left: 0.5em #A40026 solid;
} }
hr { hr {
@ -131,9 +132,9 @@ hr {
pre, code, kbd, samp { pre, code, kbd, samp {
background-color: #000; background-color: #000;
border-radius: 8px; /*border-radius: 8px; */
padding: 8px; padding: 4px;
color: #00cc03; color: #EECA3E;
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;

View File

@ -27,7 +27,7 @@ body {
/* Link stuff */ /* Link stuff */
a { a {
color: #06e; color: ##FDD491;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
@ -69,7 +69,7 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #969696; color: #E3DCCD;
} }
img { img {
@ -116,7 +116,8 @@ blockquote {
color: #d8d8d8; color: #d8d8d8;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
border-left: 0.5em #008fae solid; /*border-left: 0.5em #008fae solid;*/
border-left: 0.5em #A40026 solid;
} }
hr { hr {
@ -131,9 +132,9 @@ hr {
pre, code, kbd, samp { pre, code, kbd, samp {
background-color: #000; background-color: #000;
border-radius: 8px; /*border-radius: 8px; */
padding: 8px; padding: 4px;
color: #00cc03; color: #EECA3E;
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;

20
post/style.html Normal file
View File

@ -0,0 +1,20 @@
<!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">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">code{white-space: pre;}</style>
<link rel="stylesheet" href="bstyle.css" type="text/css" />
</head>
<body>
<p><a href="../index.html"><img src="../img/banner.png" alt="Homepage" /></a></p>
<h1 id="wew-lad-new-colors">Wew lad new colors</h1>
<p>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, <em>now the site doesn'tlook like a homework essay</em>.</p>
<h2 id="but-why">But Why?</h2>
<p>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.</p>
<p>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 <em>bhop stuff as well</em>.</p>
<p>:^)</p>
</body>
</html>

View File

@ -27,20 +27,20 @@ body {
/* Link stuff */ /* Link stuff */
a { a {
color: #06e; color: #FDD491;
text-decoration: none; text-decoration: none;
} }
/* visited link */ /* visited link */
a:visited { a:visited {
color: #0047a6; color: #EFE3C9;
} }
/* hovering link */ /* hovering link */
a:hover { a:hover {
color: #3284f1; color: #F2DDB1;
} }
/* clicked on */ /* clicked on */
a:active { a:active {
color: #e5effd; color: #EFE3C9;
} }
/* 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,6 +69,7 @@ a::selection {
p { p {
margin: 1em 0; margin: 1em 0;
color: #F1C6A7;
} }
img { img {
@ -76,7 +77,7 @@ img {
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
color: #e1e1e1; color: #FDD491;
line-height: 125%; line-height: 125%;
margin-top: 2em; margin-top: 2em;
font-weight: normal; font-weight: normal;
@ -112,10 +113,11 @@ h6 {
} }
blockquote { blockquote {
color: #d8d8d8; color: #F1C6A7;
margin: 0; margin: 0;
padding-left: 3em; padding-left: 3em;
border-left: 0.5em #008fae solid; /*border-left: 0.5em #008fae solid;*/
border-left: 0.5em #C10042 solid;
} }
hr { hr {
@ -129,10 +131,10 @@ hr {
} }
pre, code, kbd, samp { pre, code, kbd, samp {
background-color: lightblue; background-color: #000;
border-radius: 8px; /*border-radius: 8px; */
padding: 8px; padding: 4px;
color: #000; color: #EECA3E;
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;
@ -183,7 +185,7 @@ sub {
ul, ol { ul, ol {
margin: 1em 0; margin: 1em 0;
padding: 0 0 0 2em; padding: 0 0 0 2em;
color: #a3a3a3; color: #858585;
} }
li p:last-child { li p:last-child {