Merge branch 'master' of https://github.com/alshedivat/al-folio

* 'master' of https://github.com/alshedivat/al-folio: Minor fixes of the dark mode + automatic equation numbering (alshedivat#160) Update text color in navbar in dark mode (alshedivat#154) add wide screen configuration (alshedivat#157) Support more accurate author annotation (alshedivat#156) Update README, change theme-color in _themes.scss (alshedivat#153) Move GA script to head.html (alshedivat#140) Update _base.scss (alshedivat#137) Adding back the description on the About page (alshedivat#136) Add keybase badge (alshedivat#132) add website (alshedivat#134) Issue 105 : Dark Mode + Theming alshedivat#118 (alshedivat#119) Updated Google Analytics code (alshedivat#123) Github MetaData (alshedivat#121) Added Twitter Card Support (alshedivat#120) Fix issues with loading scripts (alshedivat#117) Switch to MathJax 3.x. Fixes alshedivat#115. Update README.md Update README.md # Conflicts: # _config.yml # _includes/head.html # _includes/header.html # _sass/_base.scss # _sass/_variables.scss
searhein · Dec 31, 2020 · ea64cd4 · ea64cd4
2 parents d5ce29e + 4f9cdb1
commit ea64cd4
Show file tree

Hide file tree

Showing 31 changed files with 383 additions and 199 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,5 @@ _site
 .jekyll-metadata
 .DS_store
 .ruby-version
+.tweet-cache/
 Gemfile.lock
-
diff --git a/Gemfile b/Gemfile
@@ -3,8 +3,10 @@ group :jekyll_plugins do
     gem 'github-pages'
     gem 'jekyll'
     gem 'jekyll-email-protect'
+    gem 'jekyll-github-metadata'
     gem 'jekyll-paginate-v2'
     gem 'jekyll-scholar'
+    gem 'jekyll-twitter-plugin'
     gem 'jemoji'
     gem 'unicode_utils'
 end
diff --git a/README.md b/README.md
@@ -48,6 +48,7 @@ Feel free to add your own page(s) by sending a PR.
 <a href="https://apooladian.github.io/" target="_blank">★</a>
 <a href="https://chinmoy-dutta.github.io/" target="_blank">★</a>
 <a href="https://liamcli.com/" target="_blank">★</a>
+<a href="https://yoonholee.com/" target="_blank">★</a>
 </td>
 </tr>
 <tr>
@@ -63,13 +64,16 @@ Feel free to add your own page(s) by sending a PR.
 <td>Courses</td>
 <td>
 CMU PGM (<a href="https://sailinglab.github.io/pgm-spring-2019/" target="_blank">S-19</a>),
-CMU DeepRL (<a href="https://cmudeeprl.github.io/703website_f19/" target="_blank">F-19</a>, <a href="https://cmudeeprl.github.io/Spring202010403website/" target="_blank">S-20</a>, <a href="https://cmudeeprl.github.io/703website/" target="_blank">F-20</a>)
+CMU DeepRL (<a href="https://cmudeeprl.github.io/703website_f19/" target="_blank">F-19</a>, <a href="https://cmudeeprl.github.io/Spring202010403website/" target="_blank">S-20</a>, <a href="https://cmudeeprl.github.io/703website/" target="_blank">F-20</a>),
+CMU MMML (<a href="https://cmu-multicomp-lab.github.io/mmml-course/fall2020/" target="_blank">F-20</a>)
 </td>
 </tr>
 <tr>
 <td>Conferences & workshops</td>
 <td>
-ML Retrospectives (NeurIPS: <a href="https://ml-retrospectives.github.io/neurips2019/" target="_blank">2019</a>, <a href="https://ml-retrospectives.github.io/neurips2020/" target="_blank">2020</a>; ICML: <a href="https://ml-retrospectives.github.io/icml2020/" target="_blank">2020</a>)
+ML Retrospectives (NeurIPS: <a href="https://ml-retrospectives.github.io/neurips2019/" target="_blank">2019</a>, <a href="https://ml-retrospectives.github.io/neurips2020/" target="_blank">2020</a>; ICML: <a href="https://ml-retrospectives.github.io/icml2020/" target="_blank">2020</a>),
+HAMLETS (NeurIPS: <a href="https://hamlets-workshop.github.io/" target="_blank">2020</a>),
+ICBINB (NeurIPS: <a href="https://i-cant-believe-its-not-better.github.io/" target="_blank">2020</a>)
 </td>
 </tr>
 </table>
@@ -191,7 +195,7 @@ Easily create beautiful grids within your blog posts and project pages:
 
 #### Theming
 Six beautiful theme colors have been selected to choose from.
-The default is purple, but you can quickly change it by editing `$theme-color` variable in the `_sass/variables.scss` file.
+The default is purple, but you can quickly change it by editing `$theme-color` variable in the `_sass/_themes.scss` file.
 Other color variables are listed there as well.
 
 #### Social media previews

diff --git a/_config.yml b/_config.yml
@@ -26,14 +26,16 @@ last_updated: true # set to true if you want to display last updated in the foot
 
 navbar_fixed: true
 footer_fixed: true
+
+# Dimensions
+max_width: 800px
+
 # TODO: add layout settings (single page vs. multi-page)
 
 # -----------------------------------------------------------------------------
 # Open Graph
 # -----------------------------------------------------------------------------
 # Display links to the page with a preview object on social media.
-# To achieve this, change serve_og_meta to true and then provide the URL of the
-# preview image as the value of og_image.
 serve_og_meta: false # Include Open Graph meta tags in the HTML head
 og_image: # The site-wide (default for all links) Open Graph preview image
 
@@ -51,6 +53,7 @@ quora_username: # your Quora username
 publons_id: # your ID on Publons
 research_gate_profile: Alexander_Heinlein # your profile on ResearchGate
 blogger_url: # your blogger URL
+keybase_username: # your keybase user name
 
 contact_note: >
 #  You can even add a little note about which of these is the best way to reach you.
@@ -122,8 +125,10 @@ exclude: [vendor]
 # Plug-ins
 plugins:
   - jekyll-email-protect
+  - jekyll-github-metadata
   - jekyll-paginate-v2
   - jekyll/scholar
+  - jekyll-twitter-plugin
   - jemoji
   # - bootstrap
   # - material-sass
@@ -135,6 +140,7 @@ plugins:
 scholar:
 
   last_name: Heinlein
+  first_name: [Alexander, A.]
 
   style: apa
   locale: en
@@ -157,10 +163,10 @@ scholar:
 # -----------------------------------------------------------------------------
 
 enable_google_analytics:  false
-enable_katex:             true
 enable_mansory:           true
-enable_progressbar:       true
+enable_math:              true
 enable_tooltips:          false
+enable_darkmode:          true
 show_social_icons:        true
 
 # -----------------------------------------------------------------------------
@@ -180,12 +186,9 @@ fontawesome:
   integrity: "sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
 jquery:
   version: "3.5.1"
-  integrity: "sha512-/DXTXr6nQodMUiq+IUJYCt2PPOUjrHJ9wFrqpJ3XkgPNOZVfMok7cRw6CSxyCQxXn6ozlESsSh1/sMCTF1rL/g=="
-katex:
-  version: "0.12.0"
-  integrity:
-    css: "sha512-h7nl+xz8wgDlNM4NqKEM4F1NkIRS17M9+uJwIGwuo8vGqIl4BhuCKdxjWEINm+xyrUjNCnK5dCrhM0sj+wTIXw=="
-    js: "sha512-/CMIhXiDA3m2c9kzRyd97MTb3MC6OVnx4TElQ7fkkoRghwDf6gi41gaT1PwF270W6+J60uTmwgeRpNpJdRV6sg=="
+  integrity: "sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg=="
+mathjax:
+  version: "3.1.2"
 mansory:
   version: "4.2.2"
   integrity: "sha256-Nn1q/fx0H7SNLZMQ5Hw5JLaTRZp0yILA/FRexe19VdI="

diff --git a/_includes/head.html b/_includes/head.html
@@ -5,6 +5,16 @@
 <title>{% if site.title == blank %}{{ site.title }}{% else %}{{ site.first_name }} {{ site.middle_name }} {{ site.last_name }}{% endif %}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title>
 <meta name="description" content="{{ site.description }}">
 
+<!-- Open Graph -->
+{% if site.serve_og_meta %}
+<meta property="og:site_name" content="{{ site.description }}" />
+<meta property="og:type" content="object" />
+<meta property="og:title" content="{{ site.name }}" />
+<meta property="og:url" content="{{ page.url | prepend: site.baseurl | prepend: site.url }}" />
+<meta property="og:description" content="{{ page.title }}" />
+<meta property="og:image" content="{%- if page.og_image -%}{{ page.og_image }}{%- else -%}{{ site.og_image }}{%- endif -%}" />
+{% endif %}
+
 <!-- Bootstrap & MDB -->
 <link href="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/css/bootstrap.min.css" rel="stylesheet" integrity="{{ site.bootstrap.integrity.css }}" crossorigin="anonymous">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/css/mdb.min.css" integrity="{{ site.mdb.integrity.css }}" crossorigin="anonymous" />
@@ -14,18 +24,28 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/{{ site.academicons.version }}/css/academicons.min.css" integrity="{{ site.academicons.integrity }}" crossorigin="anonymous">
 <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:100,300,400,500,700|Material+Icons">
 
+<!-- Code Syntax Highlighting -->
+<link rel="stylesheet" href="https://gitcdn.link/repo/jwarby/jekyll-pygments-themes/master/{{ site.highlight_theme }}.css" />
+
 <!-- Styles -->
-<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico'  | relative_url }}?">
+<link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | relative_url }}?">
 <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
 
 <link rel="canonical" href="{{ page.url | replace:'index.html','' | relative_url }}">
 
-<!-- Open Graph -->
-{% if site.serve_og_meta %}
-<meta property="og:site_name" content="{{ site.description }}" />
-<meta property="og:type" content="object" />
-<meta property="og:title" content="{{ site.name }}" />
-<meta property="og:url" content="{{ page.url | prepend: site.baseurl | prepend: site.url }}" />
-<meta property="og:description" content="{{ page.title }}" />
-<meta property="og:image" content="{%- if page.og_image -%}{{ page.og_image }}{%- else -%}{{ site.og_image }}{%- endif -%}" />
+<!-- Theming-->
+{% if site.enable_darkmode %}
+  <script src="{{ '/assets/js/theme.js' | relative_url }}"></script>
+{% endif %}
+
+{% if site.enable_google_analytics %}
+  <!-- Global site tag (gtag.js) - Google Analytics -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.google_analytics }}"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag() { dataLayer.push(arguments); }
+    gtag('js', new Date());
+
+    gtag('config', '{{ site.google_analytics }}');
+  </script>
 {% endif %}
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,7 +1,7 @@
 <header>
 
     <!-- Nav Bar -->
-    <nav id="navbar" class="navbar navbar-light bg-white navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
+    <nav id="navbar" class="navbar navbar-light navbar-expand-sm {% if site.navbar_fixed %}fixed-top{% else %}sticky-top{% endif %}">
     <div class="container">
       {% if page.title != "about" %}
       <a class="navbar-brand title font-weight-lighter" href="{{ site.baseurl | prepend: site.url }}/">
@@ -56,52 +56,14 @@
           </li>
           {% endif %}
           {% endfor %}
-          <!-- Own Navigation -->
-          <!-- {% assign sorted_pages = site.data.navigation | sort: "title" %}
-          {% for p in sorted_pages %}
-          {% if p.subfolderitems %}
-          <li class="nav-item {% if page.title == p.title %}active{% endif %}">
-              {% if p.url %}
-              <a class="nav-link dropdown" href="{{ p.url | relative_url }}"> {{ p.title }} <span class="caret"></span></a>
-              <ul class="dropdown-menu">
-                  {% for sublink in p.subfolderitems %}
-                  <li class="nav-item {% if page.title == sublink.title %}active{% endif %}">
-                      <a class="nav-link" href="{{ sublink.url | relative_url }}">
-                        {{ sublink.title }}
-                        {% if page.title == sublink.title %}
-                        <span class="sr-only">(current)</span>
-                        {% endif %}
-                      </a>
-                  </li>
-                  {% endfor %}
-              </ul>
-              {% else %}
-              <a class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> {{ p.title }} <span class="caret"></span></a>
-              <ul class="dropdown-menu">
-                  {% for sublink in p.subfolderitems %}
-                  <li class="nav-item {% if page.title == sublink.title %}active{% endif %}">
-                      <a class="nav-link" href="{{ sublink.url | relative_url }}">
-                        {{ sublink.title }}
-                        {% if page.title == sublink.title %}
-                        <span class="sr-only">(current)</span>
-                        {% endif %}
-                      </a>
-                  </li>
-                  {% endfor %}
-              </ul>
-              {% endif %}
-          </li>
-          {% else %}
-          <li class="nav-item {% if page.title == p.title %}active{% endif %}">
-              <a class="nav-link" href="{{ p.url | relative_url }}">
-                {{ p.title }}
-                {% if page.title == p.title %}
-                <span class="sr-only">(current)</span>
-                {% endif %}
+          {% if site.enable_darkmode %}
+            <div class = "toggle-container">
+              <a id = "light-toggle">
+                  <i class="fas fa-moon"></i>
+                  <i class="fas fa-sun"></i>
               </a>
-          </li>
+            </div>
           {% endif %}
-          {% endfor %} -->
         </ul>
       </div>
     </div>

diff --git a/_includes/hemline.html b/_includes/hemline.html
diff --git a/_includes/scripts/bootstrap.html b/_includes/scripts/bootstrap.html
@@ -0,0 +1,4 @@
+<!-- Bootsrap & MDB scripts -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/{{ site.popper.version }}/umd/popper.min.js" integrity="{{ site.popper.integrity }}" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/{{ site.bootstrap.version }}/js/bootstrap.min.js" integrity="{{ site.bootstrap.integrity.js }}" crossorigin="anonymous"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/mdbootstrap/{{ site.mdb.version }}/js/mdb.min.js" integrity="{{ site.mdb.integrity.js }}" crossorigin="anonymous"></script>
diff --git a/_includes/scripts/jquery.html b/_includes/scripts/jquery.html
@@ -0,0 +1,2 @@
+<!-- jQuery -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/{{ site.jquery.version }}/jquery.min.js" integrity="{{ site.jquery.integrity }}" crossorigin="anonymous"></script>
diff --git a/_includes/scripts/mansory.html b/_includes/scripts/mansory.html
@@ -0,0 +1,6 @@
+{% if site.enable_mansory %}
+<!-- Mansory & imagesLoaded -->
+<script defer src="https://unpkg.com/masonry-layout@4/dist/masonry.pkgd.min.js"></script>
+<script defer src="https://unpkg.com/imagesloaded@4/imagesloaded.pkgd.min.js"></script>
+<script defer src="{{ '/assets/js/mansory.js' | relative_url }}" type="text/javascript"></script>
+{% endif %}
diff --git a/_includes/scripts/mathjax.html b/_includes/scripts/mathjax.html
@@ -0,0 +1,12 @@
+{% if site.enable_math %}
+<!-- MathJax -->
+<script type="text/javascript">
+  window.MathJax = {
+    tex: {
+      tags: 'ams'
+    }
+  };
+</script>
+<script defer type="text/javascript" id="MathJax-script" src="https://cdn.jsdelivr.net/npm/mathjax@{{ site.mathjax.version }}/es5/tex-mml-chtml.js"></script>
+<script defer src="https://polyfill.io/v3/polyfill.min.js?features=es6"></script>
+{% endif %}
diff --git a/_includes/scripts/misc.html b/_includes/scripts/misc.html
@@ -0,0 +1,13 @@
+{% if site.enable_tooltips %}
+<!-- Enable Tooltips -->
+<script type="text/javascript">
+$(function () {$('[data-toggle="tooltip"]').tooltip()})
+</script>
+{% endif %}
+
+
+<!-- Load Common JS -->
+<script src="{{ '/assets/js/common.js' | relative_url }}"></script>
+
+<!-- Load DarkMode JS -->
+<script src="{{ '/assets/js/dark_mode.js' | relative_url }}"></script>
diff --git a/_includes/social.html b/_includes/social.html
@@ -11,4 +11,5 @@
   {% if site.quora_username %}<a href="https://www.quora.com/profile/{{ site.quora_username }}" target="_blank" title="Quora"><i class="fab fa-quora"></i></a>{% endif %}
   {% if site.blogger_url %}<a href="{{ site.blogger_url }}" target="_blank" title="Blogger"><i class="fab fa-blogger-b"></i></a>{% endif %}
   {% if site.strava_userid %}<a href="https://www.strava.com/athletes/{{ site.strava_userid }}" target="_blank" title="Strava"><i class="fab fa-strava"></i></a>{% endif %}
+  {% if site.keybase_username %}<a href="https://keybase.io/{{ site.keybase_username }}" target="_blank" title="Keybase"><i class="fab fa-keybase"></i></a>{% endif %}
 </span>
diff --git a/_layouts/about.html b/_layouts/about.html
@@ -8,6 +8,7 @@
     <h1 class="post-title">
      {% if site.title == blank %}{{ site.title }}{% else %}<span class="font-weight-bold">{{ site.first_name }}</span> {{ site.middle_name }}  {{ site.last_name }}{% endif %}
     </h1>
+     <p class="desc">{{ page.description }}</p>
   </header>
 
   <article>