Commit Graph

304 Commits

Author SHA1 Message Date
Brandon Mathis
d40eaab07c Switched out ender.js in favor of jQuery. Some small improvements to sidebar feed scripts 2012-05-24 23:03:59 -05:00
Brandon Mathis
6c8b51bd16 Merge branch '2.1' into site 2012-05-24 22:49:13 -05:00
Maxwell Swadling
b69e876828 Fixed paths in GitHub api lists from using api urls instead of HTML urls.
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-24 22:48:51 -05:00
Maxwell Swadling
693fc29572 Updated GitHub repos list to use GitHub Api v3
Signed-off-by: Brandon Mathis <brandon@imathis.com>
2012-05-24 22:48:51 -05:00
Brandon Mathis
409897f209 Merge branch '2.1' into site 2012-05-24 15:42:40 -05:00
Brandon Mathis
e81e1c8289 Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages 2012-05-24 10:18:28 -05:00
Brandon Mathis
1eca86fa3f Merge branch '2.1' into site 2012-05-22 21:19:07 -05:00
Brandon Mathis
47573af6c6 Improved mobile navigation injection script to work when search is not present. Fixes #380 2012-05-22 21:18:55 -05:00
Brandon Mathis
7e5ae5ecd8 Merge branch '2.1' into site-2.1 2012-05-22 17:15:30 -05:00
Brandon Mathis
91e26fe430 Added a .nojekyll file for speedier GitHub pages generation 2012-05-22 17:14:44 -05:00
Brandon Mathis
61a4169593 Merge branch '2.1' into site-2.1 2012-05-22 11:29:15 -05:00
Brandon Mathis
82386a0426 Merge branch 'master' into 2.1
Conflicts:
	.themes/classic/source/_includes/article.html
2012-05-22 09:28:59 -05:00
Brandon Mathis
c9d3b0e288 Merge pull request #499 from lukekarrys/patch-1
Don't display comments link for post excerpts on index page when comments for that post are set to false
2012-05-21 23:13:28 -07:00
Brandon Mathis
0f1be647cf Merge branch '2.1' into site-2.1 2012-05-21 23:58:36 -05:00
Brandon Mathis
03aa250b96 Merge pull request #571 from xuhdev/2.1-404-quote-char
weird quote character in the 404 page
2012-05-21 21:58:05 -07:00
Brandon Mathis
29a05c931f Added a generator meta tag. closes #465 2012-05-21 23:56:45 -05:00
Brandon Mathis
b07e533d4a Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description
Conflicts:

	.themes/classic/source/_includes/head.html
2012-05-21 23:54:21 -05:00
Brandon Mathis
b785a87869 Removed page content reading meta description. It was pointless. Set a description in your site or page yaml to add a meta description 2012-05-21 23:47:27 -05:00
Hong Xu
910734359d Fix a weird character in the 404 page. 2012-05-22 10:56:15 +08:00
Brandon Mathis
860094feba Merge branch '2.1' into site-2.1 2012-05-20 23:40:31 -05:00
Brandon Mathis
42369ddf5d fixed class name attribute on linklog posts 2012-05-20 23:40:17 -05:00
Brandon Mathis
ad40321eff Merge branch '2.1' into site-2.1 2012-05-20 22:23:42 -05:00
Brandon Mathis
741107291b Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375 2012-05-20 22:23:18 -05:00
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
Luke Karrys
8b8fff3b03 Don't display comments link for post excerpts on index page when comments for that post are set to false. 2012-03-23 13:06:01 -07: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
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