bf149a0b97
highlight: fix problem with linenos and rouge.
...
Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435
The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.
To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
2015-02-09 21:42:52 -08:00
c625b94bc0
Merge pull request #3401 from jekyll/fix-code-cleanup
2015-02-09 16:26:19 -08:00
571800c8ad
Use 3 places to the right of the decimal place instead of 2.
2015-02-07 23:57:07 -08:00
d795113e94
Update build.rb
...
parenthesis added to round
2015-02-07 23:57:07 -08:00
dbc8530068
Show only two decimals in time to generate pages
...
no need to display 10 decimals.
it feels up my screen with useless numbers! ;-p
2015-02-07 23:57:07 -08:00
6521b84aac
Change `overflow-x` value to `auto`
...
`overflow-x: scroll;` makes scrollbar visible always whether the content
does overflow or not.
2015-02-07 06:21:21 +09:00
5e541b5eb0
fix quote
2015-02-05 16:48:59 +07:00
2745be736e
A lighter font declaration
...
Removes unnecessary Sass
Thanks @kleinfreund :)
2015-02-02 11:43:53 +00:00
d24ea66933
The highlight tip should only clip the newlines before and after the *entire* block, not in between.
...
Ref: https://github.com/jneen/rouge/issues/230
2015-02-01 22:37:10 -08:00
9ba9c47cd6
Fixes #3339 Add `pkill -f jekyll` to ways to kill.
...
This shows people how to kill Jekyll without knowing the PID using `pkill` (you could also do `kill -9 $(pgrep -f jekyll)` but that is just the long way around doing `pkill -f` so it shouldn't be shown in the Jekyll logger but can be documented here for people.
2015-02-01 06:45:52 -06:00
3318c38eec
Merge pull request #3391 from jekyll/enspeeden-include
2015-01-31 15:41:34 -08:00
a87cda4b12
Add configuration fallback for paginate, and fix tests.
2015-01-31 13:53:17 -08:00
65d43ef398
Move previous runtime dependencies to development dependencies.
2015-01-31 13:53:17 -08:00
057b8cae7f
Use `rouge` as the default syntax highlighter.
2015-01-31 13:52:50 -08:00
336bb44750
Use #require_with_graceful_fail in Highlight tag.
2015-01-31 13:52:26 -08:00
18e0d2fe75
Make the {% include %} tag a teensy bit faster.
2015-01-31 12:59:25 -08:00
aceb5b5d53
Merge branch 'jekyll-gjtorikian-patch-1'
...
* jekyll-gjtorikian-patch-1:
Use the source_dir() helper
Add test for new extracted method
Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
a2b19c1d2b
Merge pull request #3383 from jekyll/respect-the-title
2015-01-31 00:07:10 -08:00
0c624eb11b
The :title URL placeholder for collections should be the filename slug.
...
This mimicks posts most closely. It can be overridden by the
YAML front matter.
Undoes some of #2864 .
2015-01-30 01:53:11 -08:00
e2e6e7dc22
Merge pull request #3376 from tkrotoff/helvetica
2015-01-29 18:52:07 -08:00
fe08405ae1
Merge pull request #3378 from kaatt/initial-build-time
2015-01-29 16:10:05 -06:00
63bca94bde
Merge pull request #3375 from tkrotoff/fix-nav-items-gaps
2015-01-29 14:07:49 -08:00
e1e60499b1
Factor out a `read_data_file` call to keep things clean
2015-01-29 12:41:19 -08:00
ff646738fc
Shows time after initial generation
2015-01-30 01:32:00 +05:30
aa44c7f53d
Switch default font to Helvetica Neue
...
Helvetica Neue (1983) features multiple improvements over the original Helvetica font (1957), 'neue' means 'new' in German
2015-01-29 16:38:12 +01:00
368b862ebb
Refactoring: replace !important with cleaner CSS
2015-01-29 16:18:22 +01:00
3e609b1cd9
Merge pull request #3329 from tkrotoff/fix-nav-items-gaps
2015-01-24 11:56:52 -08:00
31b03e9b86
Merge pull request #3325 from imathis/generate-url
2015-01-24 11:21:51 -08:00
317e2f460e
Release 💎 v3.0.0.beta1
2015-01-24 09:55:46 -08:00
53a59544e8
Fix site-nav alignment
2015-01-21 01:44:31 +01:00
58e231ce40
Rename Regenerator#write to Regenerator#write_metadata
2015-01-19 16:29:50 -08:00
90eecc5da6
Fix nav items alignment when in "burger" mode
2015-01-19 20:55:32 +01:00
fe5f0d124c
Move all regenerate? checking to Regenerator
2015-01-18 11:05:06 -08:00
589919d58a
Strip slashes on nil url tokens
2015-01-18 08:31:14 -06:00
c378f741a8
Merge pull request #3319 from jekyll/split-off-textile
2015-01-17 17:08:15 -08:00
cbe5f8e4dd
Merge pull request #3321 from jekyll/performance-upgrades
2015-01-17 16:55:51 -08:00
c1da91cf5c
Start removing mentions of Textile.
2015-01-17 16:51:28 -08:00
877cba9811
Remove direct baked-in support for Textile.
2015-01-17 16:51:28 -08:00
d28fb07bb9
Fixed typo [ci skip]
2015-01-18 00:45:28 +00:00
aaf0ba15cc
Use frozen regular expressions for Utils#slugify
2015-01-17 16:25:33 -08:00
ef2d558874
Markdown#matches should avoid regexp
2015-01-17 16:25:10 -08:00
10659e1eef
Merge branch 'nitoyon-slugify-new-param'
...
* nitoyon-slugify-new-param:
Remove superfluous Sass declarations.
Move the slugify options out to their own section so as to fix the formatting.
Document the mode parameter of slugify Liquid filter
Add tests for mode parameters of slugify Liquid filter
Add mode parameter to slugify Liquid filter
Conflicts:
lib/jekyll/utils.rb
---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
b2099ac763
Merge branch 'davidized-collection_yaml_dots'
...
* davidized-collection_yaml_dots:
Move YAML Front Matter regexp into a constant.
Add support for collections documents to have YAML front matter ending in dots.
Conflicts:
test/test_collections.rb
2015-01-17 15:24:33 -08:00
c7d92c4e6d
Move YAML Front Matter regexp into a constant.
2015-01-17 15:23:33 -08:00
6d9b4c2aba
Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path
2015-01-17 15:16:50 -08:00
a312115a5a
Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest
2015-01-17 15:13:17 -08:00
84cfc1ceff
Merge branch 'majioa-devel'
...
* majioa-devel:
Ensure Post#excerpt_separator always returns a string.
get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
18f3d76603
Ensure Post#excerpt_separator always returns a string.
2015-01-17 14:59:44 -08:00
ba2e1390ad
Merge pull request #2571 from yous/patch-mixed-case-category
2015-01-17 14:55:30 -08:00
60da4ef010
Fix weird spacing
2015-01-15 22:04:00 +01:00
Parker Moore
eksperimental
ChaYoung You
Seth Warburton
Jordon Bedwell
Matt Rogers
Alfred Xing
Garen Torikian
kaatt
Tanguy Krotoff
Brandon Mathis
Pascal Borreli
Mads Ohm Larsen