Skip to content

Commit 044cbba

Browse files
mytharchermytharcher
committed
Cleanup style.
1 parent 472d081 commit 044cbba

6 files changed

Lines changed: 129 additions & 104 deletions

File tree

‎_config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
markdown: kramdown
22
permalink: /:categories/:title.html
33
exclude: []
4+
5+
host: yncoder.github.io

_includes/duoshuo-comment-script.html renamed to _includes/duoshuo-comment.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
<div class="ds-thread" data-thread-key="{{ page.id }}" data-title="{{ page.title }}" data-url="{{ site.host }}{{ page.url }}"></div>
2+
13
<script type="text/javascript">
24
var duoshuoQuery = {short_name:"yncoder"};
35
(function() {

‎_layouts/interview.html‎

Lines changed: 22 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
2-
test: 123
32
---
4-
<!doctype html>
3+
<!DOCTYPE html>
54
<html class="no-js">
65
<head>
76
<meta charset="utf-8">
@@ -12,50 +11,10 @@
1211
<title>{{ page.title }} - Yncoder Interview</title>
1312
<meta name="renderer" content="webkit">
1413
<meta http-equiv="Cache-Control" content="no-siteapp" />
14+
<link rel="icon" href="/favicon.png" type="image/x-icon" />
15+
<link rel="shortcut icon" href="/favicon.png" type="image/x-icon" />
16+
<link rel="stylesheet" type="text/css" href="/assets/css/common.css" />
1517
<style type="text/css">
16-
* {
17-
-webkit-box-sizing: border-box;
18-
-moz-box-sizing: border-box;
19-
box-sizing: border-box;
20-
-webkit-text-size-adjust: none;
21-
}
22-
html,
23-
body {
24-
margin: 0;
25-
padding: 0;
26-
border: none;
27-
line-height: 1;
28-
min-height: 100%;
29-
height: 100%;
30-
}
31-
body {
32-
font-size: 16px;
33-
font-family: "Microsoft YaHei", "微软雅黑", Arial, Helvetica, sans-serif;
34-
}
35-
ul,
36-
ol,
37-
figure,
38-
form,
39-
dl,
40-
dt,
41-
dd {
42-
margin: 0;
43-
padding: 0;
44-
}
45-
img {
46-
border: 0;
47-
vertical-align: middle;
48-
}
49-
a {
50-
color: #0395d0;
51-
text-decoration: none;
52-
}
53-
a:hover {
54-
text-decoration: underline;
55-
}
56-
.row {
57-
position: relative;
58-
}
5918
.logo {
6019
font-size: 2em;
6120
line-height: 1.5em;
@@ -71,41 +30,37 @@
7130
width: 100%;
7231
padding: 6.4em 80px 20px 320px;
7332
}
74-
.container:after {
75-
content: "";
76-
display: block;
77-
clear: both;
78-
}
79-
.it-title {
33+
h1 {
8034
background-color: #2196F3;
8135
color: #FFF;
8236
font-size: 3em;
37+
margin: 0;
8338
padding: 0.4em 80px 0.4em 320px;
8439
position: fixed;
8540
width: 100%;
8641
z-index: 4;
8742
}
88-
.side-bar {
43+
aside {
8944
width: 240px;
9045
position: fixed;
9146
min-height: 100%;
9247
padding: 0 20px 20px 20px;
9348
background-color: rgba(100, 181, 246, 0.5);
9449
z-index: 5;
9550
}
96-
.side-bar > .guest {
51+
aside > .guest {
9752
margin-top: 20px;
9853
}
99-
.side-bar > .guest > img{
54+
aside > .guest > img{
10055
width: 100px;
10156
border-radius: 4px;
10257
float: left;
10358
margin-right: 10px;
10459
}
105-
.side-bar > .guest > h2{
60+
aside > .guest > h2{
10661
margin-top: 10px;
10762
}
108-
.side-bar > .guest > p{
63+
aside > .guest > p{
10964
font-size: 13px;
11065
line-height: 1.5em;
11166
color: #666;
@@ -123,40 +78,7 @@
12378
color: #999;
12479
}
12580
#content{line-height: 2em; font-size: 14px;letter-spacing:0.1em;}
126-
#content>h1:first-child{margin:0;}
127-
#content h1,
128-
#content h2,
129-
#content h3,
130-
#content h4,
131-
#content h5,
132-
#content h6,
133-
#content p{margin:.8em 0;}
134-
#content h1{font-size: 2.2em; line-height: 1.2em;}
135-
#content h2{font-size: 2em; line-height: 1.2em;}
136-
#content h3{font-size: 1.8em; line-height: 1.2em;}
137-
#content h4{font-size: 1.6em; line-height: 1.2em;}
138-
#content h5{font-size: 1.4em; line-height: 1.2em;}
139-
#content h6{font-size: 1.2em; line-height: 1.2em;}
140-
#content figure{margin: 1em 0;}
141-
#content p img,
142-
#content figure img{max-width: 100%;}
143-
#content figure.half img{max-width: 50%;}
144-
#content figure.half img.margin{max-width: 46%; margin: 2%; box-shadow: 0 5px 15px rgba(0,0,0,.5);}
145-
#content ul,
146-
#content ol{padding-left:2em;}
147-
#content dl{margin:.5em .8em;}
148-
#content dl dd{margin-left:2em;}
149-
#content dl dd>ul,
150-
#content dl dd>ol{padding-left:1em;}
151-
#content pre{width:100%; overflow-x:auto; line-height:1.2em; border-radius: 4px; background:#333;}
152-
#content code{border-radius: 4px; font:normal 85%/1.2em "Inconsolata", "Monaco", "Consolas", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;}
153-
#content :not(pre)>code{margin:auto 1px; padding:1px 2px; border: 1px solid #d7d7d7; background: #eee;}
154-
#content table{border-collapse:collapse;}
155-
#content th,#content td{padding:0 10px; border:1px solid #ccc; font-size:85%;}
156-
#content th{background:#eee; text-align:left;}
157-
#content td{background:#fff;}
158-
#content table a{margin:0;}
159-
#content blockquote{line-height:1.6em; margin:1em 0 1em 1.5em; border-left:2px solid #eee; padding-left:1em; font-size:90%;}
81+
16082
@media screen and (max-width: 1023px) {
16183
.container {
16284
position: relative;
@@ -166,23 +88,21 @@
16688
#content {
16789
font-size: 17px;
16890
}
169-
.it-title {
91+
h1 {
17092
font-size: 3em;
17193
padding-left: 20px;
17294
padding-right: 20px;
17395
position: relative;
17496
}
175-
.side-bar{
97+
aside{
17698
display: none
17799
}
178100
}
179101
</style>
180102
</head>
181103
<body>
182-
<div class="it-title">
183-
Freelancer 与 Remoting
184-
</div>
185-
<div class="side-bar">
104+
<h1>{{ page.title }}</h1>
105+
<aside>
186106
<div class="logo">Interview</div>
187107
{% for person in page.interviewee %}
188108
<div class="guest">
@@ -191,12 +111,13 @@ <h2>{{ person.name }}</h2>
191111
<p>{{ person.description }}</p>
192112
</div>
193113
{% endfor %}
114+
</aside>
115+
<div id="content" class="container">
116+
<article>
117+
{{ content }}
118+
</article>
119+
{% include duoshuo-comment.html %}
194120
</div>
195-
<div id="content" class="container">{{ content }}</div>
196-
197-
<div class="ds-thread" data-thread-key="201501-I" data-title="freelancer-and-remoting" data-url="http://yncoder.github.io/event/2015-freelancer-and-remoting/"></div>
198-
199-
{% include duoshuo-comment-script %}
200121

201122
</body>
202123
</html>

‎_layouts/post.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="UTF-8" />
5+
<title>{% if page.title %}{{ page.title }} - {% endif %}{{ site.name }}</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
7+
<link rel="stylesheet" href="http://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.css" />
8+
</head>
9+
<body>
10+
{{content}}
11+
</body>
12+
</html>

‎_posts/2015-02-07-freelancer-and-remoting.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
category: interview
33
layout: interview
4-
title: Freelancer and Remoting
4+
title: 自由职业者与远程工作那些事
55
status: done
66
interviewee:
77
- name: 严俊羿
@@ -16,8 +16,6 @@ interviewee:
1616

1717
我是重度拖延症患者,请见谅.
1818

19-
# 昆明开发者访谈 - 自由职业者与远程工作那些事
20-
2119
* **时间**：2015年2月7日（周六）下午2点
2220
* **地点**：北辰财富中心CD商务公寓16楼(<a href="http://j.map.baidu.com/n4cwm" target="blank">查看地图</a>)
2321

‎assets/css/common.css‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
*{
2+
-webkit-box-sizing: border-box;
3+
-moz-box-sizing: border-box;
4+
box-sizing: border-box;
5+
6+
-webkit-text-size-adjust: none;
7+
}
8+
9+
html,body{
10+
margin: 0;
11+
padding: 0;
12+
border: none;
13+
line-height: 1;
14+
min-height:100%;
15+
height: 100%;
16+
}
17+
body{
18+
color: #555;
19+
font-size: 14px;
20+
font-family: "Microsoft YaHei","微软雅黑",Arial,Helvetica,sans-serif;
21+
}
22+
23+
ul,ol,figure,form,dl,dt,dd{
24+
margin: 0;
25+
padding: 0;
26+
}
27+
img{
28+
border: 0;
29+
vertical-align: middle;
30+
}
31+
32+
a{
33+
color: #0395d0;
34+
text-decoration: none;
35+
}
36+
a:hover{
37+
text-decoration: underline;
38+
}
39+
40+
.row{
41+
position: relative;
42+
}
43+
.container{
44+
position: relative;
45+
width: 80%;
46+
max-width: 1280px;
47+
margin: auto;
48+
}
49+
.container:after{
50+
content: "";
51+
display: block;
52+
clear: both;
53+
}
54+
55+
56+
57+
article>h1:first-child{margin:0;}
58+
article h1,
59+
article h2,
60+
article h3,
61+
article h4,
62+
article h5,
63+
article h6,
64+
article p{margin:.8em 0;}
65+
article h1{font-size: 2.2em; line-height: 1.2em;}
66+
article h2{font-size: 2em; line-height: 1.2em;}
67+
article h3{font-size: 1.8em; line-height: 1.2em;}
68+
article h4{font-size: 1.6em; line-height: 1.2em;}
69+
article h5{font-size: 1.4em; line-height: 1.2em;}
70+
article h6{font-size: 1.2em; line-height: 1.2em;}
71+
article figure{margin: 1em 0;}
72+
article p img,
73+
article figure img{max-width: 100%;}
74+
article figure.half img{max-width: 50%;}
75+
article figure.half img.margin{max-width: 46%; margin: 2%; box-shadow: 0 5px 15px rgba(0,0,0,.5);}
76+
article ul,
77+
article ol{padding-left:2em;}
78+
article dl{margin:.5em .8em;}
79+
article dl dd{margin-left:2em;}
80+
article dl dd>ul,
81+
article dl dd>ol{padding-left:1em;}
82+
article pre{width:100%; overflow-x:auto; line-height:1.2em; border-radius: 4px; background:#333;}
83+
article code{border-radius: 4px; font:normal 85%/1.2em "Inconsolata", "Monaco", "Consolas", "Andale Mono", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace;}
84+
article :not(pre)>code{margin:auto 1px; padding:1px 2px; border: 1px solid #d7d7d7; background: #eee;}
85+
article table{border-collapse:collapse;}
86+
article th,article td{padding:0 10px; border:1px solid #ccc; font-size:85%;}
87+
article th{background:#eee; text-align:left;}
88+
article td{background:#fff;}
89+
article table a{margin:0;}
90+
article blockquote{line-height:1.6em; margin:1em 0 1em 1.5em; border-left:2px solid #eee; padding-left:1em; font-size:90%;}

0 commit comments

Comments
 (0)