Implemented "slim" template from https://github.com/syaning/slim

This commit is contained in:
Jesper Hess 2016-03-31 21:25:03 +02:00
parent 1ce51e664c
commit 063d5f9880
7 changed files with 207 additions and 338 deletions

View file

@ -1,20 +1,12 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
{% include head.html %} {% include head.html %}
<body> <body>
<header class="site-header">
{% include header.html %} <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
</header>
<div class="page-content"> <div class="page-content">
<div class="wrapper">
{{ content }} {{ content }}
</div> </div>
</div>
{% include footer.html %}
</body> </body>
</html> </html>

View file

@ -1,14 +1,11 @@
--- ---
layout: default layout: default
--- ---
<div class="post"> <article class="post">
<header class="post-header"> <header class="post-header">
<h1 class="post-title">{{ page.title }}</h1> <h1 class="post-title">{{ page.title }}</h1>
</header> </header>
<div class="post-content">
<article class="post-content">
{{ content }} {{ content }}
</article>
</div> </div>
</article>

View file

@ -1,15 +1,13 @@
--- ---
layout: default layout: default
--- ---
<div class="post"> <article class="post" itemscope itemtype="http://schema.org/BlogPosting">
<header class="post-header"> <header class="post-header">
<h1 class="post-title">{{ page.title }}</h1> <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
<p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p> <p class="post-meta"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%b %d, %Y" }}</time>{% if page.author %} • <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">{{ page.author }}</span></span>{% endif %}</p>
</header> </header>
<div class="post-content" itemprop="articleBody">
<article class="post-content">
{{ content }} {{ content }}
</article>
</div> </div>
{% include dq.html %}
</article>

View file

@ -14,13 +14,9 @@ dl, dd, ol, ul, figure {
* Basic styling * Basic styling
*/ */
body { body {
font-family: $base-font-family; font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
font-size: $base-font-size;
line-height: $base-line-height;
font-weight: 300;
color: $text-color; color: $text-color;
background-color: $background-color; background-color: $background-color;
-webkit-text-size-adjust: 100%;
} }
@ -30,7 +26,7 @@ body {
*/ */
h1, h2, h3, h4, h5, h6, h1, h2, h3, h4, h5, h6,
p, blockquote, pre, p, blockquote, pre,
ul, ol, dl, figure, ul, ol, dl, figure, table,
%vertical-rhythm { %vertical-rhythm {
margin-bottom: $spacing-unit / 2; margin-bottom: $spacing-unit / 2;
} }
@ -80,7 +76,7 @@ li {
* Headings * Headings
*/ */
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
font-weight: 300; font-weight: $base-font-weight;
} }
@ -92,12 +88,7 @@ a {
color: $brand-color; color: $brand-color;
text-decoration: none; text-decoration: none;
&:visited {
color: darken($brand-color, 15%);
}
&:hover { &:hover {
color: $text-color;
text-decoration: underline; text-decoration: underline;
} }
} }
@ -109,11 +100,10 @@ a {
*/ */
blockquote { blockquote {
color: $grey-color; color: $grey-color;
border-left: 4px solid $grey-color-light;
padding-left: $spacing-unit / 2; padding-left: $spacing-unit / 2;
font-size: 18px; border-left: 2px solid $grey-color-light;
letter-spacing: -1px;
font-style: italic; font-style: italic;
font-size: $small-font-size;
> :last-child { > :last-child {
margin-bottom: 0; margin-bottom: 0;
@ -127,47 +117,66 @@ blockquote {
*/ */
pre, pre,
code { code {
font-size: 15px; background-color: #fcfcfc;
border: 1px solid $grey-color-light;
border-radius: 3px;
background-color: #eef;
} }
code { code {
padding: 1px 5px; padding: 1px 5px;
font-family: $code-font-family;
} }
pre { pre {
padding: 8px 12px; padding: 8px 12px;
overflow-x: scroll; overflow-x: auto;
border-left: 2px solid $grey-color-light;
> code { > code {
border: 0; border: 0;
padding-right: 0; padding-right: 0;
padding-left: 0; padding-left: 0;
tab-size: 4;
} }
} }
/** /**
* Wrapper * Table
*/ */
.wrapper { table {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2)); width: 100%;
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2)); max-width: 100%;
margin-right: auto; border-collapse: separate;
margin-left: auto; border-spacing: 0;
padding-right: $spacing-unit; table-layout: fixed;
padding-left: $spacing-unit;
@extend %clearfix;
@include media-query($on-laptop) {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(#{$content-width} - (#{$spacing-unit}));
padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
} }
th,
td {
padding: 0.5rem;
line-height: inherit;
}
th {
text-align: left;
vertical-align: bottom;
border-bottom: 2px solid $grey-color-light;
}
td {
vertical-align: top;
border-bottom: 1px solid $grey-color-light;
}
/**
* Horizontal rule
*/
hr {
width: 30%;
border: none;
border-top: 1px solid lighten($brand-color, 30%);;
margin: $spacing-unit auto;
} }
@ -176,29 +185,9 @@ pre {
* Clearfix * Clearfix
*/ */
%clearfix { %clearfix {
&:after { &:after {
content: ""; content: "";
display: table; display: table;
clear: both; clear: both;
} }
} }
/**
* Icons
*/
.icon {
> svg {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: middle;
path {
fill: $grey-color;
}
}
}

View file

@ -2,157 +2,20 @@
* Site header * Site header
*/ */
.site-header { .site-header {
border-top: 5px solid $grey-color-dark;
border-bottom: 1px solid $grey-color-light; border-bottom: 1px solid $grey-color-light;
min-height: 56px; text-align: center;
padding: 1rem 0;
// Positioning context for the mobile navigation icon
position: relative;
} }
.site-title { .site-title {
font-size: 32px; font-size: 1.5rem;
line-height: 56px; font-weight: 300;
letter-spacing: -1px; letter-spacing: -1px;
margin-bottom: 0; color: $grey-color-dark;
float: left;
&, &,
&:visited { &:hover {
color: $grey-color-dark; text-decoration: none;
}
}
.site-nav {
float: right;
line-height: 56px;
.menu-icon {
display: none;
}
.page-link {
color: $text-color;
line-height: $base-line-height;
// Gaps between nav items, but not on the first one
&:not(:first-child) {
margin-left: 20px;
}
}
@include media-query($on-palm) {
position: absolute;
top: 9px;
right: 30px;
background-color: $background-color;
border: 1px solid $grey-color-light;
border-radius: 5px;
text-align: right;
.menu-icon {
display: block;
float: right;
width: 36px;
height: 26px;
line-height: 0;
padding-top: 10px;
text-align: center;
> svg {
width: 18px;
height: 15px;
path {
fill: $grey-color-dark;
}
}
}
.trigger {
clear: both;
display: none;
}
&:hover .trigger {
display: block;
padding-bottom: 5px;
}
.page-link {
display: block;
padding: 5px 10px;
}
}
}
/**
* Site footer
*/
.site-footer {
border-top: 1px solid $grey-color-light;
padding: $spacing-unit 0;
}
.footer-heading {
font-size: 18px;
margin-bottom: $spacing-unit / 2;
}
.contact-list,
.social-media-list {
list-style: none;
margin-left: 0;
}
.footer-col-wrapper {
font-size: 15px;
color: $grey-color;
margin-left: -$spacing-unit / 2;
@extend %clearfix;
}
.footer-col {
float: left;
margin-bottom: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
}
.footer-col-1 {
width: -webkit-calc(35% - (#{$spacing-unit} / 2));
width: calc(35% - (#{$spacing-unit} / 2));
}
.footer-col-2 {
width: -webkit-calc(20% - (#{$spacing-unit} / 2));
width: calc(20% - (#{$spacing-unit} / 2));
}
.footer-col-3 {
width: -webkit-calc(45% - (#{$spacing-unit} / 2));
width: calc(45% - (#{$spacing-unit} / 2));
}
@include media-query($on-laptop) {
.footer-col-1,
.footer-col-2 {
width: -webkit-calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
}
.footer-col-3 {
width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
}
}
@include media-query($on-palm) {
.footer-col {
float: none;
width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
} }
} }
@ -162,30 +25,41 @@
* Page content * Page content
*/ */
.page-content { .page-content {
padding: $spacing-unit 0; position: relative;
max-width: 48rem;
padding: $spacing-unit ($spacing-unit * 0.75);
margin: 0 auto;
box-sizing: border-box;
} }
.page-heading {
font-size: 20px;
}
.post-list { /**
margin-left: 0; * Pages
list-style: none; */
.home {
> li { section + section {
margin-bottom: $spacing-unit; margin-top: $spacing-unit;
} }
} }
.post-meta { .smallcap {
font-size: $small-font-size; text-transform: lowercase;
color: $grey-color; font-variant: small-caps;
&::first-letter {
text-transform: uppercase;
}
} }
.post-link { .post-list > li {
margin-bottom: $spacing-unit / 4;
@include media-query($on-palm) {
span {
display: block; display: block;
font-size: 24px; font-size: $small-font-size;
}
}
} }
@ -198,43 +72,39 @@
} }
.post-title { .post-title {
font-size: 42px; font-size: 2rem;
letter-spacing: -1px; letter-spacing: -1px;
line-height: 1; line-height: 1;
@include media-query($on-laptop) {
font-size: 36px;
} }
.post-meta {
font-size: $small-font-size;
color: $grey-color;
} }
.post-content { .post-content {
margin-bottom: $spacing-unit; margin-bottom: $spacing-unit;
h2 { h1, h2, h3,
font-size: 32px; h4, h5, h6 {
margin-top: 2rem;
@include media-query($on-laptop) {
font-size: 28px;
} }
h1,
h2 {
font-size: 2rem;
} }
h3 { h3 {
font-size: 26px; font-size: 1.5rem;
@include media-query($on-laptop) {
font-size: 22px;
}
} }
h4 { h4 {
font-size: 20px; font-size: 1.25rem;
@include media-query($on-laptop) {
font-size: 18px;
}
}
} }
#test { h5,
color: green; h6 {
font-size: 1rem;
}
} }

View file

@ -1,67 +1,90 @@
/** /* Solarized Light
* Syntax highlighting styles
*/
.highlight {
background: #fff;
@extend %vertical-rhythm;
.c { color: #998; font-style: italic } // Comment For use with Jekyll and Pygments
.err { color: #a61717; background-color: #e3d2d2 } // Error
.k { font-weight: bold } // Keyword http://ethanschoonover.com/solarized
.o { font-weight: bold } // Operator
.cm { color: #998; font-style: italic } // Comment.Multiline SOLARIZED HEX ROLE
.cp { color: #999; font-weight: bold } // Comment.Preproc --------- -------- ------------------------------------------
.c1 { color: #998; font-style: italic } // Comment.Single base01 #586e75 body text / default code / primary content
.cs { color: #999; font-weight: bold; font-style: italic } // Comment.Special base1 #93a1a1 comments / secondary content
.gd { color: #000; background-color: #fdd } // Generic.Deleted base3 #fdf6e3 background
.gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific orange #cb4b16 constants
.ge { font-style: italic } // Generic.Emph red #dc322f regex, special keywords
.gr { color: #a00 } // Generic.Error blue #268bd2 reserved keywords
.gh { color: #999 } // Generic.Heading cyan #2aa198 strings, numbers
.gi { color: #000; background-color: #dfd } // Generic.Inserted green #859900 operators, other keywords
.gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific */
.go { color: #888 } // Generic.Output
.gp { color: #555 } // Generic.Prompt .highlight {
.gs { font-weight: bold } // Generic.Strong background-color: #fcfcfc;
.gu { color: #aaa } // Generic.Subheading color: #586e75;
.gt { color: #a00 } // Generic.Traceback .c { color: #93a1a1 } /* Comment */
.kc { font-weight: bold } // Keyword.Constant .err{ color: #586e75 } /* Error */
.kd { font-weight: bold } // Keyword.Declaration .g{ color: #586e75 } /* Generic */
.kp { font-weight: bold } // Keyword.Pseudo .k{ color: #859900 } /* Keyword */
.kr { font-weight: bold } // Keyword.Reserved .l{ color: #586e75 } /* Literal */
.kt { color: #458; font-weight: bold } // Keyword.Type .n{ color: #586e75 } /* Name */
.m { color: #099 } // Literal.Number .o{ color: #859900 } /* Operator */
.s { color: #d14 } // Literal.String .x{ color: #cb4b16 } /* Other */
.na { color: #008080 } // Name.Attribute .p{ color: #586e75 } /* Punctuation */
.nb { color: #0086B3 } // Name.Builtin .cm{ color: #93a1a1 } /* Comment.Multiline */
.nc { color: #458; font-weight: bold } // Name.Class .cp{ color: #859900 } /* Comment.Preproc */
.no { color: #008080 } // Name.Constant .c1{ color: #93a1a1 } /* Comment.Single */
.ni { color: #800080 } // Name.Entity .cs{ color: #859900 } /* Comment.Special */
.ne { color: #900; font-weight: bold } // Name.Exception .gd{ color: #2aa198 } /* Generic.Deleted */
.nf { color: #900; font-weight: bold } // Name.Function .ge{ color: #586e75; font-style: italic } /* Generic.Emph */
.nn { color: #555 } // Name.Namespace .gr{ color: #dc322f } /* Generic.Error */
.nt { color: #000080 } // Name.Tag .gh{ color: #cb4b16 } /* Generic.Heading */
.nv { color: #008080 } // Name.Variable .gi{ color: #859900 } /* Generic.Inserted */
.ow { font-weight: bold } // Operator.Word .go{ color: #586e75 } /* Generic.Output */
.w { color: #bbb } // Text.Whitespace .gp{ color: #586e75 } /* Generic.Prompt */
.mf { color: #099 } // Literal.Number.Float .gs{ color: #586e75; font-weight: bold } /* Generic.Strong */
.mh { color: #099 } // Literal.Number.Hex .gu{ color: #cb4b16 } /* Generic.Subheading */
.mi { color: #099 } // Literal.Number.Integer .gt{ color: #586e75 } /* Generic.Traceback */
.mo { color: #099 } // Literal.Number.Oct .kc{ color: #cb4b16 } /* Keyword.Constant */
.sb { color: #d14 } // Literal.String.Backtick .kd{ color: #268bd2 } /* Keyword.Declaration */
.sc { color: #d14 } // Literal.String.Char .kn{ color: #859900 } /* Keyword.Namespace */
.sd { color: #d14 } // Literal.String.Doc .kp{ color: #859900 } /* Keyword.Pseudo */
.s2 { color: #d14 } // Literal.String.Double .kr{ color: #268bd2 } /* Keyword.Reserved */
.se { color: #d14 } // Literal.String.Escape .kt{ color: #dc322f } /* Keyword.Type */
.sh { color: #d14 } // Literal.String.Heredoc .ld{ color: #586e75 } /* Literal.Date */
.si { color: #d14 } // Literal.String.Interpol .m{ color: #2aa198 } /* Literal.Number */
.sx { color: #d14 } // Literal.String.Other .s{ color: #2aa198 } /* Literal.String */
.sr { color: #009926 } // Literal.String.Regex .na{ color: #586e75 } /* Name.Attribute */
.s1 { color: #d14 } // Literal.String.Single .nb{ color: #B58900 } /* Name.Builtin */
.ss { color: #990073 } // Literal.String.Symbol .nc{ color: #268bd2 } /* Name.Class */
.bp { color: #999 } // Name.Builtin.Pseudo .no{ color: #cb4b16 } /* Name.Constant */
.vc { color: #008080 } // Name.Variable.Class .nd{ color: #268bd2 } /* Name.Decorator */
.vg { color: #008080 } // Name.Variable.Global .ni{ color: #cb4b16 } /* Name.Entity */
.vi { color: #008080 } // Name.Variable.Instance .ne{ color: #cb4b16 } /* Name.Exception */
.il { color: #099 } // Literal.Number.Integer.Long .nf{ color: #268bd2 } /* Name.Function */
.nl{ color: #586e75 } /* Name.Label */
.nn{ color: #586e75 } /* Name.Namespace */
.nx{ color: #586e75 } /* Name.Other */
.py{ color: #586e75 } /* Name.Property */
.nt{ color: #268bd2 } /* Name.Tag */
.nv{ color: #268bd2 } /* Name.Variable */
.ow{ color: #859900 } /* Operator.Word */
.w{ color: #586e75 } /* Text.Whitespace */
.mf{ color: #2aa198 } /* Literal.Number.Float */
.mh{ color: #2aa198 } /* Literal.Number.Hex */
.mi{ color: #2aa198 } /* Literal.Number.Integer */
.mo{ color: #2aa198 } /* Literal.Number.Oct */
.sb{ color: #93a1a1 } /* Literal.String.Backtick */
.sc{ color: #2aa198 } /* Literal.String.Char */
.sd{ color: #586e75 } /* Literal.String.Doc */
.s2{ color: #2aa198 } /* Literal.String.Double */
.se{ color: #cb4b16 } /* Literal.String.Escape */
.sh{ color: #586e75 } /* Literal.String.Heredoc */
.si{ color: #2aa198 } /* Literal.String.Interpol */
.sx{ color: #2aa198 } /* Literal.String.Other */
.sr{ color: #dc322f } /* Literal.String.Regex */
.s1{ color: #2aa198 } /* Literal.String.Single */
.ss{ color: #2aa198 } /* Literal.String.Symbol */
.bp{ color: #268bd2 } /* Name.Builtin.Pseudo */
.vc{ color: #268bd2 } /* Name.Variable.Class */
.vg{ color: #268bd2 } /* Name.Variable.Global */
.vi{ color: #268bd2 } /* Name.Variable.Instance */
.il{ color: #2aa198 } /* Literal.Number.Integer.Long */
} }

View file

@ -4,17 +4,18 @@
@charset "utf-8"; @charset "utf-8";
// Our variables // Our variables
$base-font-family: Verdana, Helvetica, Arial, sans-serif; $base-font-family: "Cutive Mono", "Courier New", "Helvetica Neue", Helvetica, FangSong, STFangsong, sans-serif;
$code-font-family: "Courier New", Consolas, monopace, FangSong, STFangsong;
$base-font-size: 16px; $base-font-size: 16px;
$small-font-size: $base-font-size * 0.875; $base-font-weight: 400;
$small-font-size: 0.875rem;
$base-line-height: 1.5; $base-line-height: 1.5;
$spacing-unit: 30px; $spacing-unit: 2rem;
$text-color: #111; $text-color: #111;
$background-color: #fdfdfd; $background-color: #fff;
$brand-color: #2a7ae2; $brand-color: #2a7ae2;
$grey-color: #828282; $grey-color: #828282;
@ -22,14 +23,12 @@ $grey-color-light: lighten($grey-color, 40%);
$grey-color-dark: darken($grey-color, 25%); $grey-color-dark: darken($grey-color, 25%);
// Width of the content area // Width of the content area
$content-width: 840px;
$on-palm: 600px; $on-palm: 600px;
$on-laptop: 800px; $on-laptop: 800px;
// Using media queries with like this: // Use media queries like this:
// @include media-query($on-palm) { // @include media-query($on-palm) {
// .wrapper { // .wrapper {
// padding-right: $spacing-unit / 2; // padding-right: $spacing-unit / 2;
@ -46,6 +45,7 @@ $on-laptop: 800px;
// Import partials from `sass_dir` (defaults to `_sass`) // Import partials from `sass_dir` (defaults to `_sass`)
@import @import
url(https://fonts.googleapis.com/css?family=Cutive+Mono),
"base", "base",
"layout", "layout",
"syntax-highlighting" "syntax-highlighting"