From 20e8a83fcd899da1b9e43c744d9aad97c2012f8a Mon Sep 17 00:00:00 2001
From: Maruan Al-Shedivat <alshedivat.maruan@gmail.com>
Date: Tue, 31 Jan 2017 10:05:44 -0500
Subject: [PATCH] Refresh and update styles

---
 _config.yml                     |   7 +-
 _includes/footer.html           |  10 ++-
 _includes/head.html             |   2 +
 _includes/header.html           |  10 +++
 _includes/hemline.html          |  11 +++
 _includes/news.html             |   3 +-
 _layouts/bib.html               |  24 +++----
 _pages/about.md                 |   2 +-
 _sass/_base.scss                |   3 +-
 _sass/_layout.scss              | 115 +++++++++++++++++---------------
 assets/css/academicons.min.css  |   0
 assets/css/font-awesome.min.css |   0
 assets/css/main.scss            |   0
 assets/fonts/academicons.eot    | Bin
 assets/fonts/academicons.svg    |   0
 assets/fonts/academicons.ttf    | Bin
 assets/fonts/academicons.woff   | Bin
 17 files changed, 108 insertions(+), 79 deletions(-)
 mode change 100755 => 100644 assets/css/academicons.min.css
 mode change 100755 => 100644 assets/css/font-awesome.min.css
 mode change 100755 => 100644 assets/css/main.scss
 mode change 100755 => 100644 assets/fonts/academicons.eot
 mode change 100755 => 100644 assets/fonts/academicons.svg
 mode change 100755 => 100644 assets/fonts/academicons.ttf
 mode change 100755 => 100644 assets/fonts/academicons.woff

diff --git a/_config.yml b/_config.yml
index 99f27f6..4e50785 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,6 +6,7 @@ name: Your Name
 email: you@example.com
 description: > # this means to ignore newlines until "url:"
   A simple, whitespace theme for academics. Based on [*folio](https://github.com/bogoli/-folio) design.
+last_updated:
 
 url:  # the base hostname & protocol for your site
 baseurl: /al-folio # the subpath of your site, e.g. /blog/
@@ -42,6 +43,9 @@ collections:
     output: true
     permalink: /poetry/:path/
 
+# Collection settings
+news_limit: 5
+
 # -----------------------------------------------------------------------------
 # Jekyll settings
 # -----------------------------------------------------------------------------
@@ -91,6 +95,5 @@ scholar:
 # -----------------------------------------------------------------------------
 # Other advanced settings (don't touch if you are not sure)
 # -----------------------------------------------------------------------------
-fontawesome_version: "4.6.3"
 jquery_version: "1.12.4"
-katex_version: "0.6.0"
+katex_version: "0.7.0"
diff --git a/_includes/footer.html b/_includes/footer.html
index 08b6a8f..a129f7c 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,9 +1,13 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-  	<p class="small">
-    © Copyright {{ site.time | date: '%Y' }} {{ site.name }}.
-    {{ site.footer_text }}</p>
+    <p class="small">
+        © Copyright {{ site.time | date: '%Y' }} {{ site.name }}.
+        {{ site.footer_text }}
+        {% if site.last_updated %}
+            Last updated: {{ site.last_updated }}.
+        {% endif %}
+    </p>
   </div>
 
 </footer>
diff --git a/_includes/head.html b/_includes/head.html
index 62343f6..81df8e2 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -6,6 +6,8 @@
   <title>{{ site.name }}{% if page.title and page.url != "/" %} | {{ page.title }}{% endif %}</title>
   <meta name="description" content="{{ site.description }}">
 
+  <link rel="shortcut icon" href="{{ '/assets/img/favicon.ico' | prepend: site.baseurl | prepend: site.url }}">
+
   <link rel="stylesheet" href="{{ '/assets/css/main.css' | prepend: site.baseurl | prepend: site.url }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
 </head>
diff --git a/_includes/header.html b/_includes/header.html
index 0428f8a..7992ffd 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -2,6 +2,13 @@
 
   <div class="wrapper">
 
+    {% if page.layout != "about" %}
+    <span class="site-title">
+        {% assign name = site.name | split: ' ' %}
+        <strong>{{ name | first }}</strong> {{ name | last }}
+    </span>
+    {% endif %}
+
     <nav class="site-nav">
 
       <div class="trigger">
@@ -18,6 +25,9 @@
           {% endif %}
         {% endfor %}
 
+        <!-- CV link -->
+        <a class="page-link" href="{{ '/assets/pdf/CV.pdf' | prepend: site.baseurl | prepend: site.url }}">vitae</a>
+
       </div>
     </nav>
 
diff --git a/_includes/hemline.html b/_includes/hemline.html
index 4c8bf2f..3e5e09e 100644
--- a/_includes/hemline.html
+++ b/_includes/hemline.html
@@ -12,3 +12,14 @@
 <!-- Include custom icon fonts -->
 <link rel="stylesheet" href="{{ '/assets/css/font-awesome.min.css' | prepend: site.baseurl | prepend: site.url }}">
 <link rel="stylesheet" href="{{ '/assets/css/academicons.min.css' | prepend: site.baseurl | prepend: site.url }}">
+
+<!-- Google Analytics -->
+<script>
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ga('create', 'UA-XXXXXXXX-X', 'auto');
+ga('send', 'pageview');
+</script>
diff --git a/_includes/news.html b/_includes/news.html
index 929aeb9..f11ca7c 100644
--- a/_includes/news.html
+++ b/_includes/news.html
@@ -2,7 +2,8 @@
   <h2>news</h2>
   {% if site.news  %}
     <table>
-    {% for item in site.news reversed %}
+    {% assign news = site.news | reverse %}
+    {% for item in news limit: site.news_limit %}
       <tr>
         <td class="date">{{ item.date | date: "%b %-d, %Y" }}</td>
         <td class="announcement">
diff --git a/_layouts/bib.html b/_layouts/bib.html
index f64ecf4..85d338a 100644
--- a/_layouts/bib.html
+++ b/_layouts/bib.html
@@ -2,7 +2,11 @@
 ---
 
 {% if entry.abbr %}
-  <abbr>[{{entry.abbr}}]</abbr>
+  {% if site.data.venues[entry.abbr] %}
+    <abbr>[<a href="{{site.data.venues[entry.abbr].url}}" target="_blank">{{entry.abbr}}</a>]</abbr>
+  {% else %}
+    <abbr>[{{entry.abbr}}]</abbr>
+  {% endif %}
 {% endif %}
 
 <div id="{{entry.key}}">
@@ -23,7 +27,7 @@
             {% endif %}
           {% endif %}
         {% else %}
-          {% if entry.author_array.length > 1 %} and {% endif %}
+          and
           {% if author.last == site.scholar.last_name %}
             <em>{{author.last}}, {{author.first}}</em>
           {% else %}
@@ -37,7 +41,6 @@
       {% endfor %}
     </span>
 
-    {% if entry.type != "book" %}
     <span class="periodical">
     {% if entry.type == "article" %}
       <em>{{entry.journal}}</em>
@@ -48,24 +51,15 @@
       {{entry.year}}
     {% endif %}
     </span>
-    {% endif %}
-
-    {% if entry.type == "book" %}
-    <span class="publisher">
-      {% if entry.publisher %}
-        <em>{{entry.publisher}}</em>
-      {% endif %}
-      {% if entry.year %}
-        {{entry.year}}
-      {% endif %}
-    </span>
-    {% endif %}
   {% endif %}
 
   <span class="links">
   {% if entry.abstract %}
     [<a class="abstract">Abs</a>]
   {% endif %}
+  {% if entry.arxiv %}
+    [<a href="http://arxiv.org/abs/{{ entry.arxiv }}" target="_blank">arXiv</a>]
+  {% endif %}
   {% if entry.html %}
     [<a href="{{ entry.html }}" target="_blank">HTML</a>]
   {% endif %}
diff --git a/_pages/about.md b/_pages/about.md
index c32b703..6d171e2 100644
--- a/_pages/about.md
+++ b/_pages/about.md
@@ -1,7 +1,7 @@
 ---
 layout: about
 permalink: /
-title: your name
+title: <strong>Your</strong> Name
 description: <a href="">Affiliations</a>. Address. Contacts. Moto. Etc.
 
 profile:
diff --git a/_sass/_base.scss b/_sass/_base.scss
index 1edb73c..d23be8b 100644
--- a/_sass/_base.scss
+++ b/_sass/_base.scss
@@ -74,10 +74,9 @@ ul, ol, dl, figure,
 hr {
     /* Inset, by Dan Eden */
     border: 0;
+    height: 0;
     border-top: 1px solid rgba(0, 0, 0, 0.1);
     border-bottom: 1px solid rgba(255, 255, 255, 0.3);
-    height: 0;
-    margin: 20px 0;
 }
 
 
diff --git a/_sass/_layout.scss b/_sass/_layout.scss
index 5a29988..f0b60ee 100644
--- a/_sass/_layout.scss
+++ b/_sass/_layout.scss
@@ -5,7 +5,7 @@
 .site-header {
     border-bottom: 1px solid $grey-color-light;
     background-color: #fff;
-    opacity: 0.75;
+    opacity: 0.95;
     position:fixed;
     left:0px;
     top:0px;
@@ -19,10 +19,6 @@
     line-height: $nav-height;
     letter-spacing: -1px;
     margin-bottom: 0;
-    &:hover {
-        text-decoration: none;
-        color: $theme-color;
-    }
 }
 .site-nav {
     float: right;
@@ -100,11 +96,14 @@
         border-collapse: collapse;
         width: 100%;
 
-        .date { width: 20%; }
-        .announcement { width: 80%; }
+        .date { width: 19%; }
+        .announcement { width: 81%; }
 
         tr { text-align: left; }
-        td { padding: 5px 0;}
+        td {
+            padding: 5px 0;
+            vertical-align: top;
+        }
     }
 }
 
@@ -230,20 +229,23 @@
 .publications {
     h2 {
         color: $theme-color;
+        // border-bottom: 1px solid $theme-color;
+        // border-top: 1px solid $theme-color;
         font-size: 32px;
-        margin: 40px 0;
+        margin-bottom: 30px;
+        // padding: 20px 0;
         text-align: center;
     }
 }
 .year {
-    border-bottom: 1px solid $grey-color-light;
+    border-top: 1px solid $grey-color-light;
     color: $grey-color-light;
-    margin: 0 -2.5em 40px -2em;
-    padding-bottom: 5px;
+    margin: 0 -3em -2.5ex -2em;
+    padding-top: 1ex;
     text-align: right;
 }
 .bibliography {
-    margin-bottom: 20px;
+    margin-bottom: 50px;
     margin-top: 20px;
     list-style-type: circle;
 
@@ -261,7 +263,10 @@
                     text-decoration: none;
                 }
             }
-            > em { border-bottom: 1px solid; }
+            > em {
+                border-bottom: 1px solid;
+                font-style: normal;
+            }
         }
         a.abstract, a.bibtex { cursor: pointer; }
         .hidden {
@@ -313,47 +318,47 @@
  /*****************************************************************************
  * Projects
  *****************************************************************************/
-.project {
-    box-sizing: border-box;
-    float: left;
-    height: 250px;
-    padding: 10px;
-    vertical-align: middle;
-    width: 33.33%;
-}
-.thumbnail {
-    overflow: hidden;
-    height: 230px;
-    width: 100%;
-}
-.thumbnail img{
-    height: auto;
-    position: relative;
-        left: -25%;
-        top: -5%;
-    width: 500px;
-}
-.thumbnail a{
-    float: left;
-    height: 230px;
-    position: relative;
-    width: 100%;
-}
-.thumbnail a span {
-    display: none;
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    background: rgba(0,0,0,0.4);
-    color: $grey-color-light;
-    padding: 40px;
-    text-align: center;
-}
-.thumbnail a:hover span {
-    display: block;
-}
+ .project {
+     box-sizing: border-box;
+     float: left;
+     height: 250px;
+     padding: 10px;
+     vertical-align: middle;
+     width: 33.33%;
+ }
+ .thumbnail {
+     overflow: hidden;
+     height: 230px;
+     width: 100%;
+ }
+ .thumbnail img{
+     height: auto;
+     position: relative;
+         left: -25%;
+         top: -5%;
+     width: 500px;
+ }
+ .thumbnail a{
+     float: left;
+     height: 230px;
+     position: relative;
+     width: 100%;
+ }
+ .thumbnail a span {
+     display: none;
+     position: absolute;
+     top: 0;
+     left: 0;
+     bottom: 0;
+     right: 0;
+     background: rgba(0,0,0,0.4);
+     color: $grey-color-light;
+     padding: 40px;
+     text-align: center;
+ }
+ .thumbnail a:hover span {
+     display: block;
+ }
 
 /** Poem formatting ********************************************/
 .poem-title {
diff --git a/assets/css/academicons.min.css b/assets/css/academicons.min.css
old mode 100755
new mode 100644
diff --git a/assets/css/font-awesome.min.css b/assets/css/font-awesome.min.css
old mode 100755
new mode 100644
diff --git a/assets/css/main.scss b/assets/css/main.scss
old mode 100755
new mode 100644
diff --git a/assets/fonts/academicons.eot b/assets/fonts/academicons.eot
old mode 100755
new mode 100644
diff --git a/assets/fonts/academicons.svg b/assets/fonts/academicons.svg
old mode 100755
new mode 100644
diff --git a/assets/fonts/academicons.ttf b/assets/fonts/academicons.ttf
old mode 100755
new mode 100644
diff --git a/assets/fonts/academicons.woff b/assets/fonts/academicons.woff
old mode 100755
new mode 100644