Merge https://github.com/academicpages/academicpages.github.io

_config.yml

@@ -17,7 +17,9 @@ repository : "yixuancao.github.io"
 teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png"
 breadcrumbs : false # true, false (default)
 words_per_minute : 160
+future : true
 read_more : "disabled" # if enabled, adds "Read more" links to excerpts
+talkmap_link : false #change to true to add link to talkmap on talks page
 comments:
  provider : # false (default), "disqus", "discourse", "facebook", "google-plus", "staticman", "custom"
  disqus:
@@ -85,6 +87,7 @@ author:
  employer :
  googlescholar : "https://scholar.google.com/citations?user=Q5XWFacAAAAJ"
  email :
+ researchgate : # example: "https://www.researchgate.net/profile/yourprofile"
  uri :
  bitbucket :
  codepen :
@@ -96,6 +99,7 @@ author:
  google_plus :
  keybase :
  instagram :
+ impactstory : #"https://profiles.impactstory.org/u/xxxx-xxxx-xxxx-xxxx"
  lastfm :
  linkedin :
  orcid : 
@@ -124,22 +128,23 @@ exclude:
  - .bundle
  - .jekyll-assets-cache
  - .sass-cache
- - assets/js/plugins
- - assets/js/_main.js
- - assets/js/vendor
- - Capfile
  - CHANGELOG
- - config
+ - Capfile
  - Gemfile
  - Gruntfile.js
- - gulpfile.js
  - LICENSE
+ - README
+ - Rakefile
+ - assets/js/_main.js
+ - assets/js/plugins
+ - assets/js/vendor
+ - config
+ - gulpfile.js
  - log
  - node_modules
  - package.json
- - Rakefile
- - README
  - tmp
+ - vendor
 keep_files:
  - .git
  - .svn
@@ -244,7 +249,7 @@ timezone: America/Los_Angeles # http://en.wikipedia.org/wiki/List_of_tz_database
 
 
 # Plugins
-gems:
+plugins:
  - jekyll-paginate
  - jekyll-sitemap
  - jekyll-gist

_data/ui-text.yml

@@ -186,11 +186,11 @@ pt: &DEFAULT_PT
  page : "Página"
  pagination_previous : "Anterior"
  pagination_next : "Próxima"
- breadcrumb_home_label : "Home"
+ breadcrumb_home_label : "Início"
  breadcrumb_separator : "/"
  toc_label : "Nesta página"
  ext_link_label : "Link direto"
- less_than : "meno que"
+ less_than : "menor que"
  minute_read : "minutos de leitura"
  share_on_label : "Compartilhe em"
  meta_label :
@@ -200,25 +200,25 @@ pt: &DEFAULT_PT
  comments_label : "Deixe um comentário"
  comments_title :
  more_label : "Aprenda Mais"
- related_label : "Você Talvez Goste Também"
+ related_label : "Talvez Você Goste Também"
  follow_label : "Acompanhe em"
  feed_label : "Feed"
- powered_by : "Feito com"
+ powered_by : "Feito por"
  website_label : "Site"
- email_label : "Email"
+ email_label : "E-mail"
  recent_posts : "Postagens recentes"
  undefined_wpm : "Parâmetro indefinido em word_per_minute no _config.yml"
- 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 : "Seu endereço de e-mail não será publicado. Campos obrigatórios são marcados"
+ comment_form_comment_label : "Comentário"
+ comment_form_md_info : "Markdown é suportado"
+ comment_form_name_label : "Nome"
+ comment_form_email_label : "Endereço de e-mail'"
+ comment_form_website_label : "Website (opcional)"
+ comment_btn_submit : "Enviar Comentário"
+ comment_btn_submitted : "Enviado"
+ comment_success_msg : "Obrigado por seu comentário! Ele será exibido no site depois de aprovado."
+ comment_error_msg : "Desculpe, houve um erro com o seu envio. Certifique-se de que todos os campos obrigatórios foram preenchidos e tente novamente."
+ loading_label : "Carregando..."
 pt-BR:
  <<: *DEFAULT_PT
 pt-PT:

_includes/author-profile.html

@@ -29,86 +29,95 @@ <h3 class="author__name">{{ author.name }}</h3>
  <li><i class="fa fa-fw fa-map-marker" aria-hidden="true"></i> {{ author.employer }}</li>
  {% endif %}
  {% if author.uri %}
- <li><a href="{{ author.uri }}"><i class="fa fa-fw fa-chain" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].website_label | default: "Website" }}</a></li>
+ <li><a href="{{ author.uri }}"><i class="fas fa-fw fa-link" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].website_label | default: "Website" }}</a></li>
  {% endif %}
  {% if author.email %}
- <li><a href="mailto:{{ author.email }}"><i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].email_label | default: "Email" }}</a></li>
+ <li><a href="mailto:{{ author.email }}"><i class="fas fa-fw fa-envelope" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].email_label | default: "Email" }}</a></li>
  {% endif %}
  {% if author.keybase %}
- <li><a href="https://keybase.io/{{ author.keybase }}"><i class="fa fa-fw fa-key" aria-hidden="true"></i> Keybase</a></li>
+ <li><a href="https://keybase.io/{{ author.keybase }}"><i class="fas fa-fw fa-key" aria-hidden="true"></i> Keybase</a></li>
+ {% endif %}
+ {% if author.researchgate %}
+ <li><a href="{{ author.researchgate }}"><i class="fab fa-fw fa-researchgate" aria-hidden="true"></i> ResearchGate</a></li>
  {% endif %}
  {% if author.twitter %}
- <li><a href="https://twitter.com/{{ author.twitter }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+ <li><a href="https://twitter.com/{{ author.twitter }}"><i class="fab fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
  {% endif %}
  {% if author.facebook %}
- <li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
+ <li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fab fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
  {% endif %}
  {% if author.google_plus %}
- <li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+</a></li>
+ <li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fab fa-fw fa-google-plus" aria-hidden="true"></i> Google+</a></li>
  {% endif %}
  {% if author.linkedin %}
- <li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn</a></li>
+ <li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fab fa-fw fa-linkedin" aria-hidden="true"></i> LinkedIn</a></li>
  {% endif %}
  {% if author.xing %}
- <li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
+ <li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fab fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
  {% endif %}
  {% if author.instagram %}
- <li><a href="https://instagram.com/{{ author.instagram }}"><i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
+ <li><a href="https://instagram.com/{{ author.instagram }}"><i class="fab fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
  {% endif %}
  {% if author.tumblr %}
- <li><a href="https://{{ author.tumblr }}.tumblr.com"><i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
+ <li><a href="https://{{ author.tumblr }}.tumblr.com"><i class="fab fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
  {% endif %}
  {% if author.bitbucket %}
- <li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
+ <li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fab fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
  {% endif %}
  {% if author.github %}
- <li><a href="https://github.com/{{ author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
+ <li><a href="https://github.com/{{ author.github }}"><i class="fab fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
  {% endif %}
  {% if author.stackoverflow %}
- <li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
+ <li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fab fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
  {% endif %}
  {% if author.lastfm %}
- <li><a href="https://lastfm.com/user/{{ author.lastfm }}"><i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
+ <li><a href="https://lastfm.com/user/{{ author.lastfm }}"><i class="fab fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
  {% endif %}
  {% if author.dribbble %}
- <li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble</a></li>
+ <li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fab fa-fw fa-dribbble-square" aria-hidden="true"></i> Dribbble</a></li>
  {% endif %}
  {% if author.pinterest %}
- <li><a href="https://www.pinterest.com/{{ author.pinterest }}"><i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
+ <li><a href="https://www.pinterest.com/{{ author.pinterest }}"><i class="fab fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
  {% endif %}
  {% if author.foursquare %}
- <li><a href="https://foursquare.com/{{ author.foursquare }}"><i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
+ <li><a href="https://foursquare.com/{{ author.foursquare }}"><i class="fab fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
  {% endif %}
  {% if author.steam %}
- <li><a href="https://steamcommunity.com/id/{{ author.steam }}"><i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
+ <li><a href="https://steamcommunity.com/id/{{ author.steam }}"><i class="fab fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
  {% endif %}
  {% if author.youtube %}
- <li><a href="https://www.youtube.com/user/{{ author.youtube }}"><i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> YouTube</a></li>
+ <li><a href="https://www.youtube.com/user/{{ author.youtube }}"><i class="fab fa-fw fa-youtube" aria-hidden="true"></i> YouTube</a></li>
  {% endif %}
  {% if author.soundcloud %}
- <li><a href="https://soundcloud.com/{{ author.soundcloud }}"><i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
+ <li><a href="https://soundcloud.com/{{ author.soundcloud }}"><i class="fab fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
  {% endif %}
  {% if author.weibo %}
- <li><a href="https://www.weibo.com/{{ author.weibo }}"><i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
+ <li><a href="https://www.weibo.com/{{ author.weibo }}"><i class="fab fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
  {% endif %}
  {% if author.flickr %}
- <li><a href="https://www.flickr.com/{{ author.flickr }}"><i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
+ <li><a href="https://www.flickr.com/{{ author.flickr }}"><i class="fab fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
  {% endif %}
  {% if author.codepen %}
- <li><a href="https://codepen.io/{{ author.codepen }}"><i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
+ <li><a href="https://codepen.io/{{ author.codepen }}"><i class="fab fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
  {% endif %}
  {% if author.vine %}
- <li><a href="https://vine.co/u/{{ author.vine }}"><i class="fa fa-fw fa-vine" aria-hidden="true"></i> Vine</a></li>
+ <li><a href="https://vine.co/u/{{ author.vine }}"><i class="fab fa-fw fa-vine" aria-hidden="true"></i> Vine</a></li>
  {% endif %}
  {% if author.googlescholar %}
- <li><a href="{{ author.googlescholar }}"><i class="ai ai-google-scholar-square ai-fw"></i> Google Scholar</a></li>
+ <li><a href="{{ author.googlescholar }}"><i class="fas fa-fw fa-graduation-cap"></i> Google Scholar</a></li>
+ {% endif %}
+ {% if author.pubmed %}
+ <li><a href="{{ author.pubmed }}"><i class="ai ai-pubmed-square ai-fw"></i> PubMed</a></li>
  {% endif %}
  {% if author.orcid %}
  <li><a href="{{ author.orcid }}"><i class="ai ai-orcid-square ai-fw"></i> ORCID</a></li>
  {% endif %}
- {% if author.wikipedia %}
- <li><a href="https://en.wikipedia.org/wiki/User:{{ author.wikipedia }}"><i class="fa fa-fw fa-chain" aria-hidden="true"></i> Wikipedia</a></li>
+ {% if author.impactstory %}
+ <li><a href="{{ author.impactstory }}"><i class="ai ai-impactstory ai-fw"></i> Impactstory</a></li>
  {% endif %}
+ {% if author.wikipedia %}
+ <li><a href="https://en.wikipedia.org/wiki/User:{{ author.wikipedia }}"><i class="fab fa-fw fa-wikipedia-w" aria-hidden="true"></i> Wikipedia</a></li>
+{% endif %}
  </ul>
  </div>
 </div>

_includes/footer.html

@@ -6,16 +6,16 @@
  <li><strong>{{ site.data.ui-text[site.locale].follow_label }}</strong></li>
  {% endif %}
  {% if site.twitter.username %}
- <li><a href="https://twitter.com/{{ site.twitter.username }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+ <li><a href="https://twitter.com/{{ site.twitter.username }}"><i class="fab fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
  {% endif %}
  {% if site.facebook.username %}
- <li><a href="https://facebook.com/{{ site.facebook.username }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
+ <li><a href="https://facebook.com/{{ site.facebook.username }}"><i class="fab fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
  {% endif %}
  {% if site.author.github %}
- <li><a href="http://github.com/{{ site.author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+ <li><a href="http://github.com/{{ site.author.github }}"><i class="fab fa-github" aria-hidden="true"></i> GitHub</a></li>
  {% endif %}
  {% if site.author.bitbucket %}
- <li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
+ <li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fab fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
  {% endif %}
  <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ base_path }}/feed.xml{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
  </ul>

_includes/head/custom.html

@@ -33,6 +33,6 @@
  }
  });
 </script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"></script>
+<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.4/latest.js?config=TeX-MML-AM_CHTML' async></script>
 
 <!-- end custom head snippets -->

_includes/social-share.html

@@ -5,11 +5,9 @@
  <h4 class="page__share-title">{{ site.data.ui-text[site.locale].share_on_label | default: "Share on" }}</h4>
  {% endif %}
 
- <a href="https://twitter.com/intent/tweet?text={{ base_path }}{{ page.url }}" class="btn btn--twitter" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Twitter"><i class="fa fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
+ <a href="https://twitter.com/intent/tweet?text={{ base_path }}{{ page.url }}" class="btn btn--twitter" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Twitter"><i class="fab fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
 
- <a href="https://www.facebook.com/sharer/sharer.php?u={{ base_path }}{{ page.url }}" class="btn btn--facebook" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Facebook"><i class="fa fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
+ <a href="https://www.facebook.com/sharer/sharer.php?u={{ base_path }}{{ page.url }}" class="btn btn--facebook" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Facebook"><i class="fab fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
 
- <a href="https://plus.google.com/share?url={{ base_path }}{{ page.url }}" class="btn btn--google-plus" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} Google Plus"><i class="fa fa-fw fa-google-plus" aria-hidden="true"></i><span> Google+</span></a>
-
- <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ base_path }}{{ page.url }}" class="btn btn--linkedin" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} LinkedIn"><i class="fa fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
+ <a href="https://www.linkedin.com/shareArticle?mini=true&url={{ base_path }}{{ page.url }}" class="btn btn--linkedin" title="{{ site.data.ui-text[site.locale].share_on_label | default: 'Share on' }} LinkedIn"><i class="fab fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
 </section>

_layouts/default.html

@@ -18,8 +18,6 @@
 
  {{ content }}
 
- </script>
-
  <div class="page__footer">
  <footer>
  {% include footer/custom.html %}

_layouts/talk.html

@@ -4,7 +4,7 @@
 
 {% include base_path %}
 
-{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
+{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
  {% include page__hero.html %}
 {% endif %}
 

_pages/talks.html

@@ -0,0 +1,16 @@
+---
+layout: archive
+title: "Talks and presentations"
+permalink: /talks/
+author_profile: true
+---
+
+{% if site.talkmap_link == true %}
+
+<p style="text-decoration:underline;"><a href="/talkmap.html">See a map of all the places I've given a talk!</a></p>
+
+{% endif %}
+
+{% for post in site.talks reversed %}
+ {% include archive-single-talk.html %}
+{% endfor %}

_posts/2199-01-01-future-post.md

@@ -0,0 +1,11 @@
+---
+title: 'Future Blog Post'
+date: 2199-01-01
+permalink: /posts/2012/08/blog-post-4/
+tags:
+ - cool posts
+ - category1
+ - category2
+---
+
+This post will show up by default. To disable scheduling of future posts, edit `config.yml` and set `future: false`. 

_sass/_archive.scss

@@ -15,8 +15,15 @@
  }
 
  a {
- color: inherit;
- text-decoration: none;
+ text-decoration: underline;
+
+ &:hover {
+ text-decoration: underline;
+
+ img {
+ box-shadow: 0 0 10px rgba(#000, 0.25);
+ }
+ }
  }
 }