jekyll-theme-2038 0.1.1 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d6e36b3e2e83f7bcb181e2e52955ad5aebe66e0568ca738ca952bda8132b3e54
4
- data.tar.gz: f0482d83998fb2bba216cac15537d87ff6020165f44bb3bf700e5868c512d92a
3
+ metadata.gz: 24e62e05cf24f8bd8f50d340109f99c857cdc19542616a2886b28f4b6887cf00
4
+ data.tar.gz: e4b0340b5b8c0a0e64cacd9354a254a4dd858fd4268b129c8ffd49fda2ecabb8
5
5
  SHA512:
6
- metadata.gz: f9d48c00633cfcb36578b5d842cce9235326f57561a7a4b5d4db68a22fe5f9e0013b8000444577a44a9cad997fcedb8d472a75433c06788ba3c6d09283212b34
7
- data.tar.gz: ee73d3ef353165941cba7c1dc305418d8595cf4bc60a11b216fb0806069c9fb5f3d787d849e76a412e6cd6613c88de13cb56caf892a7802b2301c32dd7404983
6
+ metadata.gz: 5ffb49323bf442a17dd11f05426a330a463917e1062a1c1a9b2e7eb82a01ec31eae4f6249da2f14c25870785ad04f40ef4b132da6bf0735e9d0aadafe5cbb146
7
+ data.tar.gz: 10d097cd303531c848374d8c8a2d788b5dbb68549da04987b20992a820bf170814bcd1c5ace4ee2b14f3ca493533995ea52c7a541f37875d509bb061206038e5
data/README.md CHANGED
@@ -1,13 +1,17 @@
1
1
  <img src="assets/wordmark.svg" align="right" />
2
2
 
3
- # 2038
3
+ [My blog with 2038](https://mat-ling.fit)
4
4
 
5
- ![Version 0.1.0 with Gem](https://img.shields.io/badge/gem-0.1.0-519dd9.svg)
5
+ # 2038
6
6
 
7
- [TOC]
7
+ [![Ver 0.1.2 with Gem](https://img.shields.io/badge/gem-0.1.2-519dd9.svg)][gem]
8
8
 
9
- > Twenty years from now you will be more disappointed by the things that you didn't do than by the ones you did do. So, throw off the bowlines. Sail away from the safe harbour. Catch the trade winds in your sails. Explore. Dream. Discover.
10
- > 20 年后,比起已做之事,你将更因未做之事绝望。所以,抛掉缰绳,驶离避风港,乘信风远航吧。去探索,去梦想,去发现。
9
+ > Twenty years from now you will be more disappointed by the things that you
10
+ > didn't do than by the ones you did do. So, throw off the bowlines. Sail
11
+ > away from the safe harbour. Catch the trade winds in your sails. Explore.
12
+ > Dream. Discover.
13
+ > 20 年后,比起已做之事,你将更因未做之事绝望。
14
+ > 所以,抛掉缰绳,驶离避风港,乘信风远航吧。去探索,去梦想,去发现。
11
15
  >
12
16
  > —— Unknown 佚名
13
17
 
@@ -31,7 +35,7 @@
31
35
  Add this line to your Jekyll site's `Gemfile`:
32
36
 
33
37
  ```ruby
34
- gem "jekyll-theme2038"
38
+ gem 'jekyll-theme-2038'
35
39
  ```
36
40
 
37
41
  And add this line to your Jekyll site's `_config.yml`:
@@ -48,14 +52,27 @@ Or install it yourself as:
48
52
 
49
53
  $ gem install jekyll-theme-2038
50
54
 
51
- BUT WAIT! You have to put [translation file](https://github.com/0xis-cn/2038/blob/main/_data/theme-2038-i18n.yml) manually into `_data` directory of your site to correctly display information, for it cannot be included in the gem.
55
+ BUT WAIT! You have to put [translation file][i18n-pos] manually into `_data`
56
+ directory of your site to correctly display information, for it cannot be
57
+ included in the gem.
52
58
 
53
59
  ## Usage
54
60
 
55
-
61
+ (To be continued after I fixed most of bugs)
56
62
 
57
63
  ## Todo
58
64
 
59
65
  * Support of UnicodeMath or ASCIIMath
60
66
  * Right-to-left and vertical page
61
67
 
68
+ ## Contribution
69
+
70
+ * Submit an [issue][issue-pos] or [pull request][pr-pos]
71
+ * Contact me via [E-mail][mail-pos]
72
+
73
+ [gem]: https://rubygems.org/gems/jekyll-theme-2038
74
+ [i18n-pos]: https://github.com/0xis-cn/2038/blob/main/_data/theme-2038-i18n.yml
75
+ [issue-pos]: https://github.com/0xis-cn/2038/issues
76
+ [pr-pos]: https://github.com/0xis-cn/2038/pulls
77
+ [mail-pos]: mailto:mat-ling@139.com
78
+
@@ -8,7 +8,7 @@ $em-image: url(dot-dark.svg);
8
8
  $bgcolour: black;
9
9
  $base-colour: white;
10
10
  $card-colour: #1A1A1A;
11
- $indication-colour: #333;
11
+ $indication-colour: #2A2A2A;
12
12
  $normal-colour: #AAA;
13
13
  $levity-colour: #999;
14
14
  $heavy-colour: #E6E6DC;
@@ -1,7 +1,7 @@
1
1
  $bgcolour: #F6F5F0;
2
2
  $base-colour: black;
3
3
  $card-colour: white;
4
- $indication-colour: #D8D8D8;
4
+ $indication-colour: #E6E5E0;
5
5
  $normal-colour: #555;
6
6
  $levity-colour: #777;
7
7
  $heavy-colour: #1A1A1A;
@@ -32,10 +32,8 @@ $mobile-opacity: .7 !default;
32
32
  line-height: 2rem;
33
33
  font-size: 2rem;
34
34
  speak: none;
35
-
36
- &::marker {
37
- content: '';
38
- }
35
+ list-style: none;
36
+ z-index: 100;
39
37
  }
40
38
 
41
39
  a {
@@ -69,8 +67,13 @@ $mobile-opacity: .7 !default;
69
67
  }
70
68
 
71
69
  .ml-drawer {
72
- width: 50%;
73
- box-sizing: border-box
70
+ width: calc(50% - 490px);
71
+ }
72
+ }
73
+
74
+ @media screen and (min-width: 1600px) {
75
+ .ml-drawer {
76
+ width: 18%;
74
77
  }
75
78
  }
76
79
 
@@ -32,11 +32,13 @@ rt {
32
32
  speak: none
33
33
  }
34
34
 
35
- body, button, input, select, textarea, .temp-lang {
35
+ body, button, input, select, textarea, .temp-lang, h1, h2, h3, h4, h5, h6 {
36
+ letter-spacing: 0;
37
+
36
38
  &:lang(*-Hans) {
37
- font: 300 1em/1.8 PingFang SC, Lantinghei SC, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif;
39
+ font: 300 1em/1.5 -apple-system,"Helvetica Neue","Segoe UI",Helvetica,"Nimbus Sans L",Arial,"Liberation Sans","PingFang SC","Hiragino Sans GB","Noto Sans CJK SC","Source Han Sans SC","Source Han Sans CN","Microsoft YaHei","Wenquanyi Micro Hei","WenQuanYi Zen Hei","ST Heiti",SimHei,"WenQuanYi Zen Hei Sharp",sans-serif;
40
+ letter-spacing: 1px;
38
41
  }
39
-
40
42
  &:lang(cmn-Hans),
41
43
  &:lang(wuu-Hans),
42
44
  &:lang(czh-Hans),
@@ -51,19 +53,38 @@ body, button, input, select, textarea, .temp-lang {
51
53
  &:lang(hsn-Hans),
52
54
  &:lang(cjy-Hans),
53
55
  &:lang(lzh-Hans) {
54
- font: 300 1em/1.8 PingFang SC, Lantinghei SC, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif;
56
+ font: 300 1em/1.5 -apple-system,"Helvetica Neue","Segoe UI",Helvetica,"Nimbus Sans L",Arial,"Liberation Sans","PingFang SC","Hiragino Sans GB","Noto Sans CJK SC","Source Han Sans SC","Source Han Sans CN","Microsoft YaHei","Wenquanyi Micro Hei","WenQuanYi Zen Hei","ST Heiti",SimHei,"WenQuanYi Zen Hei Sharp",sans-serif;
57
+ letter-spacing: 1px;
58
+ }
59
+ &:lang(*-Hant) {
60
+ font: 300 1em/1.5 -apple-system,"Helvetica Neue","Segoe UI",Helvetica,"Nimbus Sans L",Arial,"Liberation Sans","PingFang TC","Hiragino Sans TC","Noto Sans CJK TC","Source Han Sans TC","Source Han Sans HK","Microsoft Jhenghei","Wenquanyi Micro Hei","WenQuanYi Zen Hei","ST Heiti",SimHei,"WenQuanYi Zen Hei Sharp",sans-serif;
61
+ letter-spacing: 1px;
62
+ }
63
+ &:lang(cmn-Hant),
64
+ &:lang(wuu-Hant),
65
+ &:lang(czh-Hant),
66
+ &:lang(hak-Hant),
67
+ &:lang(yue-Hant),
68
+ &:lang(nan-Hant),
69
+ &:lang(cpx-Hant),
70
+ &:lang(cdo-Hant),
71
+ &:lang(mnp-Hant),
72
+ &:lang(zco-Hant),
73
+ &:lang(gan-Hant),
74
+ &:lang(hsn-Hant),
75
+ &:lang(cjy-Hant),
76
+ &:lang(lzh-Hant) {
77
+ font: 300 1em/1.5 -apple-system,"Helvetica Neue","Segoe UI",Helvetica,"Nimbus Sans L",Arial,"Liberation Sans","PingFang TC","Hiragino Sans TC","Noto Sans CJK TC","Source Han Sans TC","Source Han Sans HK","Microsoft Jhenghei","Wenquanyi Micro Hei","WenQuanYi Zen Hei","ST Heiti",SimHei,"WenQuanYi Zen Hei Sharp",sans-serif;
78
+ letter-spacing: 1px;
55
79
  }
56
80
 
57
81
  &:lang(jp) {
58
- font: 300 1em/1.8;
82
+ font: 300 1em/1.5 -apple-system,"Helvetica Neue","Segoe UI",Helvetica,"Nimbus Sans L",Arial,"Liberation Sans","PingFang JP","Hiragino Sans JP","Noto Sans CJK JP","Source Han Sans JP","Source Han Sans JP","Microsoft YaHei","Wenquanyi Micro Hei","WenQuanYi Zen Hei","ST Heiti",SimHei,"WenQuanYi Zen Hei Sharp",sans-serif;
59
83
  }
60
84
  }
61
85
 
62
86
  .ml-article {
63
87
  min-height: 30%;
64
- position: relative;
65
- top: 0;
66
- left: 0;
67
88
  }
68
89
 
69
90
  .ml-title {
@@ -71,7 +92,7 @@ body, button, input, select, textarea, .temp-lang {
71
92
  }
72
93
 
73
94
  @media print {
74
- body {
95
+ .ml-article {
75
96
  font: 400 12pt / 1.7 'Noto Serif CJK SC', serif,
76
97
  "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
77
98
  background: white;
@@ -102,7 +123,15 @@ kbd {
102
123
  }
103
124
 
104
125
  p, table {
105
- margin: .9em 0;
126
+ margin: .75em 0;
127
+ }
128
+
129
+ .ml-article p {
130
+ text-indent: 34px;
131
+ }
132
+
133
+ .footnote p, .ml-article ul p, .ml-article ol p {
134
+ text-indent: 0;
106
135
  }
107
136
 
108
137
  summary {
@@ -169,7 +198,7 @@ a.ml-card-anchor, a.ml-block-anchor {
169
198
  }
170
199
 
171
200
  .ml-block-anchor {
172
- padding: 4px
201
+ padding: 4px;
173
202
  }
174
203
 
175
204
  .ml-page-list {
@@ -192,3 +221,29 @@ ul.ml-page-list {
192
221
  padding: 0;
193
222
  }
194
223
 
224
+ .ml-smaller.ml-front, h2, h3, h4 {
225
+ line-height: 1.5rem;
226
+ }
227
+
228
+ h1.ml-title {
229
+ font-size: 2em; // 二号
230
+ }
231
+
232
+ .ml-article h2, .ml-article h1 {
233
+ font-size: 1.5em; // 三号
234
+ margin-top: 1.5rem;
235
+ }
236
+
237
+ .ml-article h3 {
238
+ font-size: 1.25em; // 四号
239
+ margin-top: 1.5rem;
240
+ }
241
+
242
+ .ml-article h4 {
243
+ font-size: 1.125em;
244
+ }
245
+
246
+ h1, h2, h3, h4, h5, h6 {
247
+ font-weight: 300;
248
+ }
249
+
@@ -1,6 +1,7 @@
1
1
  $header-height: 9em !default;
2
- $middle-width: 960px !default;
3
2
  $link-change-time: .3s !default;
3
+ $middle-width: 952px !default;
4
+ // TIPS: 若调整 $middle-width 请同步修改 drawer.scss 中 .ml-drawer 之宽度
4
5
 
5
6
  .ml-main {
6
7
  margin: 0 auto;
@@ -8,10 +9,6 @@ $link-change-time: .3s !default;
8
9
  max-width: $middle-width
9
10
  }
10
11
 
11
- .ml-drawer {
12
- padding-right: ($middle-width / 2) + 10px
13
- }
14
-
15
12
  .ml-card-list dt::before {
16
13
  content: '';
17
14
  display: inline-block;
@@ -91,9 +88,6 @@ $link-change-time: .3s !default;
91
88
  .ml-main {
92
89
  max-width: 60%;
93
90
  }
94
- .ml-drawer {
95
- padding-right: -32%
96
- }
97
91
  .ml-card-anchor {
98
92
  width: 30rem;
99
93
  }
data/_sass/2038/typo.scss CHANGED
@@ -1,3 +1,5 @@
1
+ /* This file is truncated. */
2
+
1
3
  /*
2
4
 
3
5
  TYPO.CSS - a better way to manage the typography of your Chinese-lang-base site.
@@ -259,12 +261,12 @@ strong, b {
259
261
  margin-bottom: 1.2em
260
262
  }
261
263
 
262
- h1, h2, h3, h4, h5, h6 {
264
+ /* h1, h2, h3, h4, h5, h6 {
263
265
  font-family: PingFang SC, Verdana, Helvetica Neue, Microsoft Yahei, Hiragino Sans GB, Microsoft Sans Serif, WenQuanYi Micro Hei, sans-serif;
264
266
  font-weight: 300;
265
267
  // color: #000;
266
268
  line-height: 1.35;
267
- }
269
+ } */
268
270
 
269
271
 
270
272
  /* 标题应该更贴紧内容,并与其他块区分,margin 值要相应做优化 */
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll-theme-2038
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - 物灵
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-01 00:00:00.000000000 Z
11
+ date: 2021-10-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll