Commit Graph

230 Commits

Author SHA1 Message Date
Brandon Mathis
91cfd16d38 Merge branch '2.1' into site-2.1 2012-05-20 17:27:34 -05:00
Nathan Manzi
e334e832de Added disqus developer mode functionality
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-20 17:20:32 -05:00
Brandon Mathis
bc717eafe2 Merge branch '2.1' into site 2012-05-19 17:00:33 -05:00
Brandon Mathis
73b7e2094e Merge branch 'master' into 2.1 2012-05-19 14:56:16 -05:00
Brandon Mathis
d71223c675 updated to latest version of Sass, fixed deprecation warnings 2012-05-19 14:48:37 -05:00
Brandon Mathis
f954689bb6 Improved styling for linklog along with other scss refactoring.
Feed urls are more flexible with linklog items
2012-04-29 19:03:52 -05:00
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