diff --git a/Gemfile.lock b/Gemfile.lock index 62cc9e9..a5ff785 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,242 +1,119 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.10) + activesupport (4.2.6) i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.2) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.4.0) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.11.1) - colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.0.5) - dnsruby (1.61.2) - addressable (~> 2.5) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.11.0) + coffee-script-source (1.10.0) + colorator (0.1) + ethon (0.9.0) ffi (>= 1.3.0) - eventmachine (1.2.7) execjs (2.7.0) - faraday (0.15.3) + faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.25) - forwardable-extended (2.6.0) - gemoji (3.0.0) - github-pages (192) - activesupport (= 4.2.10) - github-pages-health-check (= 1.8.1) - jekyll (= 3.7.4) - jekyll-avatar (= 0.6.0) - jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.5) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.10.0) - jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.9.4) - jekyll-mentions (= 1.4.1) - jekyll-optional-front-matter (= 0.3.0) + ffi (1.9.10) + gemoji (2.1.0) + github-pages (80) + github-pages-health-check (= 1.1.0) + jekyll (= 3.1.6) + jekyll-coffeescript (= 1.0.1) + jekyll-feed (= 0.5.1) + jekyll-gist (= 1.4.0) + jekyll-github-metadata (= 1.11.1) + jekyll-mentions (= 1.1.2) jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.14.0) - jekyll-relative-links (= 0.5.3) - jekyll-remote-theme (= 0.3.1) - jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.5.0) - jekyll-sitemap (= 1.2.0) - jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.1) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.3) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) - jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.10.1) - kramdown (= 1.17.0) - liquid (= 4.0.0) - listen (= 3.1.5) + jekyll-redirect-from (= 0.10.0) + jekyll-sass-converter (= 1.3.0) + jekyll-seo-tag (= 1.4.0) + jekyll-sitemap (= 0.10.0) + jemoji (= 0.6.2) + kramdown (= 1.10.0) + liquid (= 3.0.6) + listen (= 3.0.6) mercenary (~> 0.3) - minima (= 2.5.0) - nokogiri (>= 1.8.2, < 2.0) - rouge (= 2.2.1) + rouge (= 1.10.1) terminal-table (~> 1.4) - github-pages-health-check (1.8.1) + github-pages-health-check (1.1.0) addressable (~> 2.3) - dnsruby (~> 1.60) + net-dns (~> 0.8) octokit (~> 4.0) - public_suffix (~> 2.0) - typhoeus (~> 1.3) - html-pipeline (2.8.4) - activesupport (>= 2) + public_suffix (~> 1.4) + typhoeus (~> 0.7) + html-pipeline (2.4.1) + activesupport (>= 2, < 5) nokogiri (>= 1.4) - http_parser.rb (0.6.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - jekyll (3.7.4) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 0.7) + i18n (0.7.0) + jekyll (3.1.6) + colorator (~> 0.1) jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 2.0) - kramdown (~> 1.14) - liquid (~> 4.0) + jekyll-watch (~> 1.1) + kramdown (~> 1.3) + liquid (~> 3.0) mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) - jekyll-coffeescript (1.1.1) + jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.2.0) - commonmarker (~> 0.14) - jekyll (>= 3.0, < 4.0) - jekyll-commonmark-ghpages (0.1.5) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1) - rouge (~> 2) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.10.0) - jekyll (~> 3.3) - jekyll-gist (1.5.0) + jekyll-feed (0.5.1) + jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (2.9.4) - jekyll (~> 3.1) - octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.4.1) + jekyll-github-metadata (1.11.1) + octokit (~> 4.0) + jekyll-mentions (1.1.2) html-pipeline (~> 2.3) jekyll (~> 3.0) - jekyll-optional-front-matter (0.3.0) - jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-readme-index (0.2.0) + jekyll-redirect-from (0.10.0) + jekyll (>= 2.0) + jekyll-sass-converter (1.3.0) + sass (~> 3.2) + jekyll-seo-tag (1.4.0) jekyll (~> 3.0) - jekyll-redirect-from (0.14.0) - jekyll (~> 3.3) - jekyll-relative-links (0.5.3) - jekyll (~> 3.3) - jekyll-remote-theme (0.3.1) - jekyll (~> 3.5) - rubyzip (>= 1.2.1, < 3.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-swiss (0.4.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.3) - jekyll (~> 3.5) - jekyll-github-metadata (~> 2.9) - jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.1) - jekyll (~> 3.3) - jekyll-watch (2.0.0) - listen (~> 3.0) - jemoji (0.10.1) - gemoji (~> 3.0) + jekyll-sitemap (0.10.0) + jekyll-watch (1.4.0) + listen (~> 3.0, < 3.1) + jemoji (0.6.2) + gemoji (~> 2.0) html-pipeline (~> 2.2) - jekyll (~> 3.0) - kramdown (1.17.0) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + jekyll (>= 3.0) + json (1.8.3) + kramdown (1.10.0) + liquid (3.0.6) + listen (3.0.6) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.3.0) - minima (2.5.0) - jekyll (~> 3.5) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - minitest (5.11.3) + mini_portile2 (2.0.0) + minitest (5.9.0) multipart-post (2.0.0) - nokogiri (1.8.4) - mini_portile2 (~> 2.3.0) - octokit (4.12.0) - sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.16.1) - forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rouge (2.2.1) - ruby-enum (0.7.2) - i18n - ruby_dep (1.5.0) - rubyzip (1.2.2) + net-dns (0.8.0) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + octokit (4.3.0) + sawyer (~> 0.7.0, >= 0.5.3) + public_suffix (1.5.3) + rb-fsevent (0.9.7) + rb-inotify (0.9.7) + ffi (>= 0.5.0) + rouge (1.10.1) safe_yaml (1.0.4) - sass (3.6.0) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.1) - addressable (>= 2.3.5, < 2.6) - faraday (~> 0.8, < 1.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - typhoeus (1.3.0) - ethon (>= 0.9.0) - tzinfo (1.2.5) + sass (3.4.22) + sawyer (0.7.0) + addressable (>= 2.3.5, < 2.5) + faraday (~> 0.8, < 0.10) + terminal-table (1.5.2) + thread_safe (0.3.5) + typhoeus (0.8.0) + ethon (>= 0.8.0) + tzinfo (1.2.2) thread_safe (~> 0.1) - unicode-display_width (1.4.0) PLATFORMS ruby @@ -245,4 +122,4 @@ DEPENDENCIES github-pages BUNDLED WITH - 1.16.2 + 1.13.0.rc.1 diff --git a/_includes/navbar.html b/_includes/navbar.html index c32cce0..bcac5cb 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -51,4 +51,3 @@ -
\ No newline at end of file diff --git a/css/base.scss b/css/base.scss index 0d7ccb5..22d1704 100644 --- a/css/base.scss +++ b/css/base.scss @@ -208,13 +208,6 @@ nav { } } -.nav-extra{ - display: block; -} -.nav-extra-hidden{ - display: none; -} - // ================ /NAV ================// // ============= HOME-HEADER ============= // diff --git a/js/application.js b/js/application.js index 30c24e9..e3d7544 100644 --- a/js/application.js +++ b/js/application.js @@ -1,120 +1,116 @@ -// // Your JavaScript -// $(function() { -// function gradeImage(){ -// var parent = $(this).parent(); -// var imgClass = (this.width/this.height > parent.width()/parent.height()) ? 'wide' : 'tall'; -// $(this).addClass(imgClass); -// console.log(this); -// } +// Your JavaScript +$(function() { + function gradeImage(){ + var parent = $(this).parent(); + var imgClass = (this.width/this.height > parent.width()/parent.height()) ? 'wide' : 'tall'; + $(this).addClass(imgClass); + console.log(this); + } -// $('.img-center-fill').each(function () { -// if(this.complete) { -// gradeImage.call(this); -// } -// else { -// this.addEventListener('load', gradeImage); -// } -// }); + $('.img-center-fill').each(function () { + if(this.complete) { + gradeImage.call(this); + } + else { + this.addEventListener('load', gradeImage); + } + }); -// /* -// var switchPos = $('#new-articles').position().top + $('#new-articles').height(); + /* + var switchPos = $('#new-articles').position().top + $('#new-articles').height(); -// $(window).scroll(function() { -// var scroll = $(window).scrollTop(); -// if (scroll >= switchPos) { -// $(".navbar-wrapper").addClass("darken"); + $(window).scroll(function() { + var scroll = $(window).scrollTop(); + if (scroll >= switchPos) { + $(".navbar-wrapper").addClass("darken"); -// } else { -// $(".navbar-wrapper").removeClass("darken"); -// } -// }); -// */ + } else { + $(".navbar-wrapper").removeClass("darken"); + } + }); + */ -// ;(function($, window, document, undefined) { -// 'use strict'; + ;(function($, window, document, undefined) { + 'use strict'; -// var elSelector = '.navbar-wrapper', -// elClassHidden = 'navbar--hidden', -// elextranav = '.extra-nav', -// elextranavHidden='.extra-nav-hidden', -// throttleTimeout = 250, -// $element = $( elSelector ); -// $nav = $( elextranavHidden ) + var elSelector = '.navbar-wrapper', + elClassHidden = 'navbar--hidden', + throttleTimeout = 250, + $element = $( elSelector ); -// if(!$element.length) return true; + if(!$element.length) return true; -// var $window = $( window ), -// wHeight = 0, -// wScrollCurrent = 0, -// wScrollBefore = 0, -// wScrollDiff = 0, -// $document = $( document ), -// dHeight = 0, + var $window = $( window ), + wHeight = 0, + wScrollCurrent = 0, + wScrollBefore = 0, + wScrollDiff = 0, + $document = $( document ), + dHeight = 0, -// throttle = function(delay, fn) { -// var last, deferTimer; -// return function() { -// var context = this, args = arguments, now = +new Date; -// if( last && now < last + delay ) { -// clearTimeout( deferTimer ); -// deferTimer = setTimeout( function(){ last = now; fn.apply( context, args ); }, delay ); + throttle = function(delay, fn) { + var last, deferTimer; + return function() { + var context = this, args = arguments, now = +new Date; + if( last && now < last + delay ) { + clearTimeout( deferTimer ); + deferTimer = setTimeout( function(){ last = now; fn.apply( context, args ); }, delay ); -// } -// else { -// last = now; -// fn.apply( context, args ); -// } -// }; -// }; + } + else { + last = now; + fn.apply( context, args ); + } + }; + }; -// $window.on( 'scroll', throttle( throttleTimeout, function() { -// dHeight = $document.height(); -// wHeight = $window.height(); -// wScrollCurrent = $window.scrollTop(); -// wScrollDiff = wScrollBefore - wScrollCurrent; + $window.on( 'scroll', throttle( throttleTimeout, function() { + dHeight = $document.height(); + wHeight = $window.height(); + wScrollCurrent = $window.scrollTop(); + wScrollDiff = wScrollBefore - wScrollCurrent; -// if(wScrollCurrent <= 0) { // scrolled to the very top; element sticks to the top -// $element.removeClass(elClassHidden); -// $element.removeClass(elClassTop); -// $nav.addClass(elextranav); -// } + if(wScrollCurrent <= 0) { // scrolled to the very top; element sticks to the top + $element.removeClass(elClassHidden); + $element.removeClass(elClassTop); + } -// else if(wScrollDiff > 10 && $element.hasClass(elClassHidden)) // scrolled up; element slides in -// $element.removeClass( elClassHidden ); + else if(wScrollDiff > 10 && $element.hasClass(elClassHidden)) // scrolled up; element slides in + $element.removeClass( elClassHidden ); -// else if(wScrollDiff < -10) {// scrolled down -// if(wScrollCurrent + wHeight >= dHeight && $element.hasClass(elClassHidden)) // scrolled to the very bottom; element slides in -// $element.removeClass( elClassHidden ); + else if(wScrollDiff < -10) {// scrolled down + if(wScrollCurrent + wHeight >= dHeight && $element.hasClass(elClassHidden)) // scrolled to the very bottom; element slides in + $element.removeClass( elClassHidden ); -// else // scrolled down; element slides out -// $element.addClass( elClassHidden ); + else // scrolled down; element slides out + $element.addClass( elClassHidden ); -// } + } -// wScrollBefore = wScrollCurrent; -// })); + wScrollBefore = wScrollCurrent; + })); -// })( jQuery, window, document ); -// }); + })( jQuery, window, document ); +}); -// function onYouTubeIframeAPIReady() { -// $('.youtube-video').each(function() { -// var id = $(this).data('id'); +function onYouTubeIframeAPIReady() { + $('.youtube-video').each(function() { + var id = $(this).data('id'); -// var player = new YT.Player('youtube-video-' + id, { -// events: { -// 'onStateChange': onPlayerStateChange -// } -// }); + var player = new YT.Player('youtube-video-' + id, { + events: { + 'onStateChange': onPlayerStateChange + } + }); -// function onPlayerStateChange(event) { -// if(event.data === YT.PlayerState.ENDED || event.data === YT.PlayerState.PAUSED) -// $('#youtube-title-' + id).show(); -// else -// $('#youtube-title-' + id).hide(); -// } + function onPlayerStateChange(event) { + if(event.data === YT.PlayerState.ENDED || event.data === YT.PlayerState.PAUSED) + $('#youtube-title-' + id).show(); + else + $('#youtube-title-' + id).hide(); + } -// }); -// } + }); +}