Brandon Mathis
479d36332c
Merge branch 'master' into site
...
Conflicts:
_config.yml
2011-12-19 10:39:51 -06:00
Brandon Mathis
ce0d25100b
now Github repo url can be specified inline setup_github_pages command
2011-12-18 15:38:11 -06:00
Brandon Mathis
fca7f10fe9
added site-wide description to config.yml (this provides a default meta description for the site, but can be overridden on on any page with page.description in the yaml)
2011-12-13 08:37:34 -06:00
Brandon Mathis
7932d9ebe7
Merge pull request #323 from adibis/devel
...
Removed redeclaration of sidebar-border.
2011-12-13 06:03:35 -08:00
Aditya Shevade
11bdf8ab66
Removed redeclaration of sidebar-border.
2011-12-12 21:31:21 -08:00
Brandon Mathis
78242e3e02
Merge pull request #322 from tgray/clearnoise
...
Added !default to noise-bg
2011-12-12 08:49:00 -08:00
Tim Gray
78fd9f48f9
Added !default to noise-bg
...
This lets us override the noise.png background image in the custom SCSS
files if we choose.
2011-12-12 11:14:15 -05:00
Brandon Mathis
2d88efbf14
Merge branch 'master' into site
2011-12-11 19:08:30 -06:00
Brandon Mathis
b51071372b
Merge pull request #319 from tgray/searchtoggle
...
Search box can be toggled off.
2011-12-11 15:03:31 -08:00
Brandon Mathis
4e0fec0e0f
Added a space between author and site to be sure it looked good in feed readers and places where the site CSS wasn't being loaded
2011-12-11 16:24:46 -06:00
Brandon Mathis
d5a02a78f6
Added RubyPants (the ruby port of John Gruber's smarty pants) to intelligently replace primes with smart quotes in the pullquote plugin, fixes #316
2011-12-11 16:24:39 -06:00
Brandon Mathis
b00b966b3a
Added a space between author and site to be sure it looked good in feed readers and places where the site CSS wasn't being loaded
2011-12-11 16:24:32 -06:00
Brandon Mathis
2c91c276c1
Added RubyPants (the ruby port of John Gruber's smarty pants) to intelligently replace primes with smart quotes in the pullquote plugin, fixes #316
2011-12-11 16:20:04 -06:00
Tim Gray
2c1ec7434b
Search box can be toggled off.
...
By leaving 'simple_search' parameter blank in the _config.yml file, the
search form in the navigation.html include is omitted. This lets you
put your own custom search form in the custom/navigation.html file.
2011-12-11 16:15:39 -05:00
Brandon Mathis
dfb3c6e07f
updated rsync docs
2011-12-11 00:55:39 -06:00
Brandon Mathis
a5732b9a76
updated docs for deploying with rsync
2011-12-11 00:32:57 -06:00
Brandon Mathis
19c18ad300
updated to latest
2011-12-10 18:48:43 -06:00
Brandon Mathis
51ba8170b5
Merge branch 'master' into site
2011-12-10 18:30:40 -06:00
Brandon Mathis
39ec55b605
Removed offending paren in Rakefile
2011-12-10 18:30:33 -06:00
Brandon Mathis
a4ea559ec9
fixed merge in rakefile
2011-12-10 18:19:39 -06:00
Brandon Mathis
bdc3cb8bd3
Rsync --delete option can be turned off in Rakefile configuration and users can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247
2011-12-10 18:18:34 -06:00
Brandon Mathis
a2333825a6
updated to latest
2011-12-10 12:57:15 -06:00
Brandon Mathis
692c8f3491
removed overflow hidden from <article> to prevent clipping on facebook's send dropdown, and fixed bug with styling on twitter status links
2011-12-10 12:50:04 -06:00
Brandon Mathis
645eb6140b
now mobile navigation inlcudes subscription links fixes #299
2011-12-10 12:49:55 -06:00
Brandon Mathis
738a284399
removed size restriction on twitter sidebar follow button
2011-12-10 12:49:29 -06:00
Brandon Mathis
0e3b4635a1
removed overflow hidden from <article> to prevent clipping on facebook's send dropdown, and fixed bug with styling on twitter status links
2011-12-10 12:47:15 -06:00
Brandon Mathis
7f9db2bb56
now mobile navigation inlcudes subscription links fixes #299
2011-12-10 12:45:03 -06:00
Brandon Mathis
607bd69235
removed size restriction on twitter sidebar follow button
2011-12-10 10:50:16 -06:00
Brandon Mathis
2691bee2be
updated source and styles from latest master
2011-12-10 10:40:10 -06:00
Brandon Mathis
284c5f98f8
fixed merge of _config
2011-12-10 10:36:19 -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
