jekyll 3.2.0.pre.beta1 → 3.2.0.pre.beta2

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of jekyll might be problematic. Click here for more details.

Files changed (89) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +17 -95
  3. data/README.markdown +6 -4
  4. data/{bin → exe}/jekyll +18 -14
  5. data/lib/jekyll.rb +79 -76
  6. data/lib/jekyll/collection.rb +32 -16
  7. data/lib/jekyll/command.rb +17 -13
  8. data/lib/jekyll/commands/build.rb +7 -2
  9. data/lib/jekyll/commands/doctor.rb +3 -1
  10. data/lib/jekyll/commands/new.rb +3 -0
  11. data/lib/jekyll/commands/new_theme.rb +7 -4
  12. data/lib/jekyll/commands/serve.rb +2 -0
  13. data/lib/jekyll/commands/serve/servlet.rb +2 -2
  14. data/lib/jekyll/configuration.rb +187 -125
  15. data/lib/jekyll/converters/markdown.rb +19 -9
  16. data/lib/jekyll/converters/markdown/kramdown_parser.rb +12 -5
  17. data/lib/jekyll/converters/markdown/rdiscount_parser.rb +4 -4
  18. data/lib/jekyll/converters/markdown/redcarpet_parser.rb +90 -84
  19. data/lib/jekyll/convertible.rb +34 -21
  20. data/lib/jekyll/deprecator.rb +11 -6
  21. data/lib/jekyll/document.rb +52 -50
  22. data/lib/jekyll/drops/document_drop.rb +40 -5
  23. data/lib/jekyll/drops/drop.rb +49 -10
  24. data/lib/jekyll/drops/excerpt_drop.rb +15 -0
  25. data/lib/jekyll/drops/jekyll_drop.rb +12 -0
  26. data/lib/jekyll/drops/site_drop.rb +4 -2
  27. data/lib/jekyll/drops/url_drop.rb +4 -4
  28. data/lib/jekyll/entry_filter.rb +9 -6
  29. data/lib/jekyll/errors.rb +4 -3
  30. data/lib/jekyll/excerpt.rb +4 -6
  31. data/lib/jekyll/external.rb +4 -4
  32. data/lib/jekyll/filters.rb +67 -34
  33. data/lib/jekyll/frontmatter_defaults.rb +45 -38
  34. data/lib/jekyll/hooks.rb +21 -21
  35. data/lib/jekyll/layout.rb +3 -1
  36. data/lib/jekyll/liquid_renderer.rb +7 -3
  37. data/lib/jekyll/liquid_renderer/file.rb +1 -1
  38. data/lib/jekyll/liquid_renderer/table.rb +11 -11
  39. data/lib/jekyll/log_adapter.rb +2 -2
  40. data/lib/jekyll/page.rb +10 -10
  41. data/lib/jekyll/plugin.rb +5 -5
  42. data/lib/jekyll/plugin_manager.rb +12 -8
  43. data/lib/jekyll/publisher.rb +1 -1
  44. data/lib/jekyll/reader.rb +11 -7
  45. data/lib/jekyll/readers/data_reader.rb +9 -9
  46. data/lib/jekyll/readers/layout_reader.rb +7 -7
  47. data/lib/jekyll/readers/page_reader.rb +3 -1
  48. data/lib/jekyll/readers/post_reader.rb +9 -10
  49. data/lib/jekyll/readers/static_file_reader.rb +3 -1
  50. data/lib/jekyll/regenerator.rb +50 -28
  51. data/lib/jekyll/related_posts.rb +1 -1
  52. data/lib/jekyll/renderer.rb +29 -20
  53. data/lib/jekyll/site.rb +92 -50
  54. data/lib/jekyll/static_file.rb +33 -26
  55. data/lib/jekyll/stevenson.rb +6 -5
  56. data/lib/jekyll/tags/highlight.rb +50 -35
  57. data/lib/jekyll/tags/include.rb +42 -31
  58. data/lib/jekyll/tags/link.rb +11 -4
  59. data/lib/jekyll/tags/post_url.rb +8 -7
  60. data/lib/jekyll/theme.rb +4 -3
  61. data/lib/jekyll/theme_builder.rb +18 -6
  62. data/lib/jekyll/url.rb +21 -14
  63. data/lib/jekyll/utils.rb +57 -28
  64. data/lib/jekyll/utils/ansi.rb +9 -9
  65. data/lib/jekyll/utils/platforms.rb +2 -2
  66. data/lib/jekyll/version.rb +1 -1
  67. data/lib/site_template/_config.yml +2 -0
  68. data/lib/site_template/css/main.scss +3 -17
  69. data/lib/theme_template/_layouts/default.html +1 -0
  70. data/lib/theme_template/_layouts/page.html +5 -0
  71. data/lib/theme_template/_layouts/post.html +5 -0
  72. data/lib/theme_template/example/_post.md +1 -2
  73. data/lib/theme_template/example/index.html +2 -2
  74. data/lib/theme_template/gitignore.erb +4 -0
  75. data/lib/theme_template/theme.gemspec.erb +2 -6
  76. metadata +10 -18
  77. data/lib/site_template/_includes/footer.html +0 -38
  78. data/lib/site_template/_includes/head.html +0 -12
  79. data/lib/site_template/_includes/header.html +0 -27
  80. data/lib/site_template/_includes/icon-github.html +0 -1
  81. data/lib/site_template/_includes/icon-github.svg +0 -1
  82. data/lib/site_template/_includes/icon-twitter.html +0 -1
  83. data/lib/site_template/_includes/icon-twitter.svg +0 -1
  84. data/lib/site_template/_layouts/default.html +0 -20
  85. data/lib/site_template/_layouts/page.html +0 -14
  86. data/lib/site_template/_layouts/post.html +0 -15
  87. data/lib/site_template/_sass/_base.scss +0 -200
  88. data/lib/site_template/_sass/_layout.scss +0 -242
  89. data/lib/site_template/_sass/_syntax-highlighting.scss +0 -71
@@ -1,242 +0,0 @@
1
- /**
2
- * Site header
3
- */
4
- .site-header {
5
- border-top: 5px solid $grey-color-dark;
6
- border-bottom: 1px solid $grey-color-light;
7
- min-height: 56px;
8
-
9
- // Positioning context for the mobile navigation icon
10
- position: relative;
11
- }
12
-
13
- .site-title {
14
- font-size: 26px;
15
- font-weight: 300;
16
- line-height: 56px;
17
- letter-spacing: -1px;
18
- margin-bottom: 0;
19
- float: left;
20
-
21
- &,
22
- &:visited {
23
- color: $grey-color-dark;
24
- }
25
- }
26
-
27
- .site-nav {
28
- float: right;
29
- line-height: 56px;
30
-
31
- .menu-icon {
32
- display: none;
33
- }
34
-
35
- .page-link {
36
- color: $text-color;
37
- line-height: $base-line-height;
38
-
39
- // Gaps between nav items, but not on the last one
40
- &:not(:last-child) {
41
- margin-right: 20px;
42
- }
43
- }
44
-
45
- @include media-query($on-palm) {
46
- position: absolute;
47
- top: 9px;
48
- right: $spacing-unit / 2;
49
- background-color: $background-color;
50
- border: 1px solid $grey-color-light;
51
- border-radius: 5px;
52
- text-align: right;
53
-
54
- .menu-icon {
55
- display: block;
56
- float: right;
57
- width: 36px;
58
- height: 26px;
59
- line-height: 0;
60
- padding-top: 10px;
61
- text-align: center;
62
-
63
- > svg {
64
- width: 18px;
65
- height: 15px;
66
-
67
- path {
68
- fill: $grey-color-dark;
69
- }
70
- }
71
- }
72
-
73
- .trigger {
74
- clear: both;
75
- display: none;
76
- }
77
-
78
- &:hover .trigger {
79
- display: block;
80
- padding-bottom: 5px;
81
- }
82
-
83
- .page-link {
84
- display: block;
85
- padding: 5px 10px;
86
-
87
- &:not(:last-child) {
88
- margin-right: 0;
89
- }
90
- margin-left: 20px;
91
- }
92
- }
93
- }
94
-
95
-
96
-
97
- /**
98
- * Site footer
99
- */
100
- .site-footer {
101
- border-top: 1px solid $grey-color-light;
102
- padding: $spacing-unit 0;
103
- }
104
-
105
- .footer-heading {
106
- font-size: 18px;
107
- margin-bottom: $spacing-unit / 2;
108
- }
109
-
110
- .contact-list,
111
- .social-media-list {
112
- list-style: none;
113
- margin-left: 0;
114
- }
115
-
116
- .footer-col-wrapper {
117
- font-size: 15px;
118
- color: $grey-color;
119
- margin-left: -$spacing-unit / 2;
120
- @extend %clearfix;
121
- }
122
-
123
- .footer-col {
124
- float: left;
125
- margin-bottom: $spacing-unit / 2;
126
- padding-left: $spacing-unit / 2;
127
- }
128
-
129
- .footer-col-1 {
130
- width: -webkit-calc(35% - (#{$spacing-unit} / 2));
131
- width: calc(35% - (#{$spacing-unit} / 2));
132
- }
133
-
134
- .footer-col-2 {
135
- width: -webkit-calc(20% - (#{$spacing-unit} / 2));
136
- width: calc(20% - (#{$spacing-unit} / 2));
137
- }
138
-
139
- .footer-col-3 {
140
- width: -webkit-calc(45% - (#{$spacing-unit} / 2));
141
- width: calc(45% - (#{$spacing-unit} / 2));
142
- }
143
-
144
- @include media-query($on-laptop) {
145
- .footer-col-1,
146
- .footer-col-2 {
147
- width: -webkit-calc(50% - (#{$spacing-unit} / 2));
148
- width: calc(50% - (#{$spacing-unit} / 2));
149
- }
150
-
151
- .footer-col-3 {
152
- width: -webkit-calc(100% - (#{$spacing-unit} / 2));
153
- width: calc(100% - (#{$spacing-unit} / 2));
154
- }
155
- }
156
-
157
- @include media-query($on-palm) {
158
- .footer-col {
159
- float: none;
160
- width: -webkit-calc(100% - (#{$spacing-unit} / 2));
161
- width: calc(100% - (#{$spacing-unit} / 2));
162
- }
163
- }
164
-
165
-
166
-
167
- /**
168
- * Page content
169
- */
170
- .page-content {
171
- padding: $spacing-unit 0;
172
- }
173
-
174
- .page-heading {
175
- font-size: 20px;
176
- }
177
-
178
- .post-list {
179
- margin-left: 0;
180
- list-style: none;
181
-
182
- > li {
183
- margin-bottom: $spacing-unit;
184
- }
185
- }
186
-
187
- .post-meta {
188
- font-size: $small-font-size;
189
- color: $grey-color;
190
- }
191
-
192
- .post-link {
193
- display: block;
194
- font-size: 24px;
195
- }
196
-
197
-
198
-
199
- /**
200
- * Posts
201
- */
202
- .post-header {
203
- margin-bottom: $spacing-unit;
204
- }
205
-
206
- .post-title {
207
- font-size: 42px;
208
- letter-spacing: -1px;
209
- line-height: 1;
210
-
211
- @include media-query($on-laptop) {
212
- font-size: 36px;
213
- }
214
- }
215
-
216
- .post-content {
217
- margin-bottom: $spacing-unit;
218
-
219
- h2 {
220
- font-size: 32px;
221
-
222
- @include media-query($on-laptop) {
223
- font-size: 28px;
224
- }
225
- }
226
-
227
- h3 {
228
- font-size: 26px;
229
-
230
- @include media-query($on-laptop) {
231
- font-size: 22px;
232
- }
233
- }
234
-
235
- h4 {
236
- font-size: 20px;
237
-
238
- @include media-query($on-laptop) {
239
- font-size: 18px;
240
- }
241
- }
242
- }
@@ -1,71 +0,0 @@
1
- /**
2
- * Syntax highlighting styles
3
- */
4
- .highlight {
5
- background: #fff;
6
- @extend %vertical-rhythm;
7
-
8
- .highlighter-rouge & {
9
- background: #eef;
10
- }
11
-
12
- .c { color: #998; font-style: italic } // Comment
13
- .err { color: #a61717; background-color: #e3d2d2 } // Error
14
- .k { font-weight: bold } // Keyword
15
- .o { font-weight: bold } // Operator
16
- .cm { color: #998; font-style: italic } // Comment.Multiline
17
- .cp { color: #999; font-weight: bold } // Comment.Preproc
18
- .c1 { color: #998; font-style: italic } // Comment.Single
19
- .cs { color: #999; font-weight: bold; font-style: italic } // Comment.Special
20
- .gd { color: #000; background-color: #fdd } // Generic.Deleted
21
- .gd .x { color: #000; background-color: #faa } // Generic.Deleted.Specific
22
- .ge { font-style: italic } // Generic.Emph
23
- .gr { color: #a00 } // Generic.Error
24
- .gh { color: #999 } // Generic.Heading
25
- .gi { color: #000; background-color: #dfd } // Generic.Inserted
26
- .gi .x { color: #000; background-color: #afa } // Generic.Inserted.Specific
27
- .go { color: #888 } // Generic.Output
28
- .gp { color: #555 } // Generic.Prompt
29
- .gs { font-weight: bold } // Generic.Strong
30
- .gu { color: #aaa } // Generic.Subheading
31
- .gt { color: #a00 } // Generic.Traceback
32
- .kc { font-weight: bold } // Keyword.Constant
33
- .kd { font-weight: bold } // Keyword.Declaration
34
- .kp { font-weight: bold } // Keyword.Pseudo
35
- .kr { font-weight: bold } // Keyword.Reserved
36
- .kt { color: #458; font-weight: bold } // Keyword.Type
37
- .m { color: #099 } // Literal.Number
38
- .s { color: #d14 } // Literal.String
39
- .na { color: #008080 } // Name.Attribute
40
- .nb { color: #0086B3 } // Name.Builtin
41
- .nc { color: #458; font-weight: bold } // Name.Class
42
- .no { color: #008080 } // Name.Constant
43
- .ni { color: #800080 } // Name.Entity
44
- .ne { color: #900; font-weight: bold } // Name.Exception
45
- .nf { color: #900; font-weight: bold } // Name.Function
46
- .nn { color: #555 } // Name.Namespace
47
- .nt { color: #000080 } // Name.Tag
48
- .nv { color: #008080 } // Name.Variable
49
- .ow { font-weight: bold } // Operator.Word
50
- .w { color: #bbb } // Text.Whitespace
51
- .mf { color: #099 } // Literal.Number.Float
52
- .mh { color: #099 } // Literal.Number.Hex
53
- .mi { color: #099 } // Literal.Number.Integer
54
- .mo { color: #099 } // Literal.Number.Oct
55
- .sb { color: #d14 } // Literal.String.Backtick
56
- .sc { color: #d14 } // Literal.String.Char
57
- .sd { color: #d14 } // Literal.String.Doc
58
- .s2 { color: #d14 } // Literal.String.Double
59
- .se { color: #d14 } // Literal.String.Escape
60
- .sh { color: #d14 } // Literal.String.Heredoc
61
- .si { color: #d14 } // Literal.String.Interpol
62
- .sx { color: #d14 } // Literal.String.Other
63
- .sr { color: #009926 } // Literal.String.Regex
64
- .s1 { color: #d14 } // Literal.String.Single
65
- .ss { color: #990073 } // Literal.String.Symbol
66
- .bp { color: #999 } // Name.Builtin.Pseudo
67
- .vc { color: #008080 } // Name.Variable.Class
68
- .vg { color: #008080 } // Name.Variable.Global
69
- .vi { color: #008080 } // Name.Variable.Instance
70
- .il { color: #099 } // Literal.Number.Integer.Long
71
- }