Skip to content

Commit

Permalink
fix: fix some style errors
Browse files Browse the repository at this point in the history
  • Loading branch information
kitian616 committed Oct 23, 2017
1 parent e4c2f4e commit e651c5e
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 35 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

TeXt is a succinct theme for blogging.

TeXt 是针对博客的一款简洁的主题,它虽然简洁但并不简单该主题模仿了 iOS 11 的风格,有大而突出的标题和圆润的按钮和卡片。
TeXt 是针对博客的一款简洁的主题,它虽然简洁但并不简单该主题模仿了 iOS 11 的风格,有大而突出的标题和圆润的按钮和卡片。

## Features

Expand Down
2 changes: 1 addition & 1 deletion _includes/logo/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion _layouts/all.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1 class="js-page-heading">All Posts</h1>
{% if currentdate != date %}
{% unless forloop.first %}</ul></section>{% endunless %}
<section id="{{ post.date | date: "%Y" }}">
<h2 id="year-{{ post.date | date: "%Y" }}">{{ currentdate }}</h2>
<h2 class="year-title" id="year-{{ post.date | date: "%Y" }}">{{ currentdate }}</h2>
<ul class="year-list">
{% assign date = currentdate %}
{% endif %}
Expand Down
4 changes: 3 additions & 1 deletion _posts/2015-12-12-images-with-shadow.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@ picture_frame: shadow

![example image](https://wx3.sinaimg.cn/large/73bd9e13ly1fjlekzmmdjj20sg0sgqko.jpg "An exemplary image")

smile, smile, smile. :smile:
smile, smile, smile. :smile:

微笑, 微笑, 微笑. :smile:
2 changes: 2 additions & 0 deletions _posts/2016-03-03-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ Ut erat nisl, dignissim et iaculis ac, adipiscing non ipsum. `/r/n` Vivamus orna

<!--more-->

(() => console.log('hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world!'))();

Morbi dictum magna vitae mi malesuada laoreet. Proin tempus laoreet leo in lobortis. In sit amet ipsum vel massa fringilla volutpat. Aenean dictum odio in ligula egestas iaculis. Maecenas ut massa quis velit consectetur faucibus in in lectus. Praesent ac mauris nec tortor suscipit aliquam eu nec justo. Nulla facilisi. Curabitur sit amet ligula ante.
2 changes: 1 addition & 1 deletion _posts/2017-01-03-article-with-lots-tags.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: post
key: 20170103
tags: boundary test test1 tes2 test3 test4 test5 test6 tes7 test8 tes9
tags: boundary test test0 test1 test2 test3 test4 test5 test6 test7 test8 test9 testa testb testc
---

Article With Lots Tags.
7 changes: 0 additions & 7 deletions _sass/base/_text.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* Headings
*/

body {
font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family;
color: $text-color;
Expand Down Expand Up @@ -41,9 +37,6 @@ h6 {
color: $text-color-l;
}

/**
* Code formatting
*/
pre,
code {
font-family: $code-font-family;
Expand Down
5 changes: 4 additions & 1 deletion _sass/blog/_layout.default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
animation: fade-in-down .8s;
}
.m-page-content {
padding: $content-gap * 2 0;
padding: $content-gap * 3 0 $content-gap * 2;
@include media-query($on-laptop) {
padding: $content-gap * 2 0;
}
@include media-query($on-palm) {
padding: $content-gap 0;
}
Expand Down
11 changes: 10 additions & 1 deletion _sass/blog/_page.all.scss
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
.m-all {
& > div > section {
margin: $content-gap * 3 0;
& > section {
&:not(:last-child) {
padding: 0 0 $base-font-size * .4 0;
}
}
.year-title {
font-size: $base-font-size * 1.6;
}
.year-list {
& > li {
list-style-type: none;
margin: $base-font-size * .4 0;
}
}
.post-date {
font-family: $code-font-family;
display: inline-block;
font-size: $small-font-size;
color: $text-color-l;
width: 4em;
padding: 0 $base-font-size 0 0;
}
}
.post-link {
Expand Down
2 changes: 1 addition & 1 deletion _sass/colors/_colors.default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $background-color: #fff;
// text colors
$text-color-d: #111;
$text-color: #444;
$text-color-l: #777;
$text-color-l: #7b7b7b;
$text-background-color:#f2f2f2;

// border and shadow colors
Expand Down
31 changes: 15 additions & 16 deletions _sass/components/_article.content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
margin: $content-gap * 2 0 $content-gap * .5 0;
}
h1, h2 {
padding: 0 0 .3em 0;
padding: 0 0 $base-font-size * .3 0;
border: 0 dashed $border-color;
border-bottom-width: 2px;
margin-bottom: $content-gap;
Expand Down Expand Up @@ -37,20 +37,18 @@
img:not(.emoji) {
max-width: 100%;
max-height: 600px;
vertical-align: bottom;
vertical-align: middle;
}
.emoji {
display: inline-block;
vertical-align: baseline;
width: 1.3em;
height: 1.3em;
margin: -.2em 0;
vertical-align: text-bottom;
width: $base-font-size * $article-line-height * .7;
height: $base-font-size * $article-line-height * .7;
}

code {
padding: .2em .4em;
border-radius: .4em;
margin: 0 .1em;
padding: $code-font-size * .2 $code-font-size * .5;
border-radius: $code-font-size * .4;
background-color: $text-background-color;
span {
padding: 0;
Expand All @@ -62,9 +60,7 @@
overflow: auto;
-webkit-overflow-scrolling: touch;
margin: 0;
border-radius: .4em;
border-top-left-radius: 0;
border-top-right-radius: 0;
border-radius: $code-font-size * .4;;
background-size: auto $code-font-size * $code-line-height * 2;
background-origin: content-box;
& > code {
Expand All @@ -82,16 +78,19 @@
content: attr(data-lang);
background-color: $text-background-color;
display: block;
padding: $content-gap / 4 $code-font-size 0 0;
border-top-left-radius: $code-font-size / 2;
border-top-right-radius: $code-font-size / 2;
padding: $code-font-size / 2 $code-font-size 0 0;
color: $decorate-color;
font-weight: $bold-font-weight;
font-size: $h3-font-size;
text-align: right;
text-transform: uppercase;
}
& > pre {
border-top-left-radius: 0;
border-top-right-radius: 0;
& > code {
padding: $code-font-size;
padding-top: 0;
}
}
Expand Down Expand Up @@ -127,7 +126,7 @@
border-collapse: collapse;
background-color: $text-background-color;
th, td {
padding: .5em;
padding: $base-font-size * .5;
}
tbody > tr:nth-child(odd) {
background-color: $decorate-color;
Expand All @@ -137,6 +136,6 @@
hr {
border: 0 dashed $border-color;
border-top-width: 2px;
margin: 1em 0;
margin: $base-font-size 0;
}
}
10 changes: 7 additions & 3 deletions _sass/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
}
.site-logo {
display: inline-block;
vertical-align: top;
width: $h3-font-size;
height: $h3-font-size;
vertical-align: middle;
width: $h3-font-size * 1.2;
height: $h3-font-size * 1.2;
& > svg {
width: 100%;
height: 100%;
}
}
.site-title {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion _sass/components/_toc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
line-height: $toc-line-height;
font-weight: $base-font-weight;
@include link-normal {
color: $text-color-l;
color: $text-color;
}
@include link-emphasize {
color: $main-color-1;
Expand Down

0 comments on commit e651c5e

Please sign in to comment.