academic 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b96b2e3567b4b493b88a0e1de5a2ddf02dabff
-  data.tar.gz: 87f80a002d842cc98e06bb24c9d20c9b8f636d83
+  metadata.gz: b7290de46f508674dee112cbba895c336ddb1695
+  data.tar.gz: 7ee87176ffd93d9dbca9a485371e97c9f6bb6ef7
 SHA512:
-  metadata.gz: 77facb063a4d97f2024d8d226e40f5f554b2c36b54dbe975eb83ad113b97522f6fa5fbb6687c2c048fab1546ea8a686f7b8940d125cd6f0bb268732532ca8167
-  data.tar.gz: 8214f660b220c8c1c226c87a4bb23b0d0aa03c3164c12a2a12121d0db694fc65ab5e1f0c2b679ed7eb1e88013f7ffc29ba885ae05456e7564d8473eaa58aa22a
+  metadata.gz: 632b67c8a3a1ce0bf0f9c91aff74972fd66c06f07c13dd92c2bd91c7c9395a93906e7c521e25a4eb023a2fe1b5267937f4f14f22943c13e205b6e17248f14ae3
+  data.tar.gz: 84b0785ca7ad8865cf38ea42b5857ce85a593fff1140ea3db38e05d1ce4a3777abde8db65dbab3ff1f30d562f83586e3a458291d8f1169a5b094269fd5f09695

data/README.md

@@ -3,6 +3,8 @@
 Academic is a [Jekyll](http://jekyllrb.com/) theme with a focus on simplicity, typography and flexibility.
 I originally designed it for my personal blog during my PhD thesis.
 
+Check out my [personal website](https://gaalcaras.com) or my [blog](https://sociologs.com) to get a better feel for the Academic theme.
+
 ![Academic screenshot](screenshot.png)
 
 **Simplicity**: both in design and configuration, Academic aims to let the writer and its readers focus on the content.

data/_includes/calltoaction.html

@@ -4,6 +4,6 @@
   {% endif %}
   Vous pouvez vous abonner au <a href="/feed.xml">fil RSS</a> du blog
   {% if site.twitter_username %}
-   ou suivre <a href="https://twitter.com/{{ site.twitter_username }}">@{{ site.twitter_username }}</a> sur Twitter
+  ou suivre <a href="https://twitter.com/{{ site.twitter_username }}">@{{ site.twitter_username }}</a> sur Twitter
   {% endif %}.
 </div>

data/_includes/footer.html

@@ -60,7 +60,7 @@
       {% assign oldest = oldest_post.date | date: "%Y" %}
       {% assign newest = site.time | date: "%Y" %}
       ({% if oldest != newest %}{{ oldest }}-{% endif %}{{ newest }})
-      {% if site.author %}
+      {% if site.author and site.author_display %}
         par <a target="_blank" href="{{ site.author_website }}">{{ site.author }}</a> 
       {% endif %}
       {% if site.cc %}

data/_includes/header.html

@@ -30,19 +30,7 @@
       </span>
 
       <div class="trigger">
-        {% for link in site.nav_ext_links %}
-            {% if link.url and link.name %}
-            <a target="_blank" class="page-link" href="{{ link.url }}">{{ link.name | escape }}</a>
-            {% endif %}
-        {% endfor %}
-
-        {% for my_page in site.pages %}
-          {% unless my_page.invisible %}
-            {% if my_page.title %}
-            <a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
-            {% endif %}
-          {% endunless %}
-        {% endfor %}
+        {% include nav_menu.html %}
       </div>
     </nav>
     {% endif %}

data/_includes/icon-github.html

@@ -1 +1 @@
-<a href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>
+<a target="_blank" href="https://github.com/{{ include.username }}"><span class="icon icon--github">{% include icon-github.svg %}</span><span class="username">{{ include.username }}</span></a>

data/_includes/icon-keybase.html

@@ -1 +1 @@
-<a href="https://keybase.io/{{ include.username }}"><span class="icon icon--keybase">{% include icon-keybase.svg %}</span><span class="username">{{ include.username }}</span></a>
+<a target="_blank" href="https://keybase.io/{{ include.username }}"><span class="icon icon--keybase">{% include icon-keybase.svg %}</span><span class="username">{{ include.username }}</span></a>

data/_includes/icon-linkedin.html

@@ -1 +1 @@
-<a href="https://www.linkedin.com/in/{{ include.username }}"><span class="icon icon--linkedin">{% include icon-linkedin.svg %}</span><span class="username">{{ include.username }}</span></a>
+<a target="_blank" href="https://www.linkedin.com/in/{{ include.username }}"><span class="icon icon--linkedin">{% include icon-linkedin.svg %}</span><span class="username">{{ include.username }}</span></a>

data/_includes/icon-twitter.html

@@ -1 +1 @@
-<a href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>
+<a target="_blank" href="https://twitter.com/{{ include.username }}"><span class="icon icon--twitter">{% include icon-twitter.svg %}</span><span class="username">{{ include.username }}</span></a>

data/_includes/icon-website.html

@@ -1 +1 @@
-<a href="{{ include.url }}"><span class="icon icon--website">{% include icon-website.svg %}</span><span class="username">{{ include.url | replace:'https://','' }}</span></a>
+<a target="_blank" href="{{ include.url }}"><span class="icon icon--website">{% include icon-website.svg %}</span><span class="username">{{ include.url | replace:'https://','' }}</span></a>

data/_includes/nav_menu.html

@@ -0,0 +1,15 @@
+<ul class="nav-list">
+{% for link in site.nav_ext_links %}
+  {% if link.url and link.name %}
+  <li><a target="_blank" class="page-link" href="{{ link.url }}">{{ link.name | escape }}</a></li>
+  {% endif %}
+{% endfor %}
+
+{% for my_page in site.pages %}
+{% unless my_page.invisible %}
+  {% if my_page.title %}
+  <li><a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a></li>
+  {% endif %}
+{% endunless %}
+{% endfor %}
+</ul>

data/_sass/academic/_base.scss

@@ -233,8 +233,14 @@ table {
   }
 }
 
+h1 + table, h2 + table,
+h3 + table, h4 + table,
+h5 + table, h6 + table {
+  margin-top: $spacing-unit / 2;
+}
+
 /**
- * Table
+ * Hr
  */
 
 hr {

data/_sass/academic/_layout.scss

@@ -73,19 +73,31 @@
     display: none;
   }
 
-  .page-link {
-    display: inline-block;
-    color: $text-color;
-    height: 55px;
-
-    // Gaps between nav items, but not on the last one
-    &:not(:last-child) {
-      margin-right: 20px;
-    }
+  .nav-list {
+    list-style: none;
+    margin: 0;
+
+    li {
+      display: inline-block;
+      height: 55px;
+
+      .page-link {
+        color: $text-color;
+
+        &:hover {
+          text-decoration: none;
+        }
+      }
+
+      // Gaps between nav items, but not on the last one
+      &:not(:last-child) {
+        margin-right: 15px;
+      }
+
+      &:hover {
+        border-bottom: 5px $grey-color solid;
+      }
 
-    &:hover {
-      text-decoration: none;
-      border-bottom: 5px $grey-color solid;
     }
   }
 
@@ -385,7 +397,6 @@
 }
 
 .contact-list {
-  @include size(vsmall);
   list-style: none;
   margin-left: 0;
   margin-top: $spacing-unit / 2;
@@ -401,6 +412,7 @@
 }
 
 .about-col-1 {
+  @include size(vsmall);
   padding-right: $spacing-unit / 2;
   width: -webkit-calc(35% - (#{$spacing-unit} / 2));
   width:         calc(35% - (#{$spacing-unit} / 2));
@@ -419,19 +431,31 @@
 }
 
 @include media-query($on-laptop) {
-  .about-col-1,
-  .about-col-2 {
-    width: -webkit-calc(50% - (#{$spacing-unit} / 2));
-    width:         calc(50% - (#{$spacing-unit} / 2));
+  .about-col {
+    @include size(p);
   }
 }
 
 @include media-query($on-palm) {
   .about-col {
+    @include size(p);
     padding: 0;
     float: none;
-    width: -webkit-calc(100% - (#{$spacing-unit} / 2));
-    width:         calc(100% - (#{$spacing-unit} / 2));
+    width: auto;
+  }
+
+  .about-col-1 {
+    padding: 5%;
+    max-width: 200px;
+    margin: auto;
+  }
+
+  .contact-list {
+    margin: 0;
+  }
+
+  .user-picture {
+    max-width: 200px;
   }
 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: academic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - gaalcaras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -80,6 +80,7 @@ files:
 - _includes/icon-twitter.svg
 - _includes/icon-website.html
 - _includes/icon-website.svg
+- _includes/nav_menu.html
 - _includes/post-li.html
 - _layouts/about.html
 - _layouts/archive.html