Commit graph

252 commits

Author SHA1 Message Date
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
Michael Rose
20c3bff223 Update README.md 2013-07-13 23:33:02 -04:00
Michael Rose
36a2506bc8 Merge branch 'master' into develop 2013-07-12 16:33:37 -04:00
Michael Rose
14c86514cc Merge branch 'hotfix/optimize' 2013-07-12 16:33:04 -04:00
Michael Rose
94b1dde9a3 Merge branch 'hotfix/optimize' into develop 2013-07-12 16:33:04 -04:00
Michael Rose
7c8f24849f Change source order of AdobeEdge fonts and CSS in head 2013-07-12 16:32:53 -04:00
Michael Rose
93253f9d4e Add setup instructions for new and existing Jekyll sites 2013-07-12 16:17:51 -04:00
Michael Rose
4d4a1f7ab7 Merge branch 'hotfix/404-update' into develop 2013-07-10 11:47:07 -04:00
Michael Rose
c48d22d2da Merge branch 'hotfix/404-update' 2013-07-10 11:47:06 -04:00
Michael Rose
7be79eab52 Update documentation 2013-07-10 11:45:41 -04:00
Michael Rose
e35eb08f7e Merge branch 'develop' 2013-07-10 11:33:37 -04:00
Michael Rose
2e673e1d65 Add custom 404 page 2013-07-10 11:31:00 -04:00
Michael Rose
474cbb4bbe Merge branch 'hotfix/entry-date' 2013-07-03 13:57:26 -04:00
Michael Rose
fe5448f973 Merge branch 'hotfix/entry-date' into develop 2013-07-03 13:57:26 -04:00
Michael Rose
f04ad3e517 Hide .entry-date on small viewports 2013-07-03 13:57:15 -04:00