rekahsoft
/
blog-rekahsoft-ca
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Bump to Hakyll 4.6 and clean up 

Signed-off-by: Collin J. Doering <rekahsoft@gmail.com>
This commit is contained in:
Collin J. Doering 2014-12-16 01:34:04 -05:00 committed by Collin J. Doering
parent db3bddea81
commit 496e0d5396
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ site
_site _site
_cache _cache
dist dist
cabal.sandbox.config

2
blog-rekahsoft-ca.cabal
View File

@ -62,7 +62,7 @@ executable blog-rekahsoft-ca
-- Other library packages from which modules are imported. -- Other library packages from which modules are imported.
build-depends: base >=4.7 && <4.8, build-depends: base >=4.7 && <4.8,
hakyll >=4.5, hakyll >=4.6,
pandoc >= 1.13, pandoc >= 1.13,
parsec >= 3.1, parsec >= 3.1,
filepath >= 1.3, filepath >= 1.3,

9
js/default.js
View File

@ -91,10 +91,13 @@
$('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active'); $('#nav-menu li a[href="./pages/blog.html"]').parent('li').addClass('active');
} else { // otherwise assume its a page } else { // otherwise assume its a page
// Check if the page_href is empty or / and if so goto home // Check if the page_href is empty or / and if so goto home
if (page_href === '/' || page_href === '') { if (page_href === '/') {
page_href = '/home.html'; page_href = '/home.html';
} else if (blog_page_regexp.test(page_href)) { } else if (blog_page_regexp.test(page_href)) {
// If page_href refers to a blog page set the if (page_href === "/blog.html")
page_href = "/blog1.html";
// If page_href refers to a blog page set Blog to be the active menu item
$('a.menuitem[rel="address:/blog.html"]').closest('ul').find('li.active').removeClass('active'); $('a.menuitem[rel="address:/blog.html"]').closest('ul').find('li.active').removeClass('active');
$('a.menuitem[rel="address:/blog.html"]').closest('li').addClass('active'); $('a.menuitem[rel="address:/blog.html"]').closest('li').addClass('active');
} }
@ -114,7 +117,7 @@
dataType: 'html', dataType: 'html',
beforeSend: function (xhr, settings) { beforeSend: function (xhr, settings) {
// Add .loading to #page-content and #nav to facilitate a loading animation // Add .loading to #page-content and #nav to facilitate a loading animation
$('#page-content, #nav').removeClass('loading-done').addClass('loading'); $('#page-content, #nav').removeClass('loading-done').removeClass('loading-error').addClass('loading');
console.log('beforeSend a.menuitem'); console.log('beforeSend a.menuitem');
}, },

2
pages/home.markdown
View File

@ -71,7 +71,7 @@ $section$
[Skeleton]: http://www.getskeleton.com/ [Skeleton]: http://www.getskeleton.com/
[JQuery]: http://jquery.com [JQuery]: http://jquery.com
[JQuery-address]: https://github.com/asual/jquery-address [JQuery-address]: https://github.com/asual/jquery-address
[Sass]:http://sass-lang.com/ [Sass]: http://sass-lang.com/
[Haml]: http://haml.info/ [Haml]: http://haml.info/
[Bourbon]: http://bourbon.io/ [Bourbon]: http://bourbon.io/
[MathJax]: http://www.mathjax.org/ [MathJax]: http://www.mathjax.org/

2
posts/website-almost-complete.markdown
View File

@ -10,6 +10,8 @@ tags: general
[This](/) website is almost done. Well..the content and theming still need to be completed, but [This](/) website is almost done. Well..the content and theming still need to be completed, but
for the most part things are complete. for the most part things are complete.
Testing links: [first post](/posts/first-post.html)
Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our
atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts
approaching synchronization. What is the strength of the ship's deflector shields at maximum approaching synchronization. What is the strength of the ship's deflector shields at maximum

4
sass/default.sass
View File

@ -92,8 +92,10 @@ sub
@include transition(opacity 1s ease-in 0.5s) @include transition(opacity 1s ease-in 0.5s)
opacity: 1 opacity: 1
// TODO: this needs work
#page-content.loading-error #page-content.loading-error
// do something //background: url('/images/error-loading.png') no-repeat 50%
//height: 200px
#page-content.init.loading #page-content.init.loading
background: url('/images/init-loading.gif') no-repeat 50% background: url('/images/init-loading.gif') no-repeat 50%