166 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Rose	0abbf60184	Merge branch 'hotfix/schema' into develop	2013-07-29 15:33:08 -04:00
Michael Rose	599aa3a6fe	Merge branch 'hotfix/schema'	2013-07-29 15:33:08 -04:00
Michael Rose	97ac5c82ea	Cleanup schema items	2013-07-29 15:32:58 -04:00
Michael Rose	779c15831d	Merge branch 'hotfix/alt-font' into develop	2013-07-29 07:45:20 -04:00
Michael Rose	7278cd673f	Merge branch 'hotfix/alt-font'	2013-07-29 07:45:20 -04:00
Michael Rose	07191f4706	Compile main.less to reflect corrected @alt-font variable	2013-07-29 07:45:03 -04:00
Michael Rose	0c38fabd8d	Merge branch 'master' into develop	2013-07-29 07:43:20 -04:00
Michael Rose	c1d8b7cf53	Merge pull request #18 from jhubert/patch-1 ... Change the @alt-font from volkhorn to volkhov	2013-07-29 04:39:14 -07:00
Jeremy Baker	daaaa9409f	Change the @alt-font from volkhorn to volkhov ... In _head.html we're loading volkhov.js from edgefonts, but in variables.less it was referencing volkorn. I don't see volkorn loaded anywhere, so I'm assuming it's a typo.	2013-07-29 00:05:39 -07:00
Michael Rose	0e0930b009	Merge branch 'hotfix/updates' into develop	2013-07-26 11:05:32 -04:00
Michael Rose	5a42e01f04	Merge branch 'hotfix/updates'	2013-07-26 11:05:32 -04:00
Michael Rose	7e569b3bed	Lighten body text color	2013-07-26 11:05:10 -04:00
Michael Rose	da970a1acf	Alter top navigation hover state	2013-07-26 11:03:17 -04:00
Michael Rose	9e441f770a	Merge branch 'master' into develop	2013-07-22 09:01:43 -04:00
Michael Rose	7881e40679	Merge pull request #17 from Japh/master ... Fixed issue with entire list HTML being output for each list item	2013-07-22 06:01:15 -07:00
Japh	0032d2e8c8	Fixed issue with entire list HTML being output for each list item	2013-07-22 13:37:25 +10:00
Michael Rose	04903f3b04	Merge branch 'master' into develop	2013-07-19 15:21:11 -04:00
Michael Rose	86a2c410fc	Merge pull request #16 from tuix/master ... Added stackexchange icon to footer	2013-07-19 12:20:35 -07:00
Mohsen Nosratinia	7082fe29d4	Added stackexchange icon to footer ... Also minor fix in google+ link in footer (no title/2 targets)	2013-07-19 18:12:29 +02:00
Michael Rose	675290e20a	Merge branch 'hotfix/navigation-links' into develop	2013-07-19 08:54:07 -04:00
Michael Rose	45ad6525b6	Merge branch 'hotfix/navigation-links'	2013-07-19 08:54:06 -04:00
Michael Rose	a03b50d88c	Make nav button links and feed icon clickable. Fixes #15	2013-07-19 08:53:50 -04:00
Michael Rose	8d2441c6c1	Make feed icon clickable	2013-07-19 08:45:46 -04:00
Michael Rose	aa6ed3dbee	Merge branch 'develop' ... * develop: Small edit to Disqus include if statement	2013-07-18 22:28:27 -04:00
Michael Rose	59df695b6e	Small edit to Disqus include if statement	2013-07-18 22:19:16 -04:00
Michael Rose	3e3439854d	Merge branch 'hotfix/minor'	2013-07-18 11:30:54 -04:00
Michael Rose	799873ed55	Merge branch 'hotfix/minor' into develop	2013-07-18 11:30:54 -04:00
Michael Rose	0f4275ee94	Merge branch 'master' into develop	2013-07-18 11:30:40 -04:00
Michael Rose	53285970c4	Load Disqus comments when shortname and comments: true are defined	2013-07-18 11:29:49 -04:00
Michael Rose	daa1e2884c	Merge pull request #13 from tylerrhodes/fix-test-compilation ... Add test and spec to the exclude.	2013-07-18 08:18:32 -07:00
Tyler Rhodes	b49e304ede	Add test and spec to the exclude.	2013-07-18 09:34:07 -05:00
Michael Rose	46b2d46edd	Merge branch 'master' into develop ... # By Michael Rose (1) and Tyler Rhodes (1) * master: Undo merged pull request 15d6754bef Add 'vendor' to excludes.	2013-07-17 22:42:18 -04:00
Michael Rose	1c171087ce	Undo merged pull request 15d6754bef ... Excluding vendor folder causes issues with JavaScript that the theme needs to load.	2013-07-17 22:39:53 -04:00
Michael Rose	15d6754bef	Merge pull request #12 from tylerrhodes/master ... Add 'vendor' to excludes.	2013-07-17 18:59:00 -07:00
Tyler Rhodes	c21b4e5807	Add 'vendor' to excludes.	2013-07-17 12:39:35 -05:00
Michael Rose	8c417f7d41	Merge branch 'hotfix/minor' into develop	2013-07-17 09:06:08 -04:00
Michael Rose	a44332de38	Merge branch 'hotfix/minor'	2013-07-17 09:06:07 -04:00
Michael Rose	a35c746e89	Fix endif typo	2013-07-17 09:05:58 -04:00
Michael Rose	f85d3865bb	Optional Twitter cards meta	2013-07-17 09:03:39 -04:00
Michael Rose	4452f5c739	Fix optional Google Analytics.	2013-07-17 09:02:00 -04:00
Michael Rose	55bf042ee1	Merge branch 'master' into develop ... # By Diego Caro # Via Michael Rose (2) and Diego Caro (1) * master: Improving readability for users without CSS: adding a space between title and date. Optional Analytics Flickr link	2013-07-16 22:53:21 -04:00
Michael Rose	37961a0507	Merge pull request #11 from diegocaro/master ... Minor changes	2013-07-16 19:33:47 -07:00
Diego Caro	0ddf75bb57	Improving readability for users without CSS: adding a space between title and date.	2013-07-16 22:06:26 -04:00
Diego Caro	8a5eb10b21	Optional Analytics	2013-07-16 22:04:40 -04:00
Diego Caro	631cb5cf7c	Flickr link	2013-07-16 22:04:26 -04:00
Michael Rose	26f380e863	Merge branch 'hotfix/updates' into develop	2013-07-16 15:40:32 -04:00
Michael Rose	1b238f1d6a	Merge branch 'hotfix/updates'	2013-07-16 15:40:32 -04:00
Michael Rose	a8b030cf56	Make _config.yml more generic	2013-07-16 15:40:18 -04:00
Michael Rose	33d9f8272e	Remove reference to Texture Lovers image.	2013-07-16 15:34:59 -04:00
Michael Rose	f0a3ff8725	Merge branch 'master' into develop ... * master: Update README.md	2013-07-13 23:33:47 -04:00