Permalink
Browse files

Use Inconsolata as main font & Update footer.

  • Loading branch information...
Kay Miller
Kay Miller committed Apr 4, 2017
1 parent 641b5b9 commit 6d08203aefdb36e7f172d1a15dc47b5df89cde96
Showing with 530 additions and 17 deletions.
  1. +20 −14 _includes/footer.html
  2. +1 −1 _includes/head.html
  3. +204 −0 _sass/_base.scss
  4. +236 −0 _sass/_layout.scss
  5. +67 −0 _sass/_syntax-highlighting.scss
  6. +2 −2 _sass/helpers/_mixins.scss
@@ -1,17 +1,23 @@
<footer class="c-page__footer">
</ hr>
<p><script type='text/javascript'>
fortune = new Array(7);
fortune[0] = 'I good vegetable ah...';
fortune[1] = 'EL PSY CONGROO';
fortune[2] = 'Pen Pineapple Apple Pen ~';
fortune[3] = 'なんでそんなに慣れてんだよっ!';
fortune[4] = 'あたしが、先だった……先だったんだ……';
fortune[5] = '+1s +1s +1s +1s +1s +1s +1s +1s';
fortune[6] = 'どうしてこうなるんだろう…';
index = Math.floor(Math.random() * fortune.length);
document.write(fortune[index]);
</script><noscript>どうしてこうなるんだろう…</noscript><p></ hr></ br>
<p>&copy; {{ site.author }} {{ 'now' | date: '%Y' }} | Powered by Jekyll | Using theme:Butane </p></ br>
<p>Follow: {% if site.twitter_username %}<a href="https://twitter.com/{{ site.twitter_username }}">Twitter</a><span class="u-separate"></span>{% endif %}{% if site.github_username %}<a href="https://github.com/{{ site.github_username }}">Github</a>{% endif %}<span class="u-separate"></span> Subscribe: <a href="{{ "/feed.xml" | prepend: site.baseurl }}">RSS</a></p>
<p>
<script type='text/javascript'>
fortune = new Array(9);
fortune[0] = 'You Door All Dalao Except Me I good vegetable ah...';
fortune[1] = 'すべてはシュタインズ・ゲートの選択である!';
fortune[2] = 'Pen Pineapple Apple Pen ~';
fortune[3] = 'なんでそんなに慣れてんだよっ!';
fortune[4] = 'あたしが、先だった……先だったんだ……';
fortune[5] = '+1s +1s +1s +1s +1s +1s +1s +1s';
fortune[6] = 'どうしてこうなるんだろう…';
fortune[7] = '你也配姓趙?你怎麼會姓趙!——你那裡配姓趙!';
fortune[8] = '你才是法師!你全家都是法師!';
index = Math.floor(Math.random() * fortune.length);
document.write(fortune[index]);
</script>
<noscript>どうしてこうなるんだろう…</noscript>
</p>
</ hr></ br>
<p>&copy; {{ site.author }} {{ 'now' | date: '%Y' }} | Powered by Jekyll | Using theme:Biu </p></ br>
<p>Follow me on: {% if site.twitter_username %}<a href="https://twitter.com/{{ site.twitter_username }}">Twitter</a>{% endif %}{% if site.twitter_username %}{% if site.github_username %} & {% endif %}{% endif %}{% if site.github_username %}<a href="https://github.com/{{ site.github_username }}">Github</a>{% endif %}<span class="u-separate"></span> Subscribe: <a href="{{ "/feed.xml" | prepend: site.baseurl }}">RSS</a></p>
</footer>
@@ -6,7 +6,7 @@
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.title }}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<link href='https://fonts.googleapis.com/css?family=Roboto+Mono|Roboto:300,400,900,400italic' rel='stylesheet' type='text/css'>
<link href="//fonts.googleapis.com/css?family=Inconsolata:400,700&amp;subset=latin-ext,vietnamese"rel="stylesheet">
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
@@ -0,0 +1,204 @@
/**
* Reset some basic elements
*/
body, h1, h2, h3, h4, h5, h6,
p, blockquote, pre, hr,
dl, dd, ol, ul, figure {
margin: 0;
padding: 0;
}
/**
* Basic styling
*/
body {
font-family: $base-font-family;
font-size: $base-font-size;
line-height: $base-line-height;
font-weight: 300;
color: $text-color;
background-color: $background-color;
-webkit-text-size-adjust: 100%;
}
/**
* Set `margin-bottom` to maintain vertical rhythm
*/
h1, h2, h3, h4, h5, h6,
p, blockquote, pre,
ul, ol, dl, figure,
%vertical-rhythm {
margin-bottom: $spacing-unit / 2;
}
/**
* Images
*/
img {
max-width: 100%;
vertical-align: middle;
}
/**
* Figures
*/
figure > img {
display: block;
}
figcaption {
font-size: $small-font-size;
}
/**
* Lists
*/
ul, ol {
margin-left: $spacing-unit;
}
li {
> ul,
> ol {
margin-bottom: 0;
}
}
/**
* Headings
*/
h1, h2, h3, h4, h5, h6 {
font-weight: 300;
}
/**
* Links
*/
a {
color: $brand-color;
text-decoration: none;
&:visited {
color: darken($brand-color, 15%);
}
&:hover {
color: $text-color;
text-decoration: underline;
}
}
/**
* Blockquotes
*/
blockquote {
color: $grey-color;
border-left: 4px solid $grey-color-light;
padding-left: $spacing-unit / 2;
font-size: 18px;
letter-spacing: -1px;
font-style: italic;
> :last-child {
margin-bottom: 0;
}
}
/**
* Code formatting
*/
pre,
code {
font-size: 15px;
border: 1px solid $grey-color-light;
border-radius: 3px;
background-color: #eef;
}
code {
padding: 1px 5px;
}
pre {
padding: 8px 12px;
overflow-x: scroll;
> code {
border: 0;
padding-right: 0;
padding-left: 0;
}
}
/**
* Wrapper
*/
.wrapper {
max-width: -webkit-calc(800px - (#{$spacing-unit} * 2));
max-width: calc(800px - (#{$spacing-unit} * 2));
margin-right: auto;
margin-left: auto;
padding-right: $spacing-unit;
padding-left: $spacing-unit;
@extend %clearfix;
@include media-query($on-laptop) {
max-width: -webkit-calc(800px - (#{$spacing-unit}));
max-width: calc(800px - (#{$spacing-unit}));
padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
}
}
/**
* Clearfix
*/
%clearfix {
&:after {
content: "";
display: table;
clear: both;
}
}
/**
* Icons
*/
.icon {
> svg {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: middle;
path {
fill: $grey-color;
}
}
}
Oops, something went wrong.

0 comments on commit 6d08203

Please sign in to comment.