Commit Graph

274 Commits

Author SHA1 Message Date
Brandon Mathis
14a8bc05b3 Merge branch 'master' of github.com:imathis/octopress into site 2012-03-07 22:45:39 -06:00
Brandon Mathis
8013163d00 Merge branch 'master' of github.com:imathis/octopress into linklog 2012-03-07 22:42:09 -06:00
Brandon Mathis
9f40242b1e Merge pull request #376 from robertkowalski/clrf
Fix CRLF, closes #374
2012-03-07 13:40:54 -08:00
Brandon Mathis
a814ca76ea Merge branch 'master' of github.com:imathis/octopress into linklog 2012-02-19 15:12:19 -06:00
Brandon Mathis
a8c9fb8d7a Merge pull request #427 from joliss/typo
Fix typo
2012-02-19 11:26:41 -08:00
Fletcher Tomalty
4b8aeb2774 Github -> GitHub (capitalization) 2012-02-19 01:40:53 -05:00
Brandon Mathis
895504f274 added support for excerpting feed articles, added linklog support to category feed, refactored feeds to reduce duplication 2012-02-18 22:45:40 -06:00
Brandon Mathis
107a4af528 moved the category_feed out of _includes/custom to _layouts/ 2012-02-18 15:28:06 -06:00
Brandon Mathis
36bbdb6dfe fixed variable accessing permalink label in atom.xml 2012-02-18 15:01:42 -06:00
Brandon Mathis
2cf6e5b2b9 removed puts from article partial, testing fragment (sorry) 2012-02-18 14:58:12 -06:00
Jo Liss
08bafd61fd Fix typo 2012-02-15 20:19:00 +01:00
Brandon Mathis
7c7d3b8476 Now RSS feed always has a permalink at the end of an article, just like
posts always show permalinks.
2012-02-14 14:52:30 -06:00
Brandon Mathis
382c557e21 fixed bug where all posts showed "read more" link 2012-02-12 20:04:42 -06:00
Brandon Mathis
55c5f8d4c1 added setting for marking standard blog posts 2012-02-12 17:42:09 -06:00
Brandon Mathis
41c87bef4c added title and variable partials to blog index page 2012-02-12 13:16:18 -06:00
Brandon Mathis
23c876021e Refactored the template a bit more and improved blog and archive styling for linklogs 2012-02-12 12:27:17 -06:00
Brandon Mathis
101a503f5a Added linklog publishing. 2012-02-12 07:12:22 -06:00
Robert Kowalski
6dacdbf3fd Fix CRLF, closes #374 2012-01-14 23:17:59 +01:00
Brandon Mathis
1bd24edba5 Merge branch 'site' of github.com:imathis/octopress into site
Conflicts:
	source/_includes/head.html
2012-01-08 19:58:52 -06:00
Brandon Mathis
930747f06f Fix for annoying overflow scroll issues caused by facebook and twitter share/follow widgets. 2012-01-08 19:56:55 -06:00
Brandon Mathis
ef148b28e2 Fix for annoying overflow scroll issues caused by facebook and twitter share/follow widgets. 2012-01-08 19:54:17 -06:00
Brandon Mathis
34173ec3f5 Merge branch 'master' into site
Conflicts:
	.themes/classic/source/javascripts/github.js
	Rakefile
	_config.yml
2012-01-08 17:29:25 -06:00
hSATAC
a5a16b4039 Fix delicious widget js error
JS error occured when there's no tags on bookmarks
Check if it's an empty string before join item[i].t
2011-12-21 10:53:32 +08:00
Brandon Mathis
479d36332c Merge branch 'master' into site
Conflicts:
	_config.yml
2011-12-19 10:39:51 -06:00
Aditya Shevade
11bdf8ab66 Removed redeclaration of sidebar-border. 2011-12-12 21:31:21 -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
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
19c18ad300 updated to latest 2011-12-10 18:48:43 -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
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
Nikolay Sturm
6bf5258f1f nested lists should not have a margin-bottom 2011-12-02 16:04:36 +01: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
Jake McCrary
c1e6ad5ed3 Make header font size customizable.
Change $header-font-size variable to specify size.
2011-11-17 21:21:26 -06: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
a11e92b2ae Fix custom colors -bg-back, closes #269 2011-11-11 07:40:45 +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
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
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
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
81e814a354 Remove unsupported 'updated' flag from _includes/post/date.html
Jekyll does not support this value for Page or Post classes. The
capture returned an empty Sting, which was always evaluated to true
in '{% if updated %}'.
2011-10-18 17:39:19 +02:00
Frederic Hemberger
c2a68cc2a9 Make post's date output configurable via _config.yml, closes #164
A new config variable 'date_format' is introduced in _config.yml.
It can either be set to "ordinal" to use the current format or it
can be given a string complying to strftime() format identifiers.
2011-10-18 17:25:31 +02:00
Frederic Hemberger
ff7099207b Moves Google Analytics to <head> allowing verification for Google Webmaster Tools, fixes #204 2011-10-17 20:34:13 +02:00
Frederic Hemberger
35a598df03 Adds support for Google+ widget, supports author information in search results, fixes #203 2011-10-17 20:14:29 +02:00
Frederic Hemberger
1362e9d57b Removes <nav> for Pagination links, fixes #216 2011-10-17 18:50:28 +02:00
Jimmy Tang
6d0ee69091 fix typo in scss template 2011-10-16 23:28:37 +01:00
Frederic Hemberger
b1ad2a3d8a Fixes solarized colors, fixes #219 2011-10-16 14:45:35 +02:00
Frederic Hemberger
2812bf7c3e Adds prev/next link below post, fixes #218 2011-10-16 14:27:21 +02:00
Frederic Hemberger
d84daa2a88 Merge pull request #201 from mikl/category-feeds
Adds per-category Atom feeds.
2011-10-16 04:58:14 -07:00
Frederic Hemberger
21803814bc Adds parameter for left aligned pullquotes, fixes #215 2011-10-16 13:37:06 +02:00
Frederic Hemberger
2dedad6176 Merge branch 'master' of https://github.com/strand/octopress into strand/octopress 2011-10-16 13:19:42 +02:00
Frederic Hemberger
d98a4de07e Makes titlecase of page/post titles configurable 2011-10-16 11:57:29 +02:00
B Strand
2e7bc43cf7 Reverted previous commit. 2011-10-13 11:32:58 -07:00
B Strand
5b0486ced1 Separated citation style from the general blockquote style. The general blockquote style is great for nesting and indentation, while the citation is excellent for quote attribution. 2011-10-12 13:28:58 -07:00
B Strand
490b2593ec Renamed has-pullquote and has-pullquoteleft classes to pullquote-right and pullquote-left (I suppose a less stylistic naming convention might pullquote-default and pullquote-alternate.) 2011-10-12 11:17:24 -07:00
strand
ce6604a15e Edited .themes/classic/sass/base/_typography.scss via GitHub 2011-10-11 16:09:38 -07:00
Frederic Hemberger
13babc6d7d Merge pull request #210 from xdworks/294accde545a7213b274c5b625b44a17ed72e0f3
Facebook Like button integration, fixes #176
2011-10-11 05:29:09 -07:00
xdite
294accde54 facebook like option 2011-10-09 16:36:53 +08:00
Drew Wells
734ee1f31e As other things rely on these variables, they need to be global.
Fixes issues with comments not loading on the blog.  
Semicolons non-optional due to SAFE function http://twitter.com/#!/elijahmanor/status/121980870428069890
2011-10-09 04:14:27 -03:00
Frederic Hemberger
e4df98317a Fixes delicious API url after moving from Yahoo! to AVOS, fixes #179 2011-10-06 18:31:49 +02:00
Mikkel Hoegh
e1d680ff11 Fixed duplicate title. 2011-10-06 11:54:03 +02:00
Mikkel Hoegh
66916f57a7 First attempt at creating per-category Atom feeds. 2011-10-05 00:27:17 +02:00
Frederic Hemberger
6315527b2f Adds CDATA sections to atom.xml, fixes #198 2011-10-04 19:18:40 +02:00
Mikkel Hoegh
f4a6bd2a68 Add generator tag to Atom feed.
generator is an optional element, but let's give credit where it's due.
Besides, it can be helpful to feed consumers to know what tool generated the file.
2011-10-04 00:24:16 +02:00
Aleksey Gureiev
63c3ba6514 Proper atom feed xml escaping 2011-10-02 09:05:54 +03:00
Brandon Mathis
ff2009577d improved support for solarized light theme 2011-10-01 15:57:40 -05:00
Brandon Mathis
2cbc9d579b improved support for solarized light theme 2011-10-01 15:57:02 -05:00
Frederic Hemberger
2f7d9f3896 Fixes flow for sidebar three column mode 2011-09-30 15:27:06 +02:00
Brandon Mathis
898b149dda removed console.log from twitter.js #facepalm 2011-09-29 19:59:06 -05:00
Brandon Mathis
3d6cd62100 removed console.log from twitter.js #facepalm 2011-09-29 19:58:53 -05:00
Brandon Mathis
579142c28b fixed issue with expanded twitter urls, fixed issue where twitter would report seven day old tweets as "false" 2011-09-29 19:55:23 -05:00
Brandon Mathis
ef05e67a46 fixed issue with expanded twitter urls, fixed issue where twitter would report seven day old tweets as "false" 2011-09-29 19:55:11 -05:00
Brandon Mathis
d0d1e2a98d updated github.js to use reqwest.js with Ender 2011-09-29 16:06:09 -05:00
Brandon Mathis
c0cc4c9d6d updated github.js to use reqwest.js with Ender 2011-09-29 16:05:43 -05:00
Brandon Mathis
b19e7698f6 added support for adding content to the bottom of a page 2011-09-29 14:51:26 -05:00
Brandon Mathis
0e4b0d725a added support for adding content to the bottom of a page 2011-09-29 14:51:09 -05:00
Brandon Mathis
9cf956cc96 added buffer for mentions in twitter stream 2011-09-28 00:53:54 -05:00
Brandon Mathis
9477747f6b added buffer for mentions in twitter stream 2011-09-28 00:53:31 -05:00
Brandon Mathis
347c954894 updated added reqwest to ender.js, fixed twitter.js url expansion bug 2011-09-27 23:51:01 -05:00
Brandon Mathis
89ff181c38 updated added reqwest to ender.js, fixed twitter.js url expansion bug 2011-09-27 23:50:08 -05:00
Brandon Mathis
04586299b1 fixed github line numbering issue, fixed a few bugs in code block styling 2011-09-27 00:58:07 -05:00
Brandon Mathis
63d642d017 fixed github line numbering issue, fixed a few bugs in code block styling 2011-09-27 00:57:45 -05:00
Brandon Mathis
02433114c5 Merge branch 'master' of github.com:imathis/octopress 2011-09-26 09:12:03 -05:00
Brandon Mathis
7a7825f667 collapse sidebar is now possible site-wide 2011-09-26 09:11:40 -05:00
Brandon Mathis
96cdce5c30 collapse sidebar is now possible site-wide 2011-09-26 09:11:14 -05:00
Frederic Hemberger
ab62bb9355 jsHint'ed octopress.js 2011-09-26 14:41:39 +02:00
Frederic Hemberger
569717abdc jsHint'ed github.js 2011-09-26 14:37:01 +02:00
Frederic Hemberger
40a7809d65 Fixes delicious integration #179 2011-09-26 14:19:47 +02:00