Skip to content

Commit

Permalink
feat: 404 page & prefix mixins
Browse files Browse the repository at this point in the history
  • Loading branch information
kitian616 committed Oct 28, 2017
1 parent f11fc0b commit 0f8e479
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 9 deletions.
4 changes: 4 additions & 0 deletions 404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
layout: error-404
title: 404
---
9 changes: 9 additions & 0 deletions _layouts/error-404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
layout: blog-default
title: 404
---
<div class="m-error-404">
<div class="main">
<h1>404</h1>
</div>
</div>
4 changes: 2 additions & 2 deletions _sass/base/_animate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
@keyframes fade-in-down {
from {
opacity: 0;
transform: translateY(- $spacing-unit);
@include transform(translateY(-$spacing-unit));
}
to {
opacity: 1;
transform: translateY(0);
@include transform(translateY(0));
}
}
2 changes: 1 addition & 1 deletion _sass/blog/_layout.default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
min-height: 100%;
overflow:auto;
padding-bottom: $footer-height;
animation: fade-in-down .8s;
@include animation(fade-in-down .8s);
}
.m-page-content {
padding: $content-gap * 3 0 $content-gap * 2;
Expand Down
7 changes: 7 additions & 0 deletions _sass/blog/_page.error-404.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.m-error-404 {
@include flexbox;
@include align-items(center);
& > .main > h1 {
font-size: $base-font-size * 7;
}
}
14 changes: 14 additions & 0 deletions _sass/mixins/_prefix.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@mixin transition($value) {
-webkit-transition: $value;
transition: $value;
}

@mixin transform($value) {
-webkit-transform: $value;
transform: $value;
}

@mixin animation($value) {
-webkit-animation: $value;
animation: $value;
}
4 changes: 0 additions & 4 deletions _sass/mixins/_transition.scss

This file was deleted.

5 changes: 3 additions & 2 deletions statics/css/blog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"settings/font",
"settings/highlighting",

"mixins/prefix",
"mixins/media",
"mixins/link",
"mixins/flex",
"mixins/transition",

"base/base",
"base/text",
Expand Down Expand Up @@ -41,5 +41,6 @@
"blog/layout.post",

"blog/page.all",
"blog/page.index"
"blog/page.index",
"blog/page.error-404"
;

0 comments on commit 0f8e479

Please sign in to comment.