From 0d5f24ddf93722bf037ff8257b83b75ea6d3f4b8 Mon Sep 17 00:00:00 2001 From: Plailect Date: Tue, 22 Nov 2016 20:29:35 -0500 Subject: [PATCH] mm 4.0.9 --- .editorconfig | 13 -- .gitattributes | 5 - .gitignore | 6 +- Gemfile | 24 +-- Gemfile.lock | 122 ++++------- _config.yml | 2 +- _data/navigation.yml | 1 - _data/ui-text.yml | 101 ++++++++-- _includes/archive-single.html | 10 +- _includes/author-profile.html | 163 +++++++++++---- _includes/breadcrumbs.html | 8 +- _includes/category-list.html | 6 +- _includes/comments-providers/discourse.html | 5 +- _includes/comments.html | 12 +- _includes/feature_row | 8 +- _includes/figure | 12 ++ _includes/gallery | 10 +- _includes/head.html | 4 +- _includes/masthead.html | 10 +- _includes/nav_list | 19 +- _includes/page__hero.html | 10 +- _includes/page__taxonomy.html | 4 +- _includes/paginator.html | 18 +- _includes/post_pagination.html | 8 +- _includes/read-time.html | 18 +- _includes/scripts.html | 2 +- _includes/seo.html | 10 +- _includes/sidebar.html | 6 +- _includes/social-share.html | 10 +- _includes/tag-list.html | 6 +- _layouts/archive-taxonomy.html | 3 +- _layouts/home.html | 11 + _layouts/single-no-ads.html | 84 ++++++++ _layouts/single.html | 190 +++++++++--------- _pages/404.md | 5 +- _pages/Donations.md | 1 + _pages/Home.md | 2 +- _pages/Why-Ads.md | 1 + _sass/_navigation.scss | 137 +++++++++++-- _sass/_sidebar.scss | 11 +- _sass/_variables.scss | 176 ++++++++-------- assets/css/main.scss | 56 +++++- assets/js/main.min.js | 10 +- assets/js/plugins/jquery.greedy-navigation.js | 2 +- minimal-mistakes-jekyll.gemspec | 28 +++ package.json | 2 +- 46 files changed, 831 insertions(+), 521 deletions(-) delete mode 100644 .editorconfig delete mode 100644 .gitattributes create mode 100644 _includes/figure create mode 100644 _layouts/home.html create mode 100644 _layouts/single-no-ads.html create mode 100644 minimal-mistakes-jekyll.gemspec diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 3a287c451..000000000 --- a/.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -# editorconfig.org -root = true - -[*] -indent_style = space -indent_size = 2 -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = false - -[*.md] -trim_trailing_whitespace = false diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index ebe019920..000000000 --- a/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -_assets/css/vendor/* linguist-vendored -_assets/js/plugins/* linguist-vendored -_assets/js/vendor/* linguist-vendored -assets/fonts/* linguist-vendored -assets/js/vendor/* linguist-vendored \ No newline at end of file diff --git a/.gitignore b/.gitignore index 26e8776ee..3dfbdc099 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,15 @@ +*.gem *.sublime-project *.sublime-workspace +.bundle .DS_Store .jekyll-metadata .sass-cache _asset_bundler_cache _site codekit-config.json +example/_site +Gemfile.lock node_modules npm-debug.log* -vendor/ +vendor diff --git a/Gemfile b/Gemfile index 6c08bcf0d..3be9c3cd8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,24 +1,2 @@ source "https://rubygems.org" - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! - -gem "github-pages", group: :jekyll_plugins - -# If you want to use Jekyll native, uncomment the line below. -# To upgrade, run `bundle update`. - -# gem "jekyll" - -gem "wdm", "~> 0.1.0" if Gem.win_platform? - -# If you have any plugins, put them here! -group :jekyll_plugins do - # gem "jekyll-archives" -end \ No newline at end of file +gemspec diff --git a/Gemfile.lock b/Gemfile.lock index 0152c3a8e..a0e321cbc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,60 +1,38 @@ +PATH + remote: . + specs: + minimal-mistakes-jekyll (4.0.9) + jekyll (~> 3.3) + jekyll-feed (~> 0.8) + jekyll-gist (~> 1.4) + jekyll-paginate (~> 1.1) + jekyll-sitemap (~> 0.12) + jemoji (~> 0.7) + GEM remote: https://rubygems.org/ specs: - activesupport (4.2.7) + activesupport (4.2.7.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.4.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.10.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) colorator (1.1.0) - ethon (0.9.0) - ffi (>= 1.3.0) - execjs (2.7.0) - faraday (0.9.2) + faraday (0.10.0) multipart-post (>= 1.2, < 3) ffi (1.9.14) ffi (1.9.14-x64-mingw32) forwardable-extended (2.6.0) gemoji (2.1.0) - github-pages (96) - activesupport (= 4.2.7) - github-pages-health-check (= 1.2.0) - jekyll (= 3.2.1) - jekyll-coffeescript (= 1.0.1) - jekyll-feed (= 0.5.1) - jekyll-gist (= 1.4.0) - jekyll-github-metadata (= 2.0.2) - jekyll-mentions (= 1.2.0) - jekyll-paginate (= 1.1.0) - jekyll-redirect-from (= 0.11.0) - jekyll-sass-converter (= 1.3.0) - jekyll-seo-tag (= 2.0.0) - jekyll-sitemap (= 0.10.0) - jemoji (= 0.7.0) - kramdown (= 1.11.1) - liquid (= 3.0.6) - listen (= 3.0.6) - mercenary (~> 0.3) - minima (= 1.2.0) - rouge (= 1.11.1) - terminal-table (~> 1.4) - github-pages-health-check (1.2.0) - addressable (~> 2.3) - net-dns (~> 0.8) - octokit (~> 4.0) - public_suffix (~> 1.4) - typhoeus (~> 0.7) html-pipeline (2.4.2) activesupport (>= 2) nokogiri (>= 1.4) i18n (0.7.0) - jekyll (3.2.1) + jekyll (3.3.1) + addressable (~> 2.4) colorator (~> 1.0) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -64,26 +42,15 @@ GEM pathutil (~> 0.9) rouge (~> 1.7) safe_yaml (~> 1.0) - jekyll-coffeescript (1.0.1) - coffee-script (~> 2.2) - jekyll-feed (0.5.1) + jekyll-feed (0.8.0) + jekyll (~> 3.3) jekyll-gist (1.4.0) octokit (~> 4.2) - jekyll-github-metadata (2.0.2) - jekyll (~> 3.1) - octokit (~> 4.0) - jekyll-mentions (1.2.0) - activesupport (~> 4.0) - html-pipeline (~> 2.3) - jekyll (~> 3.0) jekyll-paginate (1.1.0) - jekyll-redirect-from (0.11.0) - jekyll (>= 2.0) - jekyll-sass-converter (1.3.0) - sass (~> 3.2) - jekyll-seo-tag (2.0.0) - jekyll (~> 3.1) - jekyll-sitemap (0.10.0) + jekyll-sass-converter (1.5.0) + sass (~> 3.4) + jekyll-sitemap (0.12.0) + jekyll (~> 3.3) jekyll-watch (1.5.0) listen (~> 3.0, < 3.1) jemoji (0.7.0) @@ -92,53 +59,46 @@ GEM html-pipeline (~> 2.2) jekyll (>= 3.0) json (1.8.3) - kramdown (1.11.1) + kramdown (1.13.0) liquid (3.0.6) - listen (3.0.6) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9.7) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) mercenary (0.3.6) mini_portile2 (2.1.0) - minima (1.2.0) - minitest (5.9.0) + minitest (5.9.1) multipart-post (2.0.0) - net-dns (0.8.0) - nokogiri (1.6.8) + nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nokogiri (1.6.8-x64-mingw32) + nokogiri (1.6.8.1-x64-mingw32) mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - octokit (4.3.0) - sawyer (~> 0.7.0, >= 0.5.3) + octokit (4.6.2) + sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.14.0) forwardable-extended (~> 2.6) - pkg-config (1.1.7) - public_suffix (1.5.3) - rb-fsevent (0.9.7) + public_suffix (2.0.4) + rake (10.5.0) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.22) - sawyer (0.7.0) - addressable (>= 2.3.5, < 2.5) - faraday (~> 0.8, < 0.10) - terminal-table (1.7.2) - unicode-display_width (~> 1.1.1) + sawyer (0.8.1) + addressable (>= 2.3.5, < 2.6) + faraday (~> 0.8, < 1.0) 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.1.1) PLATFORMS ruby x64-mingw32 DEPENDENCIES - github-pages + bundler (~> 1.12) + minimal-mistakes-jekyll! + rake (~> 10.0) BUNDLED WITH 1.13.6 diff --git a/_config.yml b/_config.yml index 93c972f86..dc5443a88 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,7 @@ comments: colorscheme : # "light" (default), "dark" staticman: allowedFields : ['name', 'email', 'url', 'message'] - branch : # "master", "gh-pages" + branch : "master" commitMessage : "New comment." filename : comment-{@timestamp} format : "yml" diff --git a/_data/navigation.yml b/_data/navigation.yml index 83d60364b..7f7d78889 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -23,4 +23,3 @@ main: - title: "OTP Info" url: /otp-info - diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 68c0476d9..90d232a12 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -8,6 +8,7 @@ en: &DEFAULT_EN pagination_next : "Next" breadcrumb_home_label : "Home" breadcrumb_separator : "/" + menu_label : "Toggle Menu" toc_label : "On This Page" ext_link_label : "Direct Link" less_than : "less than" @@ -56,6 +57,7 @@ es: &DEFAULT_ES pagination_next : "Siguiente" breadcrumb_home_label : "Inicio" breadcrumb_separator : "/" + menu_label : toc_label : "Contenidos" ext_link_label : "Enlace" less_than : "menos de" @@ -100,6 +102,7 @@ fr: &DEFAULT_FR pagination_next : "Suivant" breadcrumb_home_label : "Accueil" breadcrumb_separator : "/" + menu_label : toc_label : "Sur cette page" ext_link_label : "Lien direct" less_than : "plus petit que" @@ -147,6 +150,7 @@ tr: &DEFAULT_TR pagination_next : "Sonraki" breadcrumb_home_label : "Ana Sayfa" breadcrumb_separator : "/" + menu_label : toc_label : "İçindekiler" ext_link_label : "Doğrudan Bağlantı" less_than : "Şu süreden az: " @@ -157,7 +161,7 @@ tr: &DEFAULT_TR categories_label : "Kategoriler:" date_label : "Güncelleme tarihi:" comments_label : "Yorum yapın" - comments_title : + comments_title : "Yorumlar" more_label : "Daha fazlasını öğrenin" related_label : "Bunlar ilginizi çekebilir:" follow_label : "Takip et:" @@ -167,17 +171,17 @@ tr: &DEFAULT_TR email_label : "E-posta" recent_posts : "Son yazılar" undefined_wpm : "_config.yml dosyasında tanımlanmamış words_per_minute parametresi" - comment_form_info : - comment_form_comment_label : - comment_form_md_info : - comment_form_name_label : - comment_form_email_label : - comment_form_website_label : - comment_btn_submit : - comment_btn_submitted : - comment_success_msg : - comment_error_msg : - loading_label : + comment_form_info : "Email adresiniz gösterilmeyecektir. Zorunlu alanlar işaretlenmiştir" + comment_form_comment_label : "Yorumunuz" + comment_form_md_info : "Markdown desteklenmektedir." + comment_form_name_label : "Adınız" + comment_form_email_label : "Email adresiniz" + comment_form_website_label : "Websiteniz (opsiyonel)" + comment_btn_submit : "Yorum Yap" + comment_btn_submitted : "Gönderildi" + comment_success_msg : "Yorumunuz için teşekkürler! Yorumunuz onaylandıktan sonra sitede gösterilecektir." + comment_error_msg : "Maalesef bir hata oluştu. Lütfen zorunlu olan tüm alanları doldurduğunuzdan emin olun ve sonrasında tekrar deneyin." + loading_label : "Yükleniyor..." tr-TR: <<: *DEFAULT_TR @@ -189,6 +193,7 @@ pt: &DEFAULT_PT pagination_next : "Seguinte" breadcrumb_home_label : "Início" breadcrumb_separator : "/" + menu_label : toc_label : "Nesta Página" ext_link_label : "Link Direto" less_than : "menos de" @@ -227,6 +232,7 @@ pt-BR: pagination_next : "Próxima" breadcrumb_home_label : "Home" breadcrumb_separator : "/" + menu_label : toc_label : "Nesta página" ext_link_label : "Link direto" less_than : "meno que" @@ -269,6 +275,7 @@ it: &DEFAULT_IT pagination_next : "Prossima" breadcrumb_home_label : "Home" breadcrumb_separator : "/" + menu_label : toc_label : "Indice della pagina" ext_link_label : "Link" less_than : "meno di" @@ -311,6 +318,7 @@ zh: &DEFAULT_ZH pagination_next : "向后" breadcrumb_home_label : "首页" breadcrumb_separator : "/" + menu_label : toc_label : "在本页上" ext_link_label : "直接链接" less_than : "少于" @@ -342,14 +350,67 @@ zh: &DEFAULT_ZH comment_success_msg : "Thanks for your comment! It will show on the site once it has been approved." comment_error_msg : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again." loading_label : "Loading..." - zh-CN: - <<: *DEFAULT_ZH - zh-HK: - <<: *DEFAULT_ZH - zh-SG: - <<: *DEFAULT_ZH - zh-TW: - <<: *DEFAULT_ZH +zh-CN: + <<: *DEFAULT_ZH +zh-HK: + <<: *DEFAULT_ZH +zh-SG: + <<: *DEFAULT_ZH +zh-TW: + <<: *DEFAULT_ZH + +# German / Deutsch +# ----------------- +de: &DEFAULT_DE + page : "Seite" + pagination_previous : "Vorherige" + pagination_next : "Nächste" + breadcrumb_home_label : "Home" + breadcrumb_separator : "/" + menu_label : + toc_label : "Auf dieser Seite" + ext_link_label : "Direkter Link" + less_than : "weniger als" + minute_read : "Minuten zum lesen" + share_on_label : "Teilen auf" + meta_label : + tags_label : "Tags:" + categories_label : "Kategorien:" + date_label : "Aktualisiert:" + comments_label : "Hinterlassen sie einen Kommentar" + comments_title : "Kommentare" + more_label : "Mehr anzeigen" + related_label : "Ihnen gefällt vielleicht auch" + follow_label : "Folgen:" + feed_label : "Feed" + powered_by : "Powered by" + website_label : "Webseite" + email_label : "E-Mail" + recent_posts : "Aktuelle Beiträge" + undefined_wpm : "Undefinierter Parameter words_per_minute in _config.yml" + comment_form_info : "Ihre E-Mail Adresse wird nicht veröffentlicht. Benötigte Felder sind markiert" + comment_form_comment_label : "Kommentar" + comment_form_md_info : "Markdown wird unterstützt." + comment_form_name_label : "Name" + comment_form_email_label : "E-Mail Addresse" + comment_form_website_label : "Webseite (optional)" + comment_btn_submit : "Kommentar absenden" + comment_btn_submitted : "Versendet" + comment_success_msg : "Danke für ihren Kommentar! Er wird auf der Seite angezeigt, nachdem er geprüft wurde." + comment_error_msg : "Entschuldigung, es gab einen Fehler. Bitte füllen sie alle benötigten Felder aus und versuchen sie es erneut." + loading_label : "Lade..." +de-DE: + <<: *DEFAULT_DE +de-AT: + <<: *DEFAULT_DE +de-CH: + <<: *DEFAULT_DE +de-BE: + <<: *DEFAULT_DE +de-LI: + <<: *DEFAULT_DE +de-LU: + <<: *DEFAULT_DE # Another locale # -------------- diff --git a/_includes/archive-single.html b/_includes/archive-single.html index e904447fc..dc9ac7375 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% if post.header.teaser %} {% capture teaser %}{{ post.header.teaser }}{% endcapture %} {% else %} @@ -20,16 +18,16 @@ {% if teaser contains "://" %} "{{ teaser }}" {% else %} - "{{ teaser | prepend: "/images/" | prepend: base_path }}" + "{{ teaser | absolute_url }}" {% endif %} alt=""> {% endif %}

{% if post.link %} - {{ title }} Permalink + {{ title }} Permalink {% else %} - {{ title }} + {{ title }} {% endif %}

{% if post.read_time %} @@ -37,4 +35,4 @@ {% endif %} {% if post.excerpt %}

{{ post.excerpt | markdownify | strip_html | truncate: 160 }}

{% endif %} - \ No newline at end of file + diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 510a1ba97..f6637c8fd 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -1,101 +1,190 @@ -{% include base_path %} - {% if page.author and site.data.authors[page.author] %} - {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.author %} + {% assign author = site.data.authors[page.author] %} +{% else %} + {% assign author = site.author %} {% endif %}
-
- {% if author.avatar contains "://" %} - {{ author.name }} - {% else %} - {{ author.name }} - {% endif %} -
+ {% if author.avatar %} +
+ {% if author.avatar contains "://" %} + {{ author.name }} + {% else %} + {{ author.name }} + {% endif %} +
+ {% endif %}
-

{{ author.name }}

- {% if author.bio %}

{{ author.bio }}

{% endif %} +

{{ author.name }}

+ {% if author.bio %} +

+ {{ author.bio }} +

+ {% endif %}
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html index 2b9f7a9e3..11ec35648 100644 --- a/_includes/breadcrumbs.html +++ b/_includes/breadcrumbs.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% case site.categories.type %} {% when "liquid" %} {% assign path_type = "#" %} @@ -21,7 +19,7 @@ {% for crumb in crumbs offset: 1 %} {% if forloop.first %}
  • - {{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }} + {{ site.data.ui-text[site.locale].breadcrumb_home_label | default: "Home" }}
    • {{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }} @@ -31,11 +29,11 @@ {% else %} {% assign i = i | plus: 1 %}
  • - {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }} + {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
    • {{ site.data.ui-text[site.locale].breadcrumb_separator | default: "/" }} {% endif %} {% endfor %} - \ No newline at end of file + diff --git a/_includes/category-list.html b/_includes/category-list.html index 4c274270a..f37fbf83f 100644 --- a/_includes/category-list.html +++ b/_includes/category-list.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% case site.category_archive.type %} {% when "liquid" %} {% assign path_type = "#" %} @@ -21,8 +19,8 @@ {% for hash in category_hashes %} {% assign keyValue = hash | split: '#' %} {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} + {% unless forloop.last %}, {% endunless %} {% endfor %}

    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html index 1d23b6f21..8484b2f9c 100644 --- a/_includes/comments-providers/discourse.html +++ b/_includes/comments-providers/discourse.html @@ -1,6 +1,5 @@ {% if site.comments.discourse.server %} -{% include base_path %} -{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} +{% capture canonical %}{% if site.permalink contains '.html' %}{{ page.url | absolute_url }}{% else %}{{ page.url | absolute_url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/comments.html b/_includes/comments.html index 39b4983bb..9d04fbcc0 100644 --- a/_includes/comments.html +++ b/_includes/comments.html @@ -1,5 +1,3 @@ -{% include base_path %} -
    {% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %} {% case site.comments.provider %} @@ -8,12 +6,12 @@
    {% when "facebook" %}

    {{ comments_label }}

    -
    +
    {% when "google-plus" %}

    {{ comments_label }}

    -
    Loading Google+ Comments ...
    +
    Loading Google+ Comments ...
    {% when "staticman" %} -
    +
    {% if site.repository and site.staticman.branch %}
    @@ -77,6 +75,6 @@ {% endif %}
    {% when "custom" %} -
    +
    {% endcase %} -
    \ No newline at end of file +
    diff --git a/_includes/feature_row b/_includes/feature_row index b84f36b21..bd0b6b2bc 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -1,5 +1,3 @@ -{% include base_path %} - {% if include.id %} {% assign feature_row = page.[include.id] %} {% else %} @@ -13,7 +11,7 @@ {% if f.url contains "://" %} {% capture f_url %}{{ f.url }}{% endcapture %} {% else %} - {% capture f_url %}{{ f.url | prepend: base_path }}{% endcapture %} + {% capture f_url %}{{ f.url | absolute_url }}{% endcapture %} {% endif %}
    @@ -24,7 +22,7 @@ {% if f.image_path contains "://" %} "{{ f.image_path }}" {% else %} - "{{ f.image_path | prepend: "/images/" | prepend: base_path }}" + "{{ f.image_path | absolute_url }}" {% endif %} alt="{% if f.alt %}{{ f.alt }}{% endif %}">
    @@ -49,4 +47,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/_includes/figure b/_includes/figure new file mode 100644 index 000000000..da829e48f --- /dev/null +++ b/_includes/figure @@ -0,0 +1,12 @@ +
    + {% if include.alt %}{{ include.alt }}{% endif %} + {% if include.caption %} +
    {{ include.caption | markdownify | remove: "

    " | remove: "

    " }}
    + {% endif %} +
    diff --git a/_includes/gallery b/_includes/gallery index 4d271ee92..cb68ddd51 100644 --- a/_includes/gallery +++ b/_includes/gallery @@ -1,5 +1,3 @@ -{% include base_path %} - {% if include.id %} {% assign gallery = page.[include.id] %} {% else %} @@ -21,7 +19,7 @@ {% if img.url contains "://" %} "{{ img.url }}" {% else %} - "{{ img.url | prepend: "/images/" | prepend: base_path }}" + "{{ img.url | absolute_url }}" {% endif %} {% if img.title %}title="{{ img.title }}"{% endif %} > @@ -29,7 +27,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/images/" | prepend: base_path }}" + "{{ img.image_path | absolute_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> @@ -38,7 +36,7 @@ {% if img.image_path contains "://" %} "{{ img.image_path }}" {% else %} - "{{ img.image_path | prepend: "/images/" | prepend: base_path }}" + "{{ img.image_path | absolute_url }}" {% endif %} alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% endif %} @@ -46,4 +44,4 @@ {% if include.caption %}
    {{ include.caption | markdownify | remove: "

    " | remove: "

    " }}
    {% endif %} - \ No newline at end of file + diff --git a/_includes/head.html b/_includes/head.html index 3da00624c..82afbdb3b 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% include seo.html %} @@ -16,6 +14,6 @@ - + diff --git a/_includes/masthead.html b/_includes/masthead.html index ffef5594f..2c77426af 100644 --- a/_includes/masthead.html +++ b/_includes/masthead.html @@ -1,17 +1,15 @@ -{% include base_path %} -
    -
    \ No newline at end of file + diff --git a/_includes/nav_list b/_includes/nav_list index 91228ba8e..36cfa9125 100644 --- a/_includes/nav_list +++ b/_includes/nav_list @@ -1,17 +1,18 @@ -{% include base_path %} {% assign navigation = site.data.navigation[include.nav] %} \ No newline at end of file + diff --git a/_includes/page__hero.html b/_includes/page__hero.html index cd0fa9fd7..8936e3afd 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -1,21 +1,19 @@ -{% include base_path %} - {% if page.header.image contains "://" %} {% capture img_path %}{{ page.header.image }}{% endcapture %} {% else %} - {% capture img_path %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endcapture %} + {% capture img_path %}{{ page.header.image | absolute_url }}{% endcapture %} {% endif %} {% if page.header.cta_url contains "://" %} {% capture cta_path %}{{ page.header.cta_url }}{% endcapture %} {% else %} - {% capture cta_path %}{{ page.header.cta_url | prepend: base_path }}{% endcapture %} + {% capture cta_path %}{{ page.header.cta_url | absolute_url }}{% endcapture %} {% endif %} {% if page.header.overlay_image contains "://" %} {% capture overlay_img_path %}{{ page.header.overlay_image }}{% endcapture %} {% elsif page.header.overlay_image %} - {% capture overlay_img_path %}{{ page.header.overlay_image | prepend: "/images/" | prepend: base_path }}{% endcapture %} + {% capture overlay_img_path %}{{ page.header.overlay_image | absolute_url }}{% endcapture %} {% endif %} {% if page.header.overlay_filter contains "rgba" %} @@ -52,4 +50,4 @@ {% if page.header.caption %} {{ page.header.caption | markdownify | remove: "

    " | remove: "

    " }}     {% endif %} - \ No newline at end of file + diff --git a/_includes/page__taxonomy.html b/_includes/page__taxonomy.html index 5a0c39fc0..f10b2026a 100644 --- a/_includes/page__taxonomy.html +++ b/_includes/page__taxonomy.html @@ -1,9 +1,7 @@ -{% include base_path %} - {% if site.tag_archive.type and page.tags[0] %} {% include tag-list.html %} {% endif %} {% if site.category_archive.type and page.categories[0] %} {% include category-list.html %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/paginator.html b/_includes/paginator.html index 2924f9a8f..efe3fe141 100644 --- a/_includes/paginator.html +++ b/_includes/paginator.html @@ -1,14 +1,12 @@ -{% include base_path %} - {% if paginator.total_pages > 1 %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/post_pagination.html b/_includes/post_pagination.html index cb2005ea9..902d2bc27 100644 --- a/_includes/post_pagination.html +++ b/_includes/post_pagination.html @@ -1,16 +1,14 @@ -{% include base_path %} - {% if page.previous or page.next %} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/read-time.html b/_includes/read-time.html index a45043c10..e8b47cd7a 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -1,17 +1,15 @@ +{% assign words_per_minute = site.words_per_minute | default: 200 %} + {% if post.read_time %} {% assign words = post.content | strip_html | number_of_words %} {% elsif page.read_time %} {% assign words = page.content | strip_html | number_of_words %} {% endif %} -{% if site.words_per_minute %} - {% if words < 180 %} - {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% elsif words < 360 %} - 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% else %} - {{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% endif %} +{% if words < 180 %} + {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} +{% elsif words < 360 %} + 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} {% else %} - {{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }} -{% endif %} \ No newline at end of file + {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} +{% endif %} diff --git a/_includes/scripts.html b/_includes/scripts.html index 138d271e2..844de82dd 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -1,4 +1,4 @@ - + {% include analytics.html %} {% include /comments-providers/scripts.html %} diff --git a/_includes/seo.html b/_includes/seo.html index 190fcb27f..f33014512 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% if site.url %} {% assign seo_url = site.url | append: site.baseurl %} @@ -25,6 +23,8 @@ {% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %} {% endif %} + + {% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %} {% if seo_author %} {% if seo_author.twitter %} @@ -60,13 +60,13 @@ {% if page.header.image %} - + {% else %} {% if page.header.teaser %} - + {% elsif site.og_image %} - + {% endif %} {% endif %} diff --git a/_includes/sidebar.html b/_includes/sidebar.html index b8ee39ab4..4ab6ef7a6 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% if page.author_profile or layout.author_profile or page.sidebar %}
    {% if page.author_profile or layout.author_profile %}{% include author-profile.html %}{% endif %} @@ -10,7 +8,7 @@ {% if s.image contains "://" %} "{{ s.image }}" {% else %} - "{{ s.image | prepend: "/images/" | prepend: base_path }}" + "{{ s.image | absolute_url }}" {% endif %} alt="{% if s.image_alt %}{{ s.image_alt }}{% endif %}"> {% endif %} @@ -22,4 +20,4 @@ {% endif %} {% endif %}
    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_includes/social-share.html b/_includes/social-share.html index 2a05d50e9..dbf769ef2 100644 --- a/_includes/social-share.html +++ b/_includes/social-share.html @@ -1,15 +1,13 @@ -{% include base_path %} -
    {% if site.data.ui-text[site.locale].share_on_label %} {% endif %} - + - + - Google+ + Google+ - LinkedIn + LinkedIn
    diff --git a/_includes/tag-list.html b/_includes/tag-list.html index 80fcff3ed..aa5a4fdd1 100644 --- a/_includes/tag-list.html +++ b/_includes/tag-list.html @@ -1,5 +1,3 @@ -{% include base_path %} - {% case site.tag_archive.type %} {% when "liquid" %} {% assign path_type = "#" %} @@ -21,8 +19,8 @@ {% for hash in tag_hashes %} {% assign keyValue = hash | split: '#' %} {% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} + {% unless forloop.last %}, {% endunless %} {% endfor %}

    -{% endif %} \ No newline at end of file +{% endif %} diff --git a/_layouts/archive-taxonomy.html b/_layouts/archive-taxonomy.html index 4d5827f19..a9087a2b7 100644 --- a/_layouts/archive-taxonomy.html +++ b/_layouts/archive-taxonomy.html @@ -8,9 +8,8 @@ author_profile: false

    {{ page.title }}

    - {% include base_path %} {% for post in page.posts %} {% include archive-single.html %} {% endfor %}
    - \ No newline at end of file + diff --git a/_layouts/home.html b/_layouts/home.html new file mode 100644 index 000000000..bcce92aba --- /dev/null +++ b/_layouts/home.html @@ -0,0 +1,11 @@ +--- +layout: archive +--- + +

    {{ site.data.ui-text[site.locale].recent_posts | default: "Recent Posts" }}

    + +{% for post in paginator.posts %} + {% include archive-single.html %} +{% endfor %} + +{% include paginator.html %} diff --git a/_layouts/single-no-ads.html b/_layouts/single-no-ads.html new file mode 100644 index 000000000..32f5019de --- /dev/null +++ b/_layouts/single-no-ads.html @@ -0,0 +1,84 @@ +--- +layout: default +--- + +{% include base_path %} + +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} + {% include page__hero.html %} +{% endif %} + +{% if page.url != "/" and site.breadcrumbs %} + {% unless paginator %} + {% include breadcrumbs.html %} + {% endunless %} +{% endif %} + +
    + {% include sidebar.html %} + +
    + {% if page.title %}{% endif %} + {% if page.excerpt %}{% endif %} + {% if page.date %}{% endif %} + {% if page.modified %}{% endif %} + +
    + {% unless page.header.overlay_color or page.header.overlay_image %} +
    + {% if page.title %}

    {{ page.title | markdownify | remove: "

    " | remove: "

    " }}

    {% endif %} + {% if page.read_time %} +

    {% include read-time.html %}

    + {% endif %} +
    + {% endunless %} + +
    + {{ content }} + {% if page.link %}{% endif %} + +
    + +
    For support, ask for help at #3dshacks on Rizon IRC or 3DS Hacking on Discord.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    + +
    + +
    + +
    + {% if site.data.ui-text[site.locale].meta_label %} +

    {{ site.data.ui-text[site.locale].meta_label }}

    + {% endif %} + {% include page__taxonomy.html %} + {% if page.modified %} +

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    + {% elsif page.date %} +

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    + {% endif %} +
    + + {% if page.share %}{% include social-share.html %}{% endif %} + + {% include post_pagination.html %} +
    + + {% if site.comments.provider and page.comments %} + {% include comments.html %} + {% endif %} + +
    + + {% comment %}{% endcomment %} + {% if page.id and page.related and site.related_posts.size > 0 %} +
    + {% if site.data.ui-text[site.locale].related_label %} +

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    + {% endif %} +
    + {% for post in site.related_posts limit:4 %} + {% include archive-single.html type="grid" %} + {% endfor %} +
    +
    + {% endif %} +
    diff --git a/_layouts/single.html b/_layouts/single.html index df38f64da..c28706a83 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -1,95 +1,95 @@ ---- -layout: default ---- - -{% include base_path %} - -{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} - {% include page__hero.html %} -{% endif %} - -{% if page.url != "/" and site.breadcrumbs %} - {% unless paginator %} - {% include breadcrumbs.html %} - {% endunless %} -{% endif %} - -
    - {% include sidebar.html %} - -
    - {% if page.title %}{% endif %} - {% if page.excerpt %}{% endif %} - {% if page.date %}{% endif %} - {% if page.modified %}{% endif %} - -
    - {% unless page.header.overlay_color or page.header.overlay_image %} -
    - {% if page.title %}

    {{ page.title | markdownify | remove: "

    " | remove: "

    " }}

    {% endif %} - {% if page.read_time %} -

    {% include read-time.html %}

    - {% endif %} -
    - {% endunless %} - -
    - {{ content }} - {% if page.link %}{% endif %} - -
    - -
    For support, ask for help at #3dshacks on Rizon IRC or 3DS Hacking on Discord.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    - - - - - - -
    - -
    - -
    - {% if site.data.ui-text[site.locale].meta_label %} -

    {{ site.data.ui-text[site.locale].meta_label }}

    - {% endif %} - {% include page__taxonomy.html %} - {% if page.modified %} -

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    - {% elsif page.date %} -

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    - {% endif %} -
    - - {% if page.share %}{% include social-share.html %}{% endif %} - - {% include post_pagination.html %} -
    - - {% if site.comments.provider and page.comments %} - {% include comments.html %} - {% endif %} - -
    - - {% comment %}{% endcomment %} - {% if page.id and page.related and site.related_posts.size > 0 %} -
    - {% if site.data.ui-text[site.locale].related_label %} -

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    - {% endif %} -
    - {% for post in site.related_posts limit:4 %} - {% include archive-single.html type="grid" %} - {% endfor %} -
    -
    - {% endif %} -
    +--- +layout: default +--- + +{% include base_path %} + +{% if page.header.overlay_color or page.header.overlay_image or page.header.image %} + {% include page__hero.html %} +{% endif %} + +{% if page.url != "/" and site.breadcrumbs %} + {% unless paginator %} + {% include breadcrumbs.html %} + {% endunless %} +{% endif %} + +
    + {% include sidebar.html %} + +
    + {% if page.title %}{% endif %} + {% if page.excerpt %}{% endif %} + {% if page.date %}{% endif %} + {% if page.modified %}{% endif %} + +
    + {% unless page.header.overlay_color or page.header.overlay_image %} +
    + {% if page.title %}

    {{ page.title | markdownify | remove: "

    " | remove: "

    " }}

    {% endif %} + {% if page.read_time %} +

    {% include read-time.html %}

    + {% endif %} +
    + {% endunless %} + +
    + {{ content }} + {% if page.link %}{% endif %} + +
    + +
    For support, ask for help at #3dshacks on Rizon IRC or 3DS Hacking on Discord.
    If you appreciate this guide, I accept Donations through both Bitcoin and PayPal.
    + + + + + + +
    + +
    + +
    + {% if site.data.ui-text[site.locale].meta_label %} +

    {{ site.data.ui-text[site.locale].meta_label }}

    + {% endif %} + {% include page__taxonomy.html %} + {% if page.modified %} +

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    + {% elsif page.date %} +

    {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}

    + {% endif %} +
    + + {% if page.share %}{% include social-share.html %}{% endif %} + + {% include post_pagination.html %} +
    + + {% if site.comments.provider and page.comments %} + {% include comments.html %} + {% endif %} + +
    + + {% comment %}{% endcomment %} + {% if page.id and page.related and site.related_posts.size > 0 %} +
    + {% if site.data.ui-text[site.locale].related_label %} +

    {{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

    + {% endif %} +
    + {% for post in site.related_posts limit:4 %} + {% include archive-single.html type="grid" %} + {% endfor %} +
    +
    + {% endif %} +
    diff --git a/_pages/404.md b/_pages/404.md index 9f11618ab..56bbb1da2 100644 --- a/_pages/404.md +++ b/_pages/404.md @@ -1,9 +1,10 @@ --- title: "Page Not Found" -layout: single +layout: single-no-ads excerpt: "Page not found. Your pixels are in another canvas." sitemap: false permalink: /404.html --- -Sorry, but the page you were trying to view does not exist. +### Sorry, but the page you were trying to view does not exist. +{: .text-center} diff --git a/_pages/Donations.md b/_pages/Donations.md index e66415ddb..aede5ea0b 100644 --- a/_pages/Donations.md +++ b/_pages/Donations.md @@ -1,6 +1,7 @@ --- title: "Donations" permalink: /donations.html +layout: single-no-ads --- ## If you appreciate this guide, I accept donations. diff --git a/_pages/Home.md b/_pages/Home.md index 2ea37d4f3..083711a00 100644 --- a/_pages/Home.md +++ b/_pages/Home.md @@ -3,7 +3,7 @@ layout: splash permalink: / header: overlay_color: "#5e616c" - overlay_image: home-page-feature.jpg + overlay_image: images/home-page-feature.jpg overlay_filter: 0.5 cta_label: "Get Started" cta_url: "/get-started" diff --git a/_pages/Why-Ads.md b/_pages/Why-Ads.md index ffdb81467..d26218282 100644 --- a/_pages/Why-Ads.md +++ b/_pages/Why-Ads.md @@ -1,6 +1,7 @@ --- title: "Why Ads?" permalink: /why-ads.html +layout: single-no-ads --- This project is the culmination of hundreds upon hundreds of hours of constant work. diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss index 4d2a991ed..460ea20d8 100644 --- a/_sass/_navigation.scss +++ b/_sass/_navigation.scss @@ -131,7 +131,7 @@ font-weight: bold; text-align: center; text-decoration: none; - color: mix(#fff, $gray, 50%); + color: $link-color; border: 1px solid $light-gray; border-radius: $border-radius; @@ -236,9 +236,9 @@ width: 100%; -webkit-transition: $global-transition; transition: $global-transition; - -webkit-transform: scaleX(0); - -ms-transform: scaleX(0); - transform: scaleX(0); /* hide*/ + -webkit-transform: scaleX(0) translate3d(0, 0 , 0); + -ms-transform: scaleX(0) translate3d(0, 0 , 0); + transform: scaleX(0) translate3d(0, 0 , 0); /* hide*/ } &:hover:before { @@ -314,20 +314,104 @@ ========================================================================== */ .nav__list { - font-size: 1rem; + margin-bottom: 1.5em; - ul { - margin-bottom: 1em; + input[type="checkbox"], + label { + display: none; } - a { - display: block; - padding: 0.125em 0; - color: inherit; + @include breakpoint(max-width ($large - 1px)) { - &:hover { - text-decoration: underline; + label { + position: relative; + display: inline-block; + padding: 0.5em 2.5em 0.5em 1em; + color: $gray; + font-size: $type-size-6; + font-weight: bold; + border: 1px solid $light-gray; + border-radius: $border-radius; + z-index: 20; + -webkit-transition: 0.2s ease-out; + transition: 0.2s ease-out; + cursor: pointer; + + &:before, + &:after { + content: ''; + position: absolute; + right: 1em; + top: 1.25em; + width: 0.75em; + height: 0.125em; + line-height: 1; + background-color: $gray; + transition: 0.2s ease-out; + } + + &:after { + transform: rotate(90deg); + } + + &:hover { + color: #fff; + border-color: $gray; + background-color: mix(white, #000, 20%); + + &:before, + &:after { + background-color: #fff; + } + } } + + /* selected*/ + input:checked + label { + color: white; + background-color: mix(white, #000, 20%); + + &:before, + &:after { + background-color: #fff; + } + } + + // on hover show expand + label:hover:after { + transform: rotate(90deg); + } + + input:checked + label:hover:after { + transform: rotate(0); + } + + ul { + margin-bottom: 1em; + } + + a { + display: block; + padding: 0.25em 0; + + @include breakpoint($large) { + padding-top: 0.125em; + padding-bottom: 0.125em; + } + + &:hover { + text-decoration: underline; + } + } + } +} + +.nav__list .nav__items { + margin: 0; + font-size: 1.25rem; + + a { + color: inherit; } .active { @@ -343,6 +427,33 @@ color: #fff; } } + + @include breakpoint(max-width ($large - 1px)) { + position: relative; + max-height: 0; + opacity: 0%; + overflow: hidden; + z-index: 10; + -webkit-transition: 0.3s ease-in-out; + transition: 0.3s ease-in-out; + -webkit-transform: translate(0, 10%); + -ms-transform: translate(0, 10%); + transform: translate(0, 10%); + } +} + +@include breakpoint(max-width ($large - 1px)) { + .nav__list input:checked ~ .nav__items { + -webkit-transition: 0.5s ease-in-out; + transition: 0.5s ease-in-out; + max-height: 9999px; // exaggerate max-height to accommodate tall lists + overflow: visible; + opacity: 1; + margin-top: 1em; + -webkit-transform: translate(0, 0); + -ms-transform: translate(0, 0); + transform: translate(0, 0); + } } .nav__title { diff --git a/_sass/_sidebar.scss b/_sass/_sidebar.scss index 377c62372..de892e1b4 100644 --- a/_sass/_sidebar.scss +++ b/_sass/_sidebar.scss @@ -7,6 +7,9 @@ ========================================================================== */ .sidebar { + -webkit-transform: translate3d(0, 0 , 0); + transform: translate3d(0, 0 , 0); + @include clearfix(); margin-bottom: 1em; @@ -14,7 +17,7 @@ @include span(2 of 12); opacity: 0.75; -webkit-transition: opacity 0.2s ease-in-out; - transition: opacity 0.2s ease-in-out; + transition: opacity 0.2s ease-in-out; &:hover { opacity: 1; @@ -30,10 +33,6 @@ font-family: $sans-serif-narrow; } - h3, h4 { - font-size: $type-size-5; - } - p, li { font-family: $sans-serif; font-size: $type-size-6; @@ -229,4 +228,4 @@ text-decoration: underline; } } -} \ No newline at end of file +} diff --git a/_sass/_variables.scss b/_sass/_variables.scss index 710c17bef..89af21514 100644 --- a/_sass/_variables.scss +++ b/_sass/_variables.scss @@ -6,141 +6,123 @@ Typography ========================================================================== */ -$doc-font-size : 16; +$doc-font-size : 16 !default; /* paragraph indention */ -$paragraph-indent : false; // true, false (default) -$indent-var : 1.3em; +$paragraph-indent : false !default; // true, false (default) +$indent-var : 1.3em !default; /* system typefaces */ -$serif : Georgia, Times, serif; -$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif; -$monospace : Monaco, Consolas, "Lucida Console", monospace; +$serif : Georgia, Times, serif !default; +$sans-serif : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif !default; +$monospace : Monaco, Consolas, "Lucida Console", monospace !default; /* sans serif typefaces */ -$sans-serif-narrow : $sans-serif; -$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif; +$sans-serif-narrow : $sans-serif !default; +$helvetica : Helvetica, "Helvetica Neue", Arial, sans-serif !default; /* serif typefaces */ -$georgia : Georgia, serif; -$times : Times, serif; -$bodoni : "Bodoni MT", serif; -$calisto : "Calisto MT", serif; -$garamond : Garamond, serif; +$georgia : Georgia, serif !default; +$times : Times, serif !default; +$bodoni : "Bodoni MT", serif !default; +$calisto : "Calisto MT", serif !default; +$garamond : Garamond, serif !default; -$global-font-family : $sans-serif; -$header-font-family : $sans-serif; -$caption-font-family : $serif; +$global-font-family : $sans-serif !default; +$header-font-family : $sans-serif !default; +$caption-font-family : $serif !default; /* type scale */ -$type-size-1 : 2.441em; // ~39.056px -$type-size-2 : 1.953em; // ~31.248px -$type-size-3 : 1.563em; // ~25.008px -$type-size-4 : 1.25em; // ~20px -$type-size-5 : .9em; // ~16px -$type-size-6 : 0.75em; // ~12px -$type-size-7 : 0.6875em; // ~11px -$type-size-8 : 0.625em; // ~10px +$type-size-1 : 2.441em !default; // ~39.056px +$type-size-2 : 1.953em !default; // ~31.248px +$type-size-3 : 1.563em !default; // ~25.008px +$type-size-4 : 1.25em !default; // ~20px +$type-size-5 : .9em !default; // ~16px +$type-size-6 : 0.75em !default; // ~12px +$type-size-7 : 0.6875em !default; // ~11px +$type-size-8 : 0.625em !default; // ~10px + /* Colors ========================================================================== */ -$gray : #7a8288; -$dark-gray : mix(#000, $gray, 40%); -$darker-gray : mix(#000, $gray, 60%); -$light-gray : mix(#fff, $gray, 50%); -$lighter-gray : mix(#fff, $gray, 90%); +$gray : #7a8288 !default; +$dark-gray : mix(#000, $gray, 40%) !default; +$darker-gray : mix(#000, $gray, 60%) !default; +$light-gray : mix(#fff, $gray, 50%) !default; +$lighter-gray : mix(#fff, $gray, 90%) !default; -$body-color : #fff; -$background-color : #fff; -$code-background-color : #fafafa; -$code-background-color-dark : $light-gray; -$text-color : $darker-gray; -$border-color : $lighter-gray; +$body-color : #fff !default; +$background-color : #fff !default; +$code-background-color : #fafafa !default; +$code-background-color-dark : $light-gray !default; +$text-color : $dark-gray !default; +$border-color : $lighter-gray !default; -$primary-color : #7a8288; -$success-color : #62c462; -$warning-color : #f89406; -$danger-color : #ee5f5b; -$info-color : #52adc8; +$primary-color : #7a8288 !default; +$success-color : #62c462 !default; +$warning-color : #f89406 !default; +$danger-color : #ee5f5b !default; +$info-color : #52adc8 !default; /* brands */ -$behance-color : #1769FF; -$dribbble-color : #ea4c89; -$facebook-color : #3b5998; -$flickr-color : #ff0084; -$foursquare-color : #0072b1; -$github-color : #171516; -$google-plus-color : #dd4b39; -$instagram-color : #517fa4; -$lastfm-color : #d51007; -$linkedin-color : #007bb6; -$pinterest-color : #cb2027; -$rss-color : #fa9b39; -$soundcloud-color : #ff3300; -$stackoverflow-color : #fe7a15; -$tumblr-color : #32506d; -$twitter-color : #55acee; -$vimeo-color : #1ab7ea; -$vine-color : #00bf8f; -$youtube-color : #bb0000; -$xing-color : #006567; +$behance-color : #1769FF !default; +$dribbble-color : #ea4c89 !default; +$facebook-color : #3b5998 !default; +$flickr-color : #ff0084 !default; +$foursquare-color : #0072b1 !default; +$github-color : #171516 !default; +$google-plus-color : #dd4b39 !default; +$instagram-color : #517fa4 !default; +$lastfm-color : #d51007 !default; +$linkedin-color : #007bb6 !default; +$pinterest-color : #cb2027 !default; +$rss-color : #fa9b39 !default; +$soundcloud-color : #ff3300 !default; +$stackoverflow-color : #fe7a15 !default; +$tumblr-color : #32506d !default; +$twitter-color : #55acee !default; +$vimeo-color : #1ab7ea !default; +$vine-color : #00bf8f !default; +$youtube-color : #bb0000 !default; +$xing-color : #006567 !default; /* links */ -$link-color : $info-color; -$link-color-hover : mix(#000, $link-color, 25%); -$link-color-visited : mix(#fff, $link-color, 25%); -$masthead-link-color : $primary-color; -$masthead-link-color-hover : mix(#000, $primary-color, 25%); +$link-color : $info-color !default; +$link-color-hover : mix(#000, $link-color, 25%) !default; +$link-color-visited : mix(#fff, $link-color, 25%) !default; +$masthead-link-color : $primary-color !default; +$masthead-link-color-hover : mix(#000, $primary-color, 25%) !default; /* Breakpoints ========================================================================== */ -@include breakpoint-set("to ems", true); - -$small : 768px; -$medium : 900px; -$medium-wide : 1024px; -$large : 1280px; -$x-large : 1400px; +$small : 768px !default; +$medium : 900px !default; +$medium-wide : 1024px !default; +$large : 1280px !default; +$x-large : 1400px !default; /* Grid ========================================================================== */ -$right-sidebar-width-narrow : 200px; -$right-sidebar-width : 300px; -$right-sidebar-width-wide : 400px; - -$susy: ( - columns: 12, - // column-width: 90px, - gutters: 1/4, - math: fluid, - output: float, - gutter-position: after, - container: $large, - global-box-sizing: border-box, - // debug: ( - // image: show, - // color: blue, - // output: overlay, - // toggle: top right, - // ), -); +$right-sidebar-width-narrow : 200px !default; +$right-sidebar-width : 300px !default; +$right-sidebar-width-wide : 400px !default; /* Other ========================================================================== */ -$border-radius : 4px; -$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125); -$navicon-width : 28px; -$navicon-height : 4px; -$global-transition : all 0.2s ease-in-out; +$border-radius : 4px !default; +$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125) !default; +$navicon-width : 28px !default; +$navicon-height : 4px !default; +$global-transition : all 0.2s ease-in-out !default; diff --git a/assets/css/main.scss b/assets/css/main.scss index fbc2a31c0..fab1b1f0b 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -10,14 +10,53 @@ * */ -@import "vendor/breakpoint/breakpoint"; // media query mixins +/* + Variables + ========================================================================== */ + @import "variables"; -@import "mixins"; + + +/* + Vendor + ========================================================================== */ + +/* Breakpoint - media query mixins */ +@import "vendor/breakpoint/breakpoint"; +@include breakpoint-set("to ems", true); + +/* Font Awesome - icon font set */ +@import "vendor/font-awesome/font-awesome"; + +/* Magnific Popup - responsive lightbox */ +@import "vendor/magnific-popup/magnific-popup"; // Magnific Popup + +/* Susy - grid mixins */ +$susy: ( + columns: 12, + gutters: 1/4, + math: fluid, + output: float, + gutter-position: after, + container: $large, + global-box-sizing: border-box, + // debug: ( + // image: show, + // color: blue, + // output: overlay, + // toggle: top right, + // ), +); @import "vendor/susy/susy"; + +/* + Base + ========================================================================== */ + +@import "mixins"; @import "reset"; @import "base"; - @import "utilities"; @import "animations"; @import "tables"; @@ -27,13 +66,14 @@ @import "navigation"; @import "footer"; @import "syntax"; - @import "forms"; + +/* + Layout specific + ========================================================================== */ + @import "page"; @import "archive"; @import "sidebar"; - -@import "vendor/font-awesome/font-awesome"; -@import "vendor/magnific-popup/magnific-popup"; -@import "print"; \ No newline at end of file +@import "print"; diff --git a/assets/js/main.min.js b/assets/js/main.min.js index 6c687cea0..b1a6d1a30 100644 --- a/assets/js/main.min.js +++ b/assets/js/main.min.js @@ -1,5 +1,5 @@ -function updateNav(){var e=$btn.hasClass("hidden")?$nav.width():$nav.width()-$btn.width()-30;$vlinks.width()>e?(breaks.push($vlinks.width()),$vlinks.children().last().prependTo($hlinks),$btn.hasClass("hidden")&&$btn.removeClass("hidden")):(e>breaks[breaks.length-1]&&($hlinks.children().first().appendTo($vlinks),breaks.pop()),breaks.length<1&&($btn.addClass("hidden"),$hlinks.addClass("hidden"))),$btn.attr("count",breaks.length),$vlinks.width()>e&&updateNav()}!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"!==n&&!pe.isWindow(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}function i(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,i){return!!t.call(e,i,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Te.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function r(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(Ae)||[],function(e,n){t[n]=!0}),t}function a(){ie.addEventListener?(ie.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(ie.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(ie.addEventListener||"load"===e.event.type||"complete"===ie.readyState)&&(a(),pe.ready())}function l(e,t,n){if(void 0===n&&1===e.nodeType){var i="data-"+t.replace(He,"-$1").toLowerCase();if(n=e.getAttribute(i),"string"==typeof n){try{n="true"===n||"false"!==n&&("null"===n?null:+n+""===n?+n:De.test(n)?pe.parseJSON(n):n)}catch(e){}pe.data(e,t,n)}else n=void 0}return n}function u(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,i){if(Ie(e)){var r,o,a=pe.expando,s=e.nodeType,l=s?pe.cache:e,u=s?e[a]:e[a]&&a;if(u&&l[u]&&(i||l[u].data)||void 0!==n||"string"!=typeof t)return u||(u=s?e[a]=ne.pop()||pe.guid++:a),l[u]||(l[u]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(i?l[u]=pe.extend(l[u],t):l[u].data=pe.extend(l[u].data,t)),o=l[u],i||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(r=o[t],null==r&&(r=o[pe.camelCase(t)])):r=o,r}}function d(e,t,n){if(Ie(e)){var i,r,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(i=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in i?t=[t]:(t=pe.camelCase(t),t=t in i?[t]:t.split(" ")),r=t.length;for(;r--;)delete i[t[r]];if(n?!u(i):!pe.isEmptyObject(i))return}(n||(delete a[s].data,u(a[s])))&&(o?pe.cleanData([e],!0):de.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function f(e,t,n,i){var r,o=1,a=20,s=i?function(){return i.cur()}:function(){return pe.css(e,t,"")},l=s(),u=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==u&&+l)&&Me.exec(pe.css(e,t));if(c&&c[3]!==u){u=u||c[3],n=n||[],c=+l||1;do o=o||".5",c/=o,pe.style(e,t,c+u);while(o!==(o=s()/l)&&1!==o&&--a)}return n&&(c=+c||+l||0,r=n[1]?c+(n[1]+1)*n[2]:+n[2],i&&(i.unit=u,i.start=c,i.end=r)),r}function p(e){var t=We.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,i,r=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(i=n[r]);r++)!t||pe.nodeName(i,t)?o.push(i):pe.merge(o,h(i,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function m(e,t){for(var n,i=0;null!=(n=e[i]);i++)pe._data(n,"globalEval",!t||pe._data(t[i],"globalEval"))}function g(e){qe.test(e.type)&&(e.defaultChecked=e.checked)}function v(e,t,n,i,r){for(var o,a,s,l,u,c,d,f=e.length,v=p(t),y=[],b=0;f>b;b++)if(a=e[b],a||0===a)if("object"===pe.type(a))pe.merge(y,a.nodeType?[a]:a);else if(Ye.test(a)){for(l=l||v.appendChild(t.createElement("div")),u=($e.exec(a)||["",""])[1].toLowerCase(),d=Xe[u]||Xe._default,l.innerHTML=d[1]+pe.htmlPrefilter(a)+d[2],o=d[0];o--;)l=l.lastChild;if(!de.leadingWhitespace&&Re.test(a)&&y.push(t.createTextNode(Re.exec(a)[0])),!de.tbody)for(a="table"!==u||Ue.test(a)?""!==d[1]||Ue.test(a)?0:l:l.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(y,l.childNodes),l.textContent="";l.firstChild;)l.removeChild(l.firstChild);l=v.lastChild}else y.push(t.createTextNode(a));for(l&&v.removeChild(l),de.appendChecked||pe.grep(h(y,"input"),g),b=0;a=y[b++];)if(i&&pe.inArray(a,i)>-1)r&&r.push(a);else if(s=pe.contains(a.ownerDocument,a),l=h(v.appendChild(a),"script"),s&&m(l),n)for(o=0;a=l[o++];)ze.test(a.type||"")&&n.push(a);return l=null,v}function y(){return!0}function b(){return!1}function x(){try{return ie.activeElement}catch(e){}}function w(e,t,n,i,r,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(i=i||n,n=void 0);for(s in t)w(e,s,n,i,t[s],o);return e}if(null==i&&null==r?(r=n,i=n=void 0):null==r&&("string"==typeof n?(r=i,i=void 0):(r=i,i=n,n=void 0)),r===!1)r=b;else if(!r)return e;return 1===o&&(a=r,r=function(e){return pe().off(e),a.apply(this,arguments)},r.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,r,i,n)})}function C(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function T(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function k(e){var t=rt.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function E(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,i,r,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(i=0,r=s[n].length;r>i;i++)pe.event.add(t,n,s[n][i])}a.data&&(a.data=pe.extend({},a.data))}}function S(e,t){var n,i,r;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!de.noCloneEvent&&t[pe.expando]){r=pe._data(t);for(i in r.events)pe.removeEvent(t,i,r.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(T(t).text=e.text,k(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),de.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&qe.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function N(e,t,n,i){t=oe.apply([],t);var r,o,a,s,l,u,c=0,d=e.length,f=d-1,p=t[0],m=pe.isFunction(p);if(m||d>1&&"string"==typeof p&&!de.checkClone&&it.test(p))return e.each(function(r){var o=e.eq(r);m&&(t[0]=p.call(this,r,o.html())),N(o,t,n,i)});if(d&&(u=v(t,e[0].ownerDocument,!1,e,i),r=u.firstChild,1===u.childNodes.length&&(u=r),r||i)){for(s=pe.map(h(u,"script"),T),a=s.length;d>c;c++)o=u,c!==f&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(l=s[s.length-1].ownerDocument,pe.map(s,k),c=0;a>c;c++)o=s[c],ze.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(l,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));u=r=null}return e}function L(e,t,n){for(var i,r=t?pe.filter(t,e):e,o=0;null!=(i=r[o]);o++)n||1!==i.nodeType||pe.cleanData(h(i)),i.parentNode&&(n&&pe.contains(i.ownerDocument,i)&&m(h(i,"script")),i.parentNode.removeChild(i));return e}function A(e,t){var n=pe(t.createElement(e)).appendTo(t.body),i=pe.css(n[0],"display");return n.detach(),i}function j(e){var t=ie,n=ut[e];return n||(n=A(e,t),"none"!==n&&n||(lt=(lt||pe("',srcAction:"iframe_src",patterns:{youtube:{index:"youtube.com",id:"v=",src:"//www.youtube.com/embed/%id%?autoplay=1"},vimeo:{index:"vimeo.com/",id:"/",src:"//player.vimeo.com/video/%id%?autoplay=1"},gmaps:{index:"//maps.google.",src:"%id%&output=embed"}}},proto:{initIframe:function(){t.types.push(z),T("BeforeChange",function(e,t,n){t!==n&&(t===z?W():n===z&&W(!0))}),T(l+"."+z,function(){W()})},getIframe:function(n,i){var r=n.src,o=t.st.iframe;e.each(o.patterns,function(){if(r.indexOf(this.index)>-1)return this.id&&(r="string"==typeof this.id?r.substr(r.lastIndexOf(this.id)+this.id.length,r.length):this.id.call(this,r)),r=this.src.replace("%id%",r),!1});var a={};return o.srcAction&&(a[o.srcAction]=r),t._parseMarkup(i,a,n),t.updateStatus("ready"),i}}});var X=function(e){var n=t.items.length;return e>n-1?e-n:e<0?n+e:e},Y=function(e,t,n){return e.replace(/%curr%/gi,t+1).replace(/%total%/gi,n)};e.magnificPopup.registerModule("gallery",{options:{enabled:!1,arrowMarkup:'',preload:[0,2],navigateByImgClick:!0,arrows:!0,tPrev:"Previous (Left arrow key)",tNext:"Next (Right arrow key)",tCounter:"%curr% of %total%"},proto:{initGallery:function(){var n=t.st.gallery,i=".mfp-gallery",o=Boolean(e.fn.mfpFastClick);return t.direction=!0,!(!n||!n.enabled)&&(a+=" mfp-gallery",T(p+i,function(){n.navigateByImgClick&&t.wrap.on("click"+i,".mfp-img",function(){if(t.items.length>1)return t.next(),!1}),r.on("keydown"+i,function(e){37===e.keyCode?t.prev():39===e.keyCode&&t.next()})}),T("UpdateStatus"+i,function(e,n){n.text&&(n.text=Y(n.text,t.currItem.index,t.items.length))}),T(f+i,function(e,i,r,o){var a=t.items.length;r.counter=a>1?Y(n.tCounter,o.index,a):""}),T("BuildControls"+i,function(){if(t.items.length>1&&n.arrows&&!t.arrowLeft){var i=n.arrowMarkup,r=t.arrowLeft=e(i.replace(/%title%/gi,n.tPrev).replace(/%dir%/gi,"left")).addClass(b),a=t.arrowRight=e(i.replace(/%title%/gi,n.tNext).replace(/%dir%/gi,"right")).addClass(b),s=o?"mfpFastClick":"click";r[s](function(){t.prev()}),a[s](function(){t.next()}),t.isIE7&&(k("b",r[0],!1,!0),k("a",r[0],!1,!0),k("b",a[0],!1,!0),k("a",a[0],!1,!0)),t.container.append(r.add(a))}}),T(h+i,function(){t._preloadTimeout&&clearTimeout(t._preloadTimeout),t._preloadTimeout=setTimeout(function(){t.preloadNearbyImages(),t._preloadTimeout=null},16)}),void T(l+i,function(){r.off(i),t.wrap.off("click"+i),t.arrowLeft&&o&&t.arrowLeft.add(t.arrowRight).destroyMfpFastClick(),t.arrowRight=t.arrowLeft=null}))},next:function(){t.direction=!0,t.index=X(t.index+1),t.updateItemHTML()},prev:function(){t.direction=!1,t.index=X(t.index-1),t.updateItemHTML()},goTo:function(e){t.direction=e>=t.index,t.index=e,t.updateItemHTML()},preloadNearbyImages:function(){var e,n=t.st.gallery.preload,i=Math.min(n[0],t.items.length),r=Math.min(n[1],t.items.length);for(e=1;e<=(t.direction?r:i);e++)t._preloadItem(t.index+e);for(e=1;e<=(t.direction?i:r);e++)t._preloadItem(t.index-e)},_preloadItem:function(n){if(n=X(n),!t.items[n].preloaded){var i=t.items[n];i.parsed||(i=t.parseEl(n)),E("LazyLoad",i),"image"===i.type&&(i.img=e('').on("load.mfploader",function(){i.hasSize=!0}).on("error.mfploader",function(){i.hasSize=!0,i.loadError=!0,E("LazyLoadError",i)}).attr("src",i.src)),i.preloaded=!0}}}});var U="retina";e.magnificPopup.registerModule(U,{options:{replaceSrc:function(e){return e.src.replace(/\.\w+$/,function(e){return"@2x"+e})},ratio:1},proto:{initRetina:function(){if(window.devicePixelRatio>1){var e=t.st.retina,n=e.ratio;n=isNaN(n)?n():n,n>1&&(T("ImageHasSize."+U,function(e,t){t.img.css({"max-width":t.img[0].naturalWidth/n,width:"100%"})}),T("ElementParse."+U,function(t,i){i.src=e.replaceSrc(i,n)}))}}}}),function(){var t=1e3,n="ontouchstart"in window,i=function(){C.off("touchmove"+o+" touchend"+o)},r="mfpFastClick",o="."+r;e.fn.mfpFastClick=function(r){return e(this).each(function(){var a,s=e(this);if(n){var l,u,c,d,f,p;s.on("touchstart"+o,function(e){d=!1,p=1,f=e.originalEvent?e.originalEvent.touches[0]:e.touches[0],u=f.clientX,c=f.clientY,C.on("touchmove"+o,function(e){f=e.originalEvent?e.originalEvent.touches:e.touches,p=f.length,f=f[0],(Math.abs(f.clientX-u)>10||Math.abs(f.clientY-c)>10)&&(d=!0,i())}).on("touchend"+o,function(e){i(),d||p>1||(a=!0,e.preventDefault(),clearTimeout(l),l=setTimeout(function(){a=!1},t),r())})})}s.on("click"+o,function(){a||r()})})},e.fn.destroyMfpFastClick=function(){e(this).off("touchstart"+o+" click"+o),n&&C.off("touchmove"+o+" touchend"+o)}}(),N()}(window.jQuery||window.Zepto),!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e("object"==typeof module&&module.exports?require("jquery"):jQuery)}(function(e){var t="1.7.2",n={},i={exclude:[],excludeWithin:[],offset:0,direction:"top",delegateSelector:null,scrollElement:null,scrollTarget:null,beforeScroll:function(){},afterScroll:function(){},easing:"swing",speed:400,autoCoefficient:2,preventDefault:!0},r=function(t){var n=[],i=!1,r=t.dir&&"left"===t.dir?"scrollLeft":"scrollTop";return this.each(function(){var t=e(this);if(this!==document&&this!==window)return!document.scrollingElement||this!==document.documentElement&&this!==document.body?void(t[r]()>0?n.push(this):(t[r](1),i=t[r]()>0,i&&n.push(this),t[r](0))):(n.push(document.scrollingElement),!1)}),n.length||this.each(function(){this===document.documentElement&&"smooth"===e(this).css("scrollBehavior")&&(n=[this]),n.length||"BODY"!==this.nodeName||(n=[this])}),"first"===t.el&&n.length>1&&(n=[n[0]]),n};e.fn.extend({scrollable:function(e){var t=r.call(this,{dir:e});return this.pushStack(t)},firstScrollable:function(e){var t=r.call(this,{el:"first",dir:e});return this.pushStack(t)},smoothScroll:function(t,n){if(t=t||{},"options"===t)return n?this.each(function(){var t=e(this),i=e.extend(t.data("ssOpts")||{},n);e(this).data("ssOpts",i)}):this.first().data("ssOpts");var i=e.extend({},e.fn.smoothScroll.defaults,t),r=function(t){var n=function(e){return e.replace(/(:|\.|\/)/g,"\\$1")},r=this,o=e(this),a=e.extend({},i,o.data("ssOpts")||{}),s=i.exclude,l=a.excludeWithin,u=0,c=0,d=!0,f={},p=e.smoothScroll.filterPath(location.pathname),h=e.smoothScroll.filterPath(r.pathname),m=location.hostname===r.hostname||!r.hostname,g=a.scrollTarget||h===p,v=n(r.hash);if(v&&!e(v).length&&(d=!1),a.scrollTarget||m&&g&&v){for(;d&&u=0;e--)u(D[e])}function u(e){if(e.inited){var t=_.top<=e.limit.start?0:_.top>=e.limit.end?2:1;e.mode!=t&&m(e,t)}}function c(){for(var e=D.length-1;e>=0;e--)if(D[e].inited){var t=Math.abs(b(D[e].clone)-D[e].docOffsetTop),n=Math.abs(D[e].parent.node.offsetHeight-D[e].parent.height);if(t>=2||n>=2)return!1}return!0}function d(e){isNaN(parseFloat(e.computed.top))||e.isCell||"none"==e.computed.display||(e.inited=!0,e.clone||g(e),"absolute"!=e.parent.computed.position&&"relative"!=e.parent.computed.position&&(e.parent.node.style.position="relative"),u(e),e.parent.height=e.parent.node.offsetHeight,e.docOffsetTop=b(e.clone))}function f(e){var t=!0;e.clone&&v(e),i(e.node.style,e.css);for(var n=D.length-1;n>=0;n--)if(D[n].node!==e.node&&D[n].parent.node===e.parent.node){t=!1;break}t&&(e.parent.node.style.position=e.parent.css.position),e.mode=-1}function p(){for(var e=D.length-1;e>=0;e--)d(D[e])}function h(){for(var e=D.length-1;e>=0;e--)f(D[e])}function m(e,t){var n=e.node.style;switch(t){case 0:n.position="absolute",n.left=e.offset.left+"px",n.right=e.offset.right+"px",n.top=e.offset.top+"px",n.bottom="auto",n.width="auto",n.marginLeft=0,n.marginRight=0,n.marginTop=0;break;case 1:n.position="fixed",n.left=e.box.left+"px",n.right=e.box.right+"px",n.top=e.css.top,n.bottom="auto",n.width="auto",n.marginLeft=0,n.marginRight=0,n.marginTop=0;break;case 2:n.position="absolute",n.left=e.offset.left+"px",n.right=e.offset.right+"px",n.top="auto",n.bottom=0,n.width="auto",n.marginLeft=0,n.marginRight=0}e.mode=t}function g(e){e.clone=document.createElement("div");var t=e.node.nextSibling||e.node,n=e.clone.style;n.height=e.height+"px",n.width=e.width+"px",n.marginTop=e.computed.marginTop,n.marginBottom=e.computed.marginBottom,n.marginLeft=e.computed.marginLeft,n.marginRight=e.computed.marginRight,n.padding=n.border=n.borderSpacing=0,n.fontSize="1em",n.position="static",n.cssFloat=e.computed.cssFloat,e.node.parentNode.insertBefore(e.clone,t)}function v(e){e.clone.parentNode.removeChild(e.clone),e.clone=void 0}function y(e){var t=getComputedStyle(e),n=e.parentNode,i=getComputedStyle(n),o=e.style.position;e.style.position="relative";var a={top:t.top,marginTop:t.marginTop,marginBottom:t.marginBottom,marginLeft:t.marginLeft,marginRight:t.marginRight,cssFloat:t.cssFloat,display:t.display},s={top:r(t.top),marginBottom:r(t.marginBottom),paddingLeft:r(t.paddingLeft),paddingRight:r(t.paddingRight),borderLeftWidth:r(t.borderLeftWidth),borderRightWidth:r(t.borderRightWidth)};e.style.position=o;var l={position:e.style.position,top:e.style.top,bottom:e.style.bottom,left:e.style.left,right:e.style.right,width:e.style.width,marginTop:e.style.marginTop,marginLeft:e.style.marginLeft,marginRight:e.style.marginRight},u=x(e),c=x(n),d={node:n,css:{position:n.style.position},computed:{position:i.position},numeric:{borderLeftWidth:r(i.borderLeftWidth),borderRightWidth:r(i.borderRightWidth),borderTopWidth:r(i.borderTopWidth),borderBottomWidth:r(i.borderBottomWidth)}},f={node:e,box:{left:u.win.left,right:O.clientWidth-u.win.right},offset:{top:u.win.top-c.win.top-d.numeric.borderTopWidth,left:u.win.left-c.win.left-d.numeric.borderLeftWidth,right:-u.win.right+c.win.right-d.numeric.borderRightWidth},css:l,isCell:"table-cell"==t.display,computed:a, -numeric:s,width:u.win.right-u.win.left,height:u.win.bottom-u.win.top,mode:-1,inited:!1,parent:d,limit:{start:u.doc.top-s.top,end:c.doc.top+n.offsetHeight-d.numeric.borderBottomWidth-e.offsetHeight-s.top-s.marginBottom}};return f}function b(e){for(var t=0;e;)t+=e.offsetTop,e=e.offsetParent;return t}function x(e){var n=e.getBoundingClientRect();return{doc:{top:n.top+t.pageYOffset,left:n.left+t.pageXOffset},win:n}}function w(){I=setInterval(function(){!c()&&E()},500)}function C(){clearInterval(I)}function T(){H&&(document[P]?C():w())}function k(){H||(o(),p(),t.addEventListener("scroll",a),t.addEventListener("wheel",s),t.addEventListener("resize",E),t.addEventListener("orientationchange",E),e.addEventListener(B,T),w(),H=!0)}function E(){if(H){h();for(var e=D.length-1;e>=0;e--)D[e]=y(D[e].node);p()}}function S(){t.removeEventListener("scroll",a),t.removeEventListener("wheel",s),t.removeEventListener("resize",E),t.removeEventListener("orientationchange",E),e.removeEventListener(B,T),C(),H=!1}function N(){S(),h()}function L(){for(N();D.length;)D.pop()}function A(e){for(var t=D.length-1;t>=0;t--)if(D[t].node===e)return;var n=y(e);D.push(n),H?d(n):k()}function j(e){for(var t=D.length-1;t>=0;t--)D[t].node===e&&(f(D[t]),D.splice(t,1))}var _,I,D=[],H=!1,O=e.documentElement,M=function(){},P="hidden",B="visibilitychange";void 0!==e.webkitHidden&&(P="webkitHidden",B="webkitvisibilitychange"),t.getComputedStyle||n();for(var F=["","-webkit-","-moz-","-ms-"],q=document.createElement("div"),$=F.length-1;$>=0;$--){try{q.style.position=F[$]+"sticky"}catch(e){}""!=q.style.position&&n()}o(),t.Stickyfill={stickies:D,add:A,remove:j,init:k,rebuild:E,pause:S,stop:N,kill:L}}(document,window),window.jQuery&&!function(e){e.fn.Stickyfill=function(e){return this.each(function(){Stickyfill.add(this)}),this}}(window.jQuery),$(document).ready(function(){var e=function(){$("body").css("margin-bottom",$(".page__footer").outerHeight(!0))},t=!1;e(),$(window).resize(function(){t=!0}),setInterval(function(){t&&(t=!1,e())},250),$("#main").fitVids(),$(".sticky").Stickyfill();var n=function(){var e=0===$(".author__urls-wrapper button").length?$(window).width()>1024:!$(".author__urls-wrapper button").is(":visible");e?(Stickyfill.rebuild(),Stickyfill.init(),$(".author__urls").show()):(Stickyfill.stop(),$(".author__urls").hide())};n(),$(window).resize(function(){n()}),$(".author__urls-wrapper button").on("click",function(){$(".author__urls").fadeToggle("fast",function(){}),$(".author__urls-wrapper button").toggleClass("open")}),$("a").smoothScroll({offset:-20}),$("a[href$='.jpg'],a[href$='.jpeg'],a[href$='.JPG'],a[href$='.png'],a[href$='.gif']").addClass("image-popup"),$(".image-popup").magnificPopup({type:"image",tLoading:"Loading image #%curr%...",gallery:{enabled:!0,navigateByImgClick:!0,preload:[0,1]},image:{tError:'Image #%curr% could not be loaded.'},removalDelay:500,mainClass:"mfp-zoom-in",callbacks:{beforeOpen:function(){this.st.image.markup=this.st.image.markup.replace("mfp-figure","mfp-figure mfp-with-anim")}},closeOnContentClick:!0,midClick:!0})}); \ No newline at end of file +function updateNav(){var e=$btn.hasClass("hidden")?$nav.width():$nav.width()-$btn.width()-30;$vlinks.width()>e?(breaks.push($vlinks.width()),$vlinks.children().last().prependTo($hlinks),$btn.hasClass("hidden")&&$btn.removeClass("hidden")):(e>breaks[breaks.length-1]&&($hlinks.children().first().appendTo($vlinks),breaks.pop()),breaks.length<1&&($btn.addClass("hidden"),$hlinks.addClass("hidden"))),$btn.attr("count",breaks.length),$vlinks.width()>e&&updateNav()}!function(e,t){"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){function n(e){var t=!!e&&"length"in e&&e.length,n=pe.type(e);return"function"===n||pe.isWindow(e)?!1:"array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e}function i(e,t,n){if(pe.isFunction(t))return pe.grep(e,function(e,i){return!!t.call(e,i,e)!==n});if(t.nodeType)return pe.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(Te.test(t))return pe.filter(t,e,n);t=pe.filter(t,e)}return pe.grep(e,function(e){return pe.inArray(e,t)>-1!==n})}function r(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function o(e){var t={};return pe.each(e.match(Ae)||[],function(e,n){t[n]=!0}),t}function a(){ie.addEventListener?(ie.removeEventListener("DOMContentLoaded",s),e.removeEventListener("load",s)):(ie.detachEvent("onreadystatechange",s),e.detachEvent("onload",s))}function s(){(ie.addEventListener||"load"===e.event.type||"complete"===ie.readyState)&&(a(),pe.ready())}function l(e,t,n){if(void 0===n&&1===e.nodeType){var i="data-"+t.replace(He,"-$1").toLowerCase();if(n=e.getAttribute(i),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:De.test(n)?pe.parseJSON(n):n}catch(r){}pe.data(e,t,n)}else n=void 0}return n}function u(e){var t;for(t in e)if(("data"!==t||!pe.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function c(e,t,n,i){if(Ie(e)){var r,o,a=pe.expando,s=e.nodeType,l=s?pe.cache:e,u=s?e[a]:e[a]&&a;if(u&&l[u]&&(i||l[u].data)||void 0!==n||"string"!=typeof t)return u||(u=s?e[a]=ne.pop()||pe.guid++:a),l[u]||(l[u]=s?{}:{toJSON:pe.noop}),"object"!=typeof t&&"function"!=typeof t||(i?l[u]=pe.extend(l[u],t):l[u].data=pe.extend(l[u].data,t)),o=l[u],i||(o.data||(o.data={}),o=o.data),void 0!==n&&(o[pe.camelCase(t)]=n),"string"==typeof t?(r=o[t],null==r&&(r=o[pe.camelCase(t)])):r=o,r}}function d(e,t,n){if(Ie(e)){var i,r,o=e.nodeType,a=o?pe.cache:e,s=o?e[pe.expando]:pe.expando;if(a[s]){if(t&&(i=n?a[s]:a[s].data)){pe.isArray(t)?t=t.concat(pe.map(t,pe.camelCase)):t in i?t=[t]:(t=pe.camelCase(t),t=t in i?[t]:t.split(" ")),r=t.length;for(;r--;)delete i[t[r]];if(n?!u(i):!pe.isEmptyObject(i))return}(n||(delete a[s].data,u(a[s])))&&(o?pe.cleanData([e],!0):de.deleteExpando||a!=a.window?delete a[s]:a[s]=void 0)}}}function f(e,t,n,i){var r,o=1,a=20,s=i?function(){return i.cur()}:function(){return pe.css(e,t,"")},l=s(),u=n&&n[3]||(pe.cssNumber[t]?"":"px"),c=(pe.cssNumber[t]||"px"!==u&&+l)&&Me.exec(pe.css(e,t));if(c&&c[3]!==u){u=u||c[3],n=n||[],c=+l||1;do o=o||".5",c/=o,pe.style(e,t,c+u);while(o!==(o=s()/l)&&1!==o&&--a)}return n&&(c=+c||+l||0,r=n[1]?c+(n[1]+1)*n[2]:+n[2],i&&(i.unit=u,i.start=c,i.end=r)),r}function p(e){var t=We.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function h(e,t){var n,i,r=0,o="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):void 0;if(!o)for(o=[],n=e.childNodes||e;null!=(i=n[r]);r++)!t||pe.nodeName(i,t)?o.push(i):pe.merge(o,h(i,t));return void 0===t||t&&pe.nodeName(e,t)?pe.merge([e],o):o}function m(e,t){for(var n,i=0;null!=(n=e[i]);i++)pe._data(n,"globalEval",!t||pe._data(t[i],"globalEval"))}function g(e){qe.test(e.type)&&(e.defaultChecked=e.checked)}function v(e,t,n,i,r){for(var o,a,s,l,u,c,d,f=e.length,v=p(t),y=[],b=0;f>b;b++)if(a=e[b],a||0===a)if("object"===pe.type(a))pe.merge(y,a.nodeType?[a]:a);else if(Ye.test(a)){for(l=l||v.appendChild(t.createElement("div")),u=($e.exec(a)||["",""])[1].toLowerCase(),d=Xe[u]||Xe._default,l.innerHTML=d[1]+pe.htmlPrefilter(a)+d[2],o=d[0];o--;)l=l.lastChild;if(!de.leadingWhitespace&&Re.test(a)&&y.push(t.createTextNode(Re.exec(a)[0])),!de.tbody)for(a="table"!==u||Ue.test(a)?"
    "!==d[1]||Ue.test(a)?0:l:l.firstChild,o=a&&a.childNodes.length;o--;)pe.nodeName(c=a.childNodes[o],"tbody")&&!c.childNodes.length&&a.removeChild(c);for(pe.merge(y,l.childNodes),l.textContent="";l.firstChild;)l.removeChild(l.firstChild);l=v.lastChild}else y.push(t.createTextNode(a));for(l&&v.removeChild(l),de.appendChecked||pe.grep(h(y,"input"),g),b=0;a=y[b++];)if(i&&pe.inArray(a,i)>-1)r&&r.push(a);else if(s=pe.contains(a.ownerDocument,a),l=h(v.appendChild(a),"script"),s&&m(l),n)for(o=0;a=l[o++];)ze.test(a.type||"")&&n.push(a);return l=null,v}function y(){return!0}function b(){return!1}function x(){try{return ie.activeElement}catch(e){}}function w(e,t,n,i,r,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(i=i||n,n=void 0);for(s in t)w(e,s,n,i,t[s],o);return e}if(null==i&&null==r?(r=n,i=n=void 0):null==r&&("string"==typeof n?(r=i,i=void 0):(r=i,i=n,n=void 0)),r===!1)r=b;else if(!r)return e;return 1===o&&(a=r,r=function(e){return pe().off(e),a.apply(this,arguments)},r.guid=a.guid||(a.guid=pe.guid++)),e.each(function(){pe.event.add(this,t,r,i,n)})}function C(e,t){return pe.nodeName(e,"table")&&pe.nodeName(11!==t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function T(e){return e.type=(null!==pe.find.attr(e,"type"))+"/"+e.type,e}function k(e){var t=rt.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function E(e,t){if(1===t.nodeType&&pe.hasData(e)){var n,i,r,o=pe._data(e),a=pe._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(i=0,r=s[n].length;r>i;i++)pe.event.add(t,n,s[n][i])}a.data&&(a.data=pe.extend({},a.data))}}function S(e,t){var n,i,r;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!de.noCloneEvent&&t[pe.expando]){r=pe._data(t);for(i in r.events)pe.removeEvent(t,i,r.handle);t.removeAttribute(pe.expando)}"script"===n&&t.text!==e.text?(T(t).text=e.text,k(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),de.html5Clone&&e.innerHTML&&!pe.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&qe.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}}function N(e,t,n,i){t=oe.apply([],t);var r,o,a,s,l,u,c=0,d=e.length,f=d-1,p=t[0],m=pe.isFunction(p);if(m||d>1&&"string"==typeof p&&!de.checkClone&&it.test(p))return e.each(function(r){var o=e.eq(r);m&&(t[0]=p.call(this,r,o.html())),N(o,t,n,i)});if(d&&(u=v(t,e[0].ownerDocument,!1,e,i),r=u.firstChild,1===u.childNodes.length&&(u=r),r||i)){for(s=pe.map(h(u,"script"),T),a=s.length;d>c;c++)o=u,c!==f&&(o=pe.clone(o,!0,!0),a&&pe.merge(s,h(o,"script"))),n.call(e[c],o,c);if(a)for(l=s[s.length-1].ownerDocument,pe.map(s,k),c=0;a>c;c++)o=s[c],ze.test(o.type||"")&&!pe._data(o,"globalEval")&&pe.contains(l,o)&&(o.src?pe._evalUrl&&pe._evalUrl(o.src):pe.globalEval((o.text||o.textContent||o.innerHTML||"").replace(ot,"")));u=r=null}return e}function L(e,t,n){for(var i,r=t?pe.filter(t,e):e,o=0;null!=(i=r[o]);o++)n||1!==i.nodeType||pe.cleanData(h(i)),i.parentNode&&(n&&pe.contains(i.ownerDocument,i)&&m(h(i,"script")),i.parentNode.removeChild(i));return e}function A(e,t){var n=pe(t.createElement(e)).appendTo(t.body),i=pe.css(n[0],"display");return n.detach(),i}function j(e){var t=ie,n=ut[e];return n||(n=A(e,t),"none"!==n&&n||(lt=(lt||pe("',srcAction:"iframe_src",patterns:{youtube:{index:"youtube.com",id:"v=",src:"//www.youtube.com/embed/%id%?autoplay=1"},vimeo:{index:"vimeo.com/",id:"/",src:"//player.vimeo.com/video/%id%?autoplay=1"},gmaps:{index:"//maps.google.",src:"%id%&output=embed"}}},proto:{initIframe:function(){t.types.push(z),T("BeforeChange",function(e,t,n){t!==n&&(t===z?W():n===z&&W(!0))}),T(l+"."+z,function(){W()})},getIframe:function(n,i){var r=n.src,o=t.st.iframe;e.each(o.patterns,function(){return r.indexOf(this.index)>-1?(this.id&&(r="string"==typeof this.id?r.substr(r.lastIndexOf(this.id)+this.id.length,r.length):this.id.call(this,r)),r=this.src.replace("%id%",r),!1):void 0});var a={};return o.srcAction&&(a[o.srcAction]=r),t._parseMarkup(i,a,n),t.updateStatus("ready"),i}}});var X=function(e){var n=t.items.length;return e>n-1?e-n:0>e?n+e:e},Y=function(e,t,n){return e.replace(/%curr%/gi,t+1).replace(/%total%/gi,n)};e.magnificPopup.registerModule("gallery",{options:{enabled:!1,arrowMarkup:'',preload:[0,2],navigateByImgClick:!0,arrows:!0,tPrev:"Previous (Left arrow key)",tNext:"Next (Right arrow key)",tCounter:"%curr% of %total%"},proto:{initGallery:function(){var n=t.st.gallery,i=".mfp-gallery",o=Boolean(e.fn.mfpFastClick);return t.direction=!0,n&&n.enabled?(a+=" mfp-gallery",T(p+i,function(){n.navigateByImgClick&&t.wrap.on("click"+i,".mfp-img",function(){return t.items.length>1?(t.next(),!1):void 0}),r.on("keydown"+i,function(e){37===e.keyCode?t.prev():39===e.keyCode&&t.next()})}),T("UpdateStatus"+i,function(e,n){n.text&&(n.text=Y(n.text,t.currItem.index,t.items.length))}),T(f+i,function(e,i,r,o){var a=t.items.length;r.counter=a>1?Y(n.tCounter,o.index,a):""}),T("BuildControls"+i,function(){if(t.items.length>1&&n.arrows&&!t.arrowLeft){var i=n.arrowMarkup,r=t.arrowLeft=e(i.replace(/%title%/gi,n.tPrev).replace(/%dir%/gi,"left")).addClass(b),a=t.arrowRight=e(i.replace(/%title%/gi,n.tNext).replace(/%dir%/gi,"right")).addClass(b),s=o?"mfpFastClick":"click";r[s](function(){t.prev()}),a[s](function(){t.next()}),t.isIE7&&(k("b",r[0],!1,!0),k("a",r[0],!1,!0),k("b",a[0],!1,!0),k("a",a[0],!1,!0)),t.container.append(r.add(a))}}),T(h+i,function(){t._preloadTimeout&&clearTimeout(t._preloadTimeout),t._preloadTimeout=setTimeout(function(){t.preloadNearbyImages(),t._preloadTimeout=null},16)}),void T(l+i,function(){r.off(i),t.wrap.off("click"+i),t.arrowLeft&&o&&t.arrowLeft.add(t.arrowRight).destroyMfpFastClick(),t.arrowRight=t.arrowLeft=null})):!1},next:function(){t.direction=!0,t.index=X(t.index+1),t.updateItemHTML()},prev:function(){t.direction=!1,t.index=X(t.index-1),t.updateItemHTML()},goTo:function(e){t.direction=e>=t.index,t.index=e,t.updateItemHTML()},preloadNearbyImages:function(){var e,n=t.st.gallery.preload,i=Math.min(n[0],t.items.length),r=Math.min(n[1],t.items.length);for(e=1;e<=(t.direction?r:i);e++)t._preloadItem(t.index+e);for(e=1;e<=(t.direction?i:r);e++)t._preloadItem(t.index-e)},_preloadItem:function(n){if(n=X(n),!t.items[n].preloaded){var i=t.items[n];i.parsed||(i=t.parseEl(n)),E("LazyLoad",i),"image"===i.type&&(i.img=e('').on("load.mfploader",function(){i.hasSize=!0}).on("error.mfploader",function(){i.hasSize=!0,i.loadError=!0,E("LazyLoadError",i)}).attr("src",i.src)),i.preloaded=!0}}}});var U="retina";e.magnificPopup.registerModule(U,{options:{replaceSrc:function(e){return e.src.replace(/\.\w+$/,function(e){return"@2x"+e})},ratio:1},proto:{initRetina:function(){if(window.devicePixelRatio>1){var e=t.st.retina,n=e.ratio;n=isNaN(n)?n():n,n>1&&(T("ImageHasSize."+U,function(e,t){t.img.css({"max-width":t.img[0].naturalWidth/n,width:"100%"})}),T("ElementParse."+U,function(t,i){i.src=e.replaceSrc(i,n)}))}}}}),function(){var t=1e3,n="ontouchstart"in window,i=function(){C.off("touchmove"+o+" touchend"+o)},r="mfpFastClick",o="."+r;e.fn.mfpFastClick=function(r){return e(this).each(function(){var a,s=e(this);if(n){var l,u,c,d,f,p;s.on("touchstart"+o,function(e){d=!1,p=1,f=e.originalEvent?e.originalEvent.touches[0]:e.touches[0],u=f.clientX,c=f.clientY,C.on("touchmove"+o,function(e){f=e.originalEvent?e.originalEvent.touches:e.touches,p=f.length,f=f[0],(Math.abs(f.clientX-u)>10||Math.abs(f.clientY-c)>10)&&(d=!0,i())}).on("touchend"+o,function(e){i(),d||p>1||(a=!0,e.preventDefault(),clearTimeout(l),l=setTimeout(function(){a=!1},t),r())})})}s.on("click"+o,function(){a||r()})})},e.fn.destroyMfpFastClick=function(){e(this).off("touchstart"+o+" click"+o),n&&C.off("touchmove"+o+" touchend"+o)}}(),N()}(window.jQuery||window.Zepto),!function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e("object"==typeof module&&module.exports?require("jquery"):jQuery)}(function(e){var t="1.7.2",n={},i={exclude:[],excludeWithin:[],offset:0,direction:"top",delegateSelector:null,scrollElement:null,scrollTarget:null,beforeScroll:function(){},afterScroll:function(){},easing:"swing",speed:400,autoCoefficient:2,preventDefault:!0},r=function(t){var n=[],i=!1,r=t.dir&&"left"===t.dir?"scrollLeft":"scrollTop";return this.each(function(){var t=e(this);return this!==document&&this!==window?!document.scrollingElement||this!==document.documentElement&&this!==document.body?void(t[r]()>0?n.push(this):(t[r](1),i=t[r]()>0,i&&n.push(this),t[r](0))):(n.push(document.scrollingElement),!1):void 0}),n.length||this.each(function(){this===document.documentElement&&"smooth"===e(this).css("scrollBehavior")&&(n=[this]),n.length||"BODY"!==this.nodeName||(n=[this])}),"first"===t.el&&n.length>1&&(n=[n[0]]),n};e.fn.extend({scrollable:function(e){var t=r.call(this,{dir:e});return this.pushStack(t)},firstScrollable:function(e){var t=r.call(this,{el:"first",dir:e});return this.pushStack(t)},smoothScroll:function(t,n){if(t=t||{},"options"===t)return n?this.each(function(){var t=e(this),i=e.extend(t.data("ssOpts")||{},n);e(this).data("ssOpts",i)}):this.first().data("ssOpts");var i=e.extend({},e.fn.smoothScroll.defaults,t),r=function(t){var n=function(e){return e.replace(/(:|\.|\/)/g,"\\$1")},r=this,o=e(this),a=e.extend({},i,o.data("ssOpts")||{}),s=i.exclude,l=a.excludeWithin,u=0,c=0,d=!0,f={},p=e.smoothScroll.filterPath(location.pathname),h=e.smoothScroll.filterPath(r.pathname),m=location.hostname===r.hostname||!r.hostname,g=a.scrollTarget||h===p,v=n(r.hash);if(v&&!e(v).length&&(d=!1),a.scrollTarget||m&&g&&v){for(;d&&u=0;e--)u(D[e])}function u(e){if(e.inited){var t=_.top<=e.limit.start?0:_.top>=e.limit.end?2:1;e.mode!=t&&m(e,t)}}function c(){for(var e=D.length-1;e>=0;e--)if(D[e].inited){var t=Math.abs(b(D[e].clone)-D[e].docOffsetTop),n=Math.abs(D[e].parent.node.offsetHeight-D[e].parent.height);if(t>=2||n>=2)return!1}return!0}function d(e){isNaN(parseFloat(e.computed.top))||e.isCell||"none"==e.computed.display||(e.inited=!0,e.clone||g(e),"absolute"!=e.parent.computed.position&&"relative"!=e.parent.computed.position&&(e.parent.node.style.position="relative"),u(e),e.parent.height=e.parent.node.offsetHeight,e.docOffsetTop=b(e.clone))}function f(e){var t=!0;e.clone&&v(e),i(e.node.style,e.css);for(var n=D.length-1;n>=0;n--)if(D[n].node!==e.node&&D[n].parent.node===e.parent.node){t=!1;break}t&&(e.parent.node.style.position=e.parent.css.position),e.mode=-1}function p(){for(var e=D.length-1;e>=0;e--)d(D[e])}function h(){for(var e=D.length-1;e>=0;e--)f(D[e])}function m(e,t){var n=e.node.style;switch(t){case 0:n.position="absolute",n.left=e.offset.left+"px",n.right=e.offset.right+"px",n.top=e.offset.top+"px",n.bottom="auto",n.width="auto",n.marginLeft=0,n.marginRight=0,n.marginTop=0;break;case 1:n.position="fixed",n.left=e.box.left+"px",n.right=e.box.right+"px",n.top=e.css.top,n.bottom="auto",n.width="auto",n.marginLeft=0,n.marginRight=0,n.marginTop=0;break;case 2:n.position="absolute",n.left=e.offset.left+"px",n.right=e.offset.right+"px",n.top="auto",n.bottom=0,n.width="auto",n.marginLeft=0,n.marginRight=0}e.mode=t}function g(e){e.clone=document.createElement("div");var t=e.node.nextSibling||e.node,n=e.clone.style;n.height=e.height+"px",n.width=e.width+"px",n.marginTop=e.computed.marginTop,n.marginBottom=e.computed.marginBottom,n.marginLeft=e.computed.marginLeft,n.marginRight=e.computed.marginRight,n.padding=n.border=n.borderSpacing=0,n.fontSize="1em",n.position="static",n.cssFloat=e.computed.cssFloat,e.node.parentNode.insertBefore(e.clone,t)}function v(e){e.clone.parentNode.removeChild(e.clone),e.clone=void 0}function y(e){var t=getComputedStyle(e),n=e.parentNode,i=getComputedStyle(n),o=e.style.position;e.style.position="relative";var a={top:t.top,marginTop:t.marginTop,marginBottom:t.marginBottom,marginLeft:t.marginLeft,marginRight:t.marginRight,cssFloat:t.cssFloat,display:t.display},s={top:r(t.top),marginBottom:r(t.marginBottom),paddingLeft:r(t.paddingLeft),paddingRight:r(t.paddingRight),borderLeftWidth:r(t.borderLeftWidth),borderRightWidth:r(t.borderRightWidth)};e.style.position=o;var l={position:e.style.position,top:e.style.top,bottom:e.style.bottom,left:e.style.left,right:e.style.right,width:e.style.width,marginTop:e.style.marginTop,marginLeft:e.style.marginLeft,marginRight:e.style.marginRight},u=x(e),c=x(n),d={node:n,css:{position:n.style.position},computed:{position:i.position},numeric:{borderLeftWidth:r(i.borderLeftWidth),borderRightWidth:r(i.borderRightWidth),borderTopWidth:r(i.borderTopWidth),borderBottomWidth:r(i.borderBottomWidth)}},f={node:e,box:{left:u.win.left,right:O.clientWidth-u.win.right},offset:{top:u.win.top-c.win.top-d.numeric.borderTopWidth,left:u.win.left-c.win.left-d.numeric.borderLeftWidth,right:-u.win.right+c.win.right-d.numeric.borderRightWidth +},css:l,isCell:"table-cell"==t.display,computed:a,numeric:s,width:u.win.right-u.win.left,height:u.win.bottom-u.win.top,mode:-1,inited:!1,parent:d,limit:{start:u.doc.top-s.top,end:c.doc.top+n.offsetHeight-d.numeric.borderBottomWidth-e.offsetHeight-s.top-s.marginBottom}};return f}function b(e){for(var t=0;e;)t+=e.offsetTop,e=e.offsetParent;return t}function x(e){var n=e.getBoundingClientRect();return{doc:{top:n.top+t.pageYOffset,left:n.left+t.pageXOffset},win:n}}function w(){I=setInterval(function(){!c()&&E()},500)}function C(){clearInterval(I)}function T(){H&&(document[P]?C():w())}function k(){H||(o(),p(),t.addEventListener("scroll",a),t.addEventListener("wheel",s),t.addEventListener("resize",E),t.addEventListener("orientationchange",E),e.addEventListener(B,T),w(),H=!0)}function E(){if(H){h();for(var e=D.length-1;e>=0;e--)D[e]=y(D[e].node);p()}}function S(){t.removeEventListener("scroll",a),t.removeEventListener("wheel",s),t.removeEventListener("resize",E),t.removeEventListener("orientationchange",E),e.removeEventListener(B,T),C(),H=!1}function N(){S(),h()}function L(){for(N();D.length;)D.pop()}function A(e){for(var t=D.length-1;t>=0;t--)if(D[t].node===e)return;var n=y(e);D.push(n),H?d(n):k()}function j(e){for(var t=D.length-1;t>=0;t--)D[t].node===e&&(f(D[t]),D.splice(t,1))}var _,I,D=[],H=!1,O=e.documentElement,M=function(){},P="hidden",B="visibilitychange";void 0!==e.webkitHidden&&(P="webkitHidden",B="webkitvisibilitychange"),t.getComputedStyle||n();for(var F=["","-webkit-","-moz-","-ms-"],q=document.createElement("div"),$=F.length-1;$>=0;$--){try{q.style.position=F[$]+"sticky"}catch(z){}""!=q.style.position&&n()}o(),t.Stickyfill={stickies:D,add:A,remove:j,init:k,rebuild:E,pause:S,stop:N,kill:L}}(document,window),window.jQuery&&!function(e){e.fn.Stickyfill=function(e){return this.each(function(){Stickyfill.add(this)}),this}}(window.jQuery),$(document).ready(function(){var e=function(){$("body").css("margin-bottom",$(".page__footer").outerHeight(!0))},t=!1;e(),$(window).resize(function(){t=!0}),setInterval(function(){t&&(t=!1,e())},250),$("#main").fitVids(),$(".sticky").Stickyfill();var n=function(){var e=0===$(".author__urls-wrapper button").length?$(window).width()>1024:!$(".author__urls-wrapper button").is(":visible");e?(Stickyfill.rebuild(),Stickyfill.init(),$(".author__urls").show()):(Stickyfill.stop(),$(".author__urls").hide())};n(),$(window).resize(function(){n()}),$(".author__urls-wrapper button").on("click",function(){$(".author__urls").fadeToggle("fast",function(){}),$(".author__urls-wrapper button").toggleClass("open")}),$("a").smoothScroll({offset:-20}),$("a[href$='.jpg'],a[href$='.jpeg'],a[href$='.JPG'],a[href$='.png'],a[href$='.gif']").addClass("image-popup"),$(".image-popup").magnificPopup({type:"image",tLoading:"Loading image #%curr%...",gallery:{enabled:!0,navigateByImgClick:!0,preload:[0,1]},image:{tError:'Image #%curr% could not be loaded.'},removalDelay:500,mainClass:"mfp-zoom-in",callbacks:{beforeOpen:function(){this.st.image.markup=this.st.image.markup.replace("mfp-figure","mfp-figure mfp-with-anim")}},closeOnContentClick:!0,midClick:!0})}); diff --git a/assets/js/plugins/jquery.greedy-navigation.js b/assets/js/plugins/jquery.greedy-navigation.js index 334e3fb40..0f1d4cd87 100644 --- a/assets/js/plugins/jquery.greedy-navigation.js +++ b/assets/js/plugins/jquery.greedy-navigation.js @@ -29,7 +29,7 @@ function updateNav() { if($btn.hasClass('hidden')) { $btn.removeClass('hidden'); } - + // The visible list is not overflowing } else { diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec new file mode 100644 index 000000000..51c2eaeb7 --- /dev/null +++ b/minimal-mistakes-jekyll.gemspec @@ -0,0 +1,28 @@ +# coding: utf-8 + +Gem::Specification.new do |spec| + spec.name = "minimal-mistakes-jekyll" + spec.version = "4.0.9" + spec.authors = ["Michael Rose"] + + spec.summary = %q{A flexible two-column Jekyll theme.} + spec.homepage = "https://github.com/mmistakes/minimal-mistakes" + spec.license = "MIT" + + spec.metadata["plugin_type"] = "theme" + + spec.files = `git ls-files -z`.split("\x0").select do |f| + f.match(%r{^(assets|_(includes|layouts|sass)/|(LICENSE|README|CHANGELOG)((\.(txt|md|markdown)|$)))}i) + end + + spec.add_dependency "jekyll", "~> 3.3" + + spec.add_development_dependency "bundler", "~> 1.12" + spec.add_development_dependency "rake", "~> 10.0" + + spec.add_runtime_dependency "jekyll-paginate", "~> 1.1" + spec.add_runtime_dependency "jekyll-sitemap", "~> 0.12" + spec.add_runtime_dependency "jekyll-gist", "~> 1.4" + spec.add_runtime_dependency "jekyll-feed", "~> 0.8" + spec.add_runtime_dependency "jemoji", "~> 0.7" +end diff --git a/package.json b/package.json index 0be284e0a..79e89fd72 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "3.4.8", + "version": "4.0.9", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",