Brandon Mathis
284c5f98f8
fixed merge of _config
2011-12-10 10:36:19 -06:00
Brandon Mathis
f369c73aee
Merge branch 'site' of github.com:imathis/octopress into site
2011-12-10 08:42:03 -06:00
Frederic Hemberger
116d4336b9
Add information about atom feeds and local preview of posts
2011-12-10 15:38:09 +01:00
Frederic Hemberger
e220fcc610
Merge branch 'master' of github.com:imathis/octopress
2011-12-10 14:48:35 +01:00
Frederic Hemberger
254cdd35d6
:copydot ignores thumbnail files starting with '._'
2011-12-10 14:46:13 +01:00
Frederic Hemberger
e5c262cb8f
Merge pull request #225 from imathis/post_names
...
Add more flexibility to :new_page task
2011-12-10 04:04:48 -08:00
Frederic Hemberger
23a3efc7f1
Add reference to Liquid tags and 'more' comment, closes #254
2011-12-10 12:58:42 +01:00
Frederic Hemberger
e8ee5219c3
Merge pull request #271 from simensen/ConfigureFontFamilyForSubtitle
...
Make font-family for subtitle configurable.
2011-12-10 03:49:26 -08:00
Frederic Hemberger
a34bdf251c
Merge pull request #270 from omo/missing-default-variables
...
Add missing default qualifiers to some sass variables.
2011-12-10 03:46:33 -08:00
Frederic Hemberger
cb61146264
Merge pull request #295 from jbrains/master
...
Capitalize word after '!' and '?'.
2011-12-10 03:24:16 -08:00
Frederic Hemberger
7f3ad1c1cc
Merge pull request #293 from imathis/generate_environment
...
Introduce distinction between preview/productive site generation
2011-12-10 03:21:59 -08:00
Frederic Hemberger
5ae24737c9
Clarify RVM/rbenv relation, add to installation instructions. Closes #313,#306.
2011-12-10 12:17:12 +01:00
Frederic Hemberger
d99434bca9
Merge pull request #315 from vamsee/master
...
rvm does not recognize the current .rvmrc syntax
2011-12-09 21:31:34 -08:00
Vamsee Kanakala
6dd79215c7
use correct .rvmrc syntax
2011-12-10 06:11:06 +05:30
Brandon Mathis
19325e8f40
Merge pull request #298 from nistude/master
...
Nested lists should not have margin-bottom
2011-12-02 07:49:31 -08:00
Nikolay Sturm
6bf5258f1f
nested lists should not have a margin-bottom
2011-12-02 16:04:36 +01:00
Frederic Hemberger
6714e5c7f5
Set flag in preview mode and re-generate files before deployment if necessary
2011-11-29 15:13:50 +01:00
J. B. Rainsberger
343e0f1409
Improved, I think, the Titlecase plugin
2011-11-28 00:25:50 +01:00
Frederic Hemberger
f1ebf35869
Introduce distinction between preview/productive site generation
...
Posts which contain the YAML attribute `published: false` are usually
not generated by Jekyll. With this patch they can be previewed just
like published posts on localhost using `rake watch`or `rake preview`.
NOTICE: Before pushing to the productive environment, use `rake generate`
to update the public directory and remove posts which are flagged not to be
published.
2011-11-23 14:37:30 +01:00
Brandon Mathis
1eed72762d
Merge pull request #287 from treyhunner/fix/line-wrap-after-code
...
Fix/line wrap after code
2011-11-19 19:58:43 -08:00
Frederic Hemberger
76af6980d4
Remove !default from property values
2011-11-18 11:38:58 +01:00
Frederic Hemberger
9e2d7474ae
Add header font size and padding to custom layout
2011-11-18 11:38:15 +01:00
Frederic Hemberger
fe28a3bd05
Add missing $header-padding-top, $header-padding-bottom.
2011-11-18 11:37:08 +01:00
Frederic Hemberger
4d8745bf7b
Merge pull request #288 from jakemcc/octo-head
...
Make header font-size customizable.
2011-11-17 22:29:29 -08:00
Jake McCrary
c1e6ad5ed3
Make header font size customizable.
...
Change $header-font-size variable to specify size.
2011-11-17 21:21:26 -06:00
Trey Hunner
ffb31492d2
Fix wrapping in and around code elements
2011-11-17 10:21:14 -08:00
Beau Simensen
9c700f3e46
Provide a way to configure font family for subtitle.
2011-11-13 22:20:20 -06:00
MORITA Hajime
ea8adeaa10
Added missing default qualifiers to some sass variables.
2011-11-12 09:38:51 +09:00
Frederic Hemberger
6561da22f5
Make third-party asides default to false, closes #263
2011-11-11 07:45:08 +01:00
Frederic Hemberger
a11e92b2ae
Fix custom colors -bg-back, closes #269
2011-11-11 07:40:45 +01:00
Frederic Hemberger
665737f3fe
Merge pull request #268 from marutanm/patch-1
...
Summary of Video Tag
2011-11-10 22:35:01 -08:00
marutanm
e3126f7502
Fix brief overview of HTML5 Video Tag
2011-11-11 08:39:04 +09:00
Frederic Hemberger
4feeecfdef
Date format: Remove unnecessary escapement
2011-11-04 08:40:41 +01:00
Frederic Hemberger
142681489f
Add custom date format %o for ordinal representation of the day
2011-11-04 08:11:16 +01:00
Frederic Hemberger
987dccee76
Add custom date format to pages, add 'updated' field again
...
Reverts changes of c2a68cc
where I accidentally removed support for 'updated' field, see comments of issue #164 for details.
2011-11-03 20:32:38 +01:00
Frederic Hemberger
262eb52bc5
Reverted commit 514e848
(issue #236 ), should fix Disqus identifier issues.
...
See also: https://github.com/imathis/octopress/wiki/Disqus-identifier-issues
2011-11-01 17:29:29 +01:00
Frederic Hemberger
029fa9bf31
Add response check, fixes #252
2011-10-28 16:21:02 +02:00
Brandon Mathis
d6afe77d4c
Merge pull request #246 from omo/customizable-font-family
...
Makes font-family names customizable.
2011-10-24 05:54:27 -07:00
MORITA Hajime (omo)
20e566f58f
Makes font-family names customizable.
...
This chagne instroduces following variables
that allows authors to customize a font family for each class.
- $serif
- $sans
- $heading-font-family
- $header-title-font-family
This change also adds anotehr custom scss file named "_fonts.scss".
We can use it to override these newly introduced variables.
2011-10-24 03:03:44 -07:00
Frederic Hemberger
665f8a424c
Merge branch 'master' of github.com:imathis/octopress
2011-10-24 08:08:02 +02:00
Frederic Hemberger
06e8c51a1a
Set Liquid version explicitly to 2.2.2, fixes #243
...
Obviously Liquid 2.3.0 seems to cause problems, see:
http://www.yodi.me/blog/2011/10/24/github-custom-domain-with-octopress-in-ubuntu-oneiric-11-dot-10/
http://stackoverflow.com/questions/7801197/syntax-highlighting-with-pygments-is-failing-via-liquid-templates-string-error
2011-10-24 08:05:03 +02:00
Brandon Mathis
10de5107e9
Merge pull request #242 from omo/customizable-nav-gradient
...
Making the background and the footer gradiations customizable
2011-10-23 20:38:43 -07:00
MORITA Hajime (omo)
633b3389f3
Make the background and the footer gradiations customizable
...
This change extracts following variables for allowing customizatin:
- nav-bg-back
- nav-bg-front
- footer-bg-back
- footer-bg-front
2011-10-23 06:55:20 -07:00
Frederic Hemberger
408ed3e1e2
Merge pull request #240 from aaroncm/master
...
Only include facebook js if it is to be used
2011-10-22 23:21:56 -07:00
Aaron Malone
3bba3ed4cf
only include facebook js if facebook_like is true
2011-10-23 00:46:00 -05:00
Frederic Hemberger
a81ef5e28b
Improve handling of meta description
2011-10-21 15:00:32 +02:00
Frederic Hemberger
514e84831c
Use canonical URL for Disqus, fixes #236
2011-10-21 14:04:34 +02:00
Frederic Hemberger
2043c543d2
Add utf-8 encoding option to Pygments highlighter, fixes #232
2011-10-21 09:23:56 +02:00
Brandon Mathis
828a7b3004
Merge branch 'site' of github.com:imathis/octopress into site
2011-10-18 10:59:51 -05:00
Frederic Hemberger
97903baab3
Fix missing 'blockquote' in example, closes #229
2011-10-18 17:51:36 +02:00