Commit Graph

469 Commits

Author SHA1 Message Date
Toby Matejovsky
f033475b4a Fix broken line height in diff syntax highlighting 2011-08-30 23:11:32 -04:00
Brandon Mathis
376a22a355 removed right border from #content when sidebar has been removed 2011-08-28 22:44:59 -05:00
Brandon Mathis
5efd0fb08e Merge pull request #123 from rtgibbons/master
rsync deploy broken (fix included)
2011-08-28 20:29:23 -07:00
Ryan Gibbons
aa095689e4 not using cd in copydot, breaks chained task when further cd's are called 2011-08-28 22:29:30 -05:00
Brandon Mathis
9b52d40a54 removed octopress.org rsync deploy config from Rakefile. Oops 2011-08-25 16:58:02 -04:00
masukomi
e20e68139c sitemap_generator dies if public dir doesn't exist yet
this tests for the presence of the public dir and creates
it if needed. This situation can arise in a new install.
2011-08-25 12:35:06 -04:00
Brandon Mathis
35a158dd14 Somehow I replaced Rakefile with oder version, oops 2011-08-25 10:52:43 -04:00
Brandon Mathis
b38b613908 Added warning if users try to add posts, pages, or generate their site
before installing an Octopress theme, fixes #116
2011-08-25 10:45:01 -04:00
Brandon Mathis
94fcb60958 removed unnecessary mkdir_p in update_style, fixed #67 2011-08-25 10:25:41 -04:00
Brandon Mathis
ebd5fb002b sleeps wait, cleaned up rake preview and rake watch a bit 2011-08-25 10:05:22 -04:00
Benjamin R Doerr
efb7522491 Do not rely on system specifc syntax for preview or watch. 2011-08-23 22:56:06 -04:00
Benjamin R Doerr
5f08abe6dd Removes system specific File IO from Rakefile, rather we make use of FileUtils. 2011-08-22 23:05:55 -04:00
Ben Doerr
9d57455e0f Makes update_source and update_style much more windows friendly. 2011-08-23 03:22:18 -03:00
Brandon Mathis
599cd4e07c updated date now shows up properly 2011-08-22 17:24:02 -04:00
Brandon Mathis
282723ef3e updated Gemfile.lock, fixes #59 2011-08-22 17:14:37 -04:00
Brandon Mathis
806d27db13 using @extend for responsive blocks, added shadow-box mixin to utlities for configurable border shadow box styling, moved .left, .right, .center classes to .basic-alignment class for @extending as needed in layouts. Fixes #109 2011-08-22 16:29:08 -04:00
Scott Watermasysk
423e8ecbda Static Server based on Sinatra
Using Sinatra provides better handling of mime types and supports
304's/etc.

Also updated the Gemfile to exclude most gem outside of developemnt
(default).
2011-08-21 21:06:21 -04:00
Brandon Mathis
23f05c1158 Merge branch 'master' of github.com:imathis/octopress 2011-08-21 18:38:33 -04:00
Brandon Mathis
9f830dd96f added support for deploying "dot" files (eg. .htaccess), fixes #104 2011-08-21 18:38:18 -04:00
Brandon Mathis
9e5e6f604c Merge pull request #82 from jakemcc/7d6062b5eb3ebd2720fe5b836add73f9c88d2589
minor tweak to _typography.scss to have pp, code, and tt extend style that exists
2011-08-21 14:58:26 -07:00
Brandon Mathis
b40d2fb2a4 Merge branch 'master' of https://github.com/rwz/octopress into rwz-master 2011-08-21 16:37:14 -04:00
Brandon Mathis
11c6e1f7a7 include_code now defaults to relative urls for easy testing on a development server 2011-08-21 16:16:03 -04:00
Brandon Mathis
089af26b02 improved lang:language for codeblock and include code. It no longer strips out surrounding whitespace. 2011-08-21 10:31:58 -04:00
Brandon Mathis
83d87f98cc added option to force syntax highlighting language, example: {% include_code file lang:ruby %}. Fixes #108 2011-08-20 20:25:07 -04:00
Brandon Mathis
67211edd97 Merge branch 'master' of github.com:imathis/octopress 2011-08-20 18:40:07 -04:00
Brandon Mathis
358d02a4a7 centralized pygments aliases into pygments_code.rb. Added alias for .ru (ruby), which sort of fixes #108 2011-08-20 18:39:47 -04:00
Brandon Mathis
9e8eec332c added excerpt_link to article include. fixes #97 2011-08-20 17:31:22 -04:00
Brandon Mathis
596ec87c37 now only excerpted articles show the "read on" link. Also the text for that link can be set in the _config.yml 2011-08-20 16:02:50 -04:00
Pavel Pravosud
5ec1f014a0 added stringex gem for permalink url generation 2011-08-20 10:24:15 +07:00
Brandon Mathis
178a198ea7 updated blog theme to default to left aligned images. To center images, use classname "center" 2011-08-18 15:01:00 -04:00
Brandon Mathis
cf31601d4b reordered arguments in pagination 2011-08-18 14:30:59 -04:00
Brandon Mathis
ef4a42f977 Codeblock regex improved to better detect extensions fixes #96, added support for tableizing non highlighted code blocks from liquid codeblock tag and backtick code blocks 2011-08-16 02:41:28 -04:00
Brandon Mathis
59521e3db8 added blog_index_dir configuration and improved update_source 2011-08-16 01:50:34 -04:00
Brandon Mathis
ef5b0e8ad7 removed unusable blog_index partial 2011-08-16 00:45:26 -04:00
Brandon Mathis
1c555116be Added support for pagination with a blog index in any directory (helps with landing pages). Added configuration for pagination directory base 2011-08-16 00:43:22 -04:00
Brandon Mathis
a5f87149fe expand_urls now correctly matches urls pointing to the root directory, allowing / to be replaced with /subdir/ if site is configured with a different root directory 2011-08-16 00:43:07 -04:00
Brandon Mathis
33112a65a8 page layout will now accept pages without title metadata 2011-08-14 17:47:46 -04:00
Brandon Mathis
0b77a38704 Merge pull request #93 from fsdev-cmiller/master
Fix Code Text in Lists
2011-08-12 08:26:42 -07:00
Chris Miller
84e2fd5ead Code text works in lists now. 2011-08-12 08:41:49 -06:00
Brandon Mathis
80f95b8b6c Merge pull request #91 from brigham/extra-subdir
Fix extra subdirectories appearing in category links and atom.xml link.
2011-08-12 06:46:02 -07:00
Brigham Brown
648d4cc238 Fix extra subdirectories appearing in category links and atom.xml link. 2011-08-11 21:30:45 -07:00
Brandon Mathis
5958810eb2 Merge branch 'master' of github.com:imathis/octopress 2011-08-11 19:56:54 -04:00
Brandon Mathis
313c3859aa now using rack instead of Jekyll's webrick server, fixes #90 2011-08-11 19:56:25 -04:00
Brandon Mathis
2cd05cf2d1 Merge pull request #87 from marutanm/fix_rake-list
fix rake-list
2011-08-11 08:50:34 -07:00
marutanm
a817f99785 fix rake-list 2011-08-11 21:13:30 +09:00
Brandon Mathis
0e072543da added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html 2011-08-10 18:15:10 -04:00
Brandon Mathis
9c2f64d20c fixed issue where port setting didn't change jekyll's webbrick in _config.yml. Accidentally used port where I should have used server_port fixes #70 2011-08-07 12:18:58 -04:00
Jake McCrary
7d6062b5eb fixed @extend for pp, code, and tt. The @extend was extending a non-existant entry. 2011-08-06 23:19:00 -05:00
Brandon Mathis
3a599d4159 Merge pull request #73 from pilif/twitter-js-scope-fix
correctly scope locals
2011-08-04 16:03:21 -07:00
Philip Hofstetter
1860c23632 corrected fork skipping logic 2011-08-04 21:49:38 +02:00