jekyll-theme-2038 0.1.0 → 0.1.4

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.
Files changed (13) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +29 -4
  3. data/_includes/page-link.html +1 -1
  4. data/_sass/2038/colour/dark.scss +9 -3
  5. data/_sass/2038/colour/light.scss +9 -6
  6. data/_sass/2038/colour-relative.scss +3 -11
  7. data/_sass/2038/drawer.scss +9 -6
  8. data/_sass/2038/miscellaneous.scss +31 -10
  9. data/_sass/2038/resize.scss +2 -8
  10. data/_sass/2038/typo.scss +4 -2
  11. data/assets/main.scss +3 -1
  12. metadata +3 -4
  13. data/README.old.md +0 -52
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8b5e740add7ad1f7050b14f5f1bcbff16ec4220d8199a5656e47c7fba7c931a0
4
- data.tar.gz: 17fb3368bcf71d32dc95bde3e84d36ffe17b2f636df4dec60619b8d98badab2c
3
+ metadata.gz: 310a4077e5daee00ada3e31f4d64d1dc3eee3d8684ee79c4b7b0c46845d43331
4
+ data.tar.gz: a5efe6634c6ee631bdf62e84422a8153a751ccdc31dd626f78479abdd8abf1c2
5
5
  SHA512:
6
- metadata.gz: 1ef85fcf5099fa8640f1e308cd6f90e8784f0f82af43502d26cac642f91e37fa70cdfc1561ac9bcbac4cee43ec0c40052253452be4cd91149f1ce94280712a06
7
- data.tar.gz: 39cddc5b487b3f43f98293c80ba8c6a4bbc41c3f9ed49eceab02dde653357342343310c242be1c0b6ba8cb1a8512a12fbc16beee3f34460557f3adb36cf3ca6e
6
+ metadata.gz: b10bb684460e00244f4064572645cf7963246705f3df9505555592ba59474e849b82680a9b3a92b46047aba51c4563ad0d432cc15765ad595be2fa9c48097833
7
+ data.tar.gz: 3e2264529adb1422affe3d13deab74b24fb3af6dce413b5c92a876b31872d1a1f415c66e84143cd70d8fb1fa82576f8657a64641eecfde883fad6e90c42cf2c8
data/README.md CHANGED
@@ -1,11 +1,17 @@
1
1
  <img src="assets/wordmark.svg" align="right" />
2
2
 
3
+ [My blog with 2038](https://mat-ling.fit)
4
+
3
5
  # 2038
4
6
 
5
- ![Version 0.1.0 with Gem](https://img.shields.io/badge/gem-0.1.0-519dd9.svg)
7
+ [![Ver 0.1.2 with Gem](https://img.shields.io/badge/gem-0.1.2-519dd9.svg)][gem]
6
8
 
7
- > 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.
8
- > 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
+ > 所以，抛掉缰绳，驶离避风港，乘信风远航吧。去探索，去梦想，去发现。
9
15
  >
10
16
  > —— Unknown 佚名
11
17
 
@@ -29,7 +35,7 @@
29
35
  Add this line to your Jekyll site's `Gemfile`:
30
36
 
31
37
  ```ruby
32
- gem "jekyll-theme2038"
38
+ gem 'jekyll-theme-2038'
33
39
  ```
34
40
 
35
41
  And add this line to your Jekyll site's `_config.yml`:
@@ -46,8 +52,27 @@ Or install it yourself as:
46
52
 
47
53
  $ gem install jekyll-theme-2038
48
54
 
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.
58
+
59
+ ## Usage
60
+
61
+ (To be continued after I fixed most of bugs)
62
+
49
63
  ## Todo
50
64
 
51
65
  * Support of UnicodeMath or ASCIIMath
52
66
  * Right-to-left and vertical page
53
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
+
data/_includes/page-link.html CHANGED
@@ -9,7 +9,7 @@
9
9
  {{ i }}
10
10
  </a>
11
11
  {% else %}
12
- <a href="{{ include.url }}" title="{{ title | replace: 'NUM', i }}">
12
+ <a href="{{ include.url | replace: 'NUM', i }}" title="{{ title | replace: 'NUM', i }}">
13
13
  {{ i }}
14
14
  </a>
15
15
  {% endif %}
data/_sass/2038/colour/dark.scss CHANGED
@@ -5,9 +5,15 @@
5
5
  $cite-image: url(underline-dark.svg);
6
6
  $em-image: url(dot-dark.svg);
7
7
 
8
- $bgcolour: black;
9
- $base-colour: white;
10
- $card-colour: #1A1A1A;
8
+ $bgcolour: black;
9
+ $base-colour: white;
10
+ $card-colour: #1A1A1A;
11
+ $indication-colour: #2A2A2A;
12
+ $normal-colour: #AAA;
13
+ $levity-colour: #999;
14
+ $heavy-colour: #E6E6DC;
15
+ $atlarge-colour: #666;
16
+ $meso-colour: #CCC;
11
17
 
12
18
  @import '2038/syntax-dark',
13
19
  '2038/colour-relative';
data/_sass/2038/colour/light.scss CHANGED
@@ -1,9 +1,12 @@
1
- $bgcolour: #F5F5F5;
2
- $base-colour: black;
3
- $card-colour: white;
4
-
5
- $cite-image: url(underline-light.svg);
6
- $em-image: url(dot-light.svg);
1
+ $bgcolour: #F6F5F0;
2
+ $base-colour: black;
3
+ $card-colour: white;
4
+ $indication-colour: #E6E5E0;
5
+ $normal-colour: #555;
6
+ $levity-colour: #777;
7
+ $heavy-colour: #1A1A1A;
8
+ $atlarge-colour: #999;
9
+ $meso-colour: #333;
7
10
 
8
11
  @import '2038/syntax-light',
9
12
  '2038/colour-relative';
data/_sass/2038/colour-relative.scss CHANGED
@@ -1,13 +1,5 @@
1
1
  $curtain-colour: fade-out($bgcolour, .15);
2
- $indication-colour: fade-out($base-colour, .9);
3
-
4
- $normal-colour: fade-out($base-colour, .3);
5
- $levity-colour: fade-out($base-colour, .4);
6
- $heavy-colour: fade-out($base-colour, .1);
7
- $atlarge-colour: fade-out($base-colour, .6);
8
-
9
2
  $line-colour: $levity-colour;
10
-
11
3
  $link-change-time: .3s !default;
12
4
 
13
5
  h1, h2, h3, h4, h5, h6, strong, .ml-footer-desc {
@@ -60,7 +52,7 @@ body {
60
52
  }
61
53
 
62
54
  .ml-toc-1 > a, .ml-toc-2 > a {
63
- color: fade-out($base-colour, .2);
55
+ color: $meso-colour;
64
56
  }
65
57
 
66
58
  .ml-bookmark a {
@@ -77,7 +69,7 @@ body {
77
69
  }
78
70
 
79
71
  .ml-footer-main {
80
- background: $curtain-colour;
72
+ background: $bgcolour;
81
73
  }
82
74
 
83
75
  blockquote {
@@ -206,7 +198,7 @@ cite {
206
198
 
207
199
  &:hover {
208
200
  background-color: fade-out($indication-colour, 0.05);
209
- color: $heavy-colour
201
+ color: $heavy-colour;
210
202
  }
211
203
  }
212
204
 
data/_sass/2038/drawer.scss CHANGED
@@ -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
 
data/_sass/2038/miscellaneous.scss CHANGED
@@ -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;
@@ -169,7 +190,7 @@ a.ml-card-anchor, a.ml-block-anchor {
169
190
  }
170
191
 
171
192
  .ml-block-anchor {
172
- padding: 4px
193
+ padding: 4px;
173
194
  }
174
195
 
175
196
  .ml-page-list {
data/_sass/2038/resize.scss CHANGED
@@ -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 值要相应做优化 */
data/assets/main.scss CHANGED
@@ -1,7 +1,9 @@
1
1
  ---
2
-
3
2
  ---
4
3
 
4
+ $cite-image: url(underline-light.svg);
5
+ $em-image: url(dot-light.svg);
6
+
5
7
  @import
6
8
  '2038/colour/{{ site.theme-2038.skin | default: "auto" }}',
7
9
  '2038/typo',
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.0
4
+ version: 0.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - 物灵
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-11 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
@@ -34,7 +34,6 @@ files:
34
34
  - LICENSE
35
35
  - LICENSE.txt
36
36
  - README.md
37
- - README.old.md
38
37
  - _config.yml
39
38
  - _data/theme-2038-i18n.yml
40
39
  - _includes/custom-head.html
@@ -95,5 +94,5 @@ requirements: []
95
94
  rubygems_version: 3.1.2
96
95
  signing_key:
97
96
  specification_version: 4
98
- summary: 2038 is a minimalist Jekyll Theme for Writers.
97
+ summary: 2038 is a minimalist Jekyll Theme for writers.
99
98
  test_files: []
data/README.old.md DELETED
@@ -1,52 +0,0 @@
1
- # 2038
2
-
3
- Welcome to your new Jekyll theme! In this directory, you'll find the files you need to be able to package up your theme into a gem. Put your layouts in `_layouts`, your includes in `_includes`, your sass files in `_sass` and any other assets in `assets`.
4
-
5
- To experiment with this code, add some sample content and run `bundle exec jekyll serve` – this directory is setup just like a Jekyll site!
6
-
7
- TODO: Delete this and the text above, and describe your gem
8
-
9
-
10
- ## Installation
11
-
12
- Add this line to your Jekyll site's `Gemfile`:
13
-
14
- ```ruby
15
- gem "2038"
16
- ```
17
-
18
- And add this line to your Jekyll site's `_config.yml`:
19
-
20
- ```yaml
21
- theme: 2038
22
- ```
23
-
24
- And then execute:
25
-
26
- $ bundle
27
-
28
- Or install it yourself as:
29
-
30
- $ gem install 2038
31
-
32
- ## Usage
33
-
34
- TODO: Write usage instructions here. Describe your available layouts, includes, sass and/or assets.
35
-
36
- ## Contributing
37
-
38
- Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/hello. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
39
-
40
- ## Development
41
-
42
- To set up your environment to develop this theme, run `bundle install`.
43
-
44
- Your theme is setup just like a normal Jekyll site! To test your theme, run `bundle exec jekyll serve` and open your browser at `http://localhost:4000`. This starts a Jekyll server using your theme. Add pages, documents, data, etc. like normal to test your theme's contents. As you make modifications to your theme and to your content, your site will regenerate and you should see the changes in the browser after a refresh, just like normal.
45
-
46
- When your theme is released, only the files in `_layouts`, `_includes`, `_sass` and `assets` tracked with Git will be bundled.
47
- To add a custom directory to your theme-gem, please edit the regexp in `2038.gemspec` accordingly.
48
-
49
- ## License
50
-
51
- The theme is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
52
-