fixed merge and renamed some files to sensible things

This commit is contained in:
Medium Fries 2018-12-22 21:57:23 -08:00
commit 2206c47802
4 changed files with 25 additions and 80 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -13,53 +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-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 {
@ -96,7 +69,7 @@ a::selection {
p {
margin: 1em 0;
color: #F1C6A7;
color: #969696;
}
img {
@ -104,7 +77,7 @@ img {
}
h1, h2, h3, h4, h5, h6 {
color: #493267;
color: #e1e1e1;
line-height: 125%;
margin-top: 2em;
font-weight: normal;
@ -140,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,9 +131,9 @@ hr {
pre, code, kbd, samp {
background-color: #000;
/*border-radius: 8px; */
padding: 4px;
color: #EECA3E;
border-radius: 8px;
padding: 8px;
color: #00cc03;
font-family: Freemono, monospace, monospace;
_font-family: 'courier new', monospace;
font-size: 0.98em;
@ -211,7 +184,7 @@ sub {
ul, ol {
margin: 1em 0;
padding: 0 0 0 2em;
color: #a3a3a3;
color: #858585;
}
li p:last-child {

View File

@ -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 {

View File

@ -144,7 +144,7 @@ blockquote {
color: #3b444b;
margin: 0;
padding-left: 3em;
border-left: 0.5em #493267 solid;
border-left: 0.5em #008fae solid;
}
hr {