academic 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7290de46f508674dee112cbba895c336ddb1695
-  data.tar.gz: 7ee87176ffd93d9dbca9a485371e97c9f6bb6ef7
+  metadata.gz: a4824ade27e5763bb4e5b09a93c427580ba2361f
+  data.tar.gz: 5f9d6aa8367f834d61ace5719e72d94134bddbc1
 SHA512:
-  metadata.gz: 632b67c8a3a1ce0bf0f9c91aff74972fd66c06f07c13dd92c2bd91c7c9395a93906e7c521e25a4eb023a2fe1b5267937f4f14f22943c13e205b6e17248f14ae3
-  data.tar.gz: 84b0785ca7ad8865cf38ea42b5857ce85a593fff1140ea3db38e05d1ce4a3777abde8db65dbab3ff1f30d562f83586e3a458291d8f1169a5b094269fd5f09695
+  metadata.gz: 955d00369dbd7b160817f9b118fae381d98ced7ac64a0cf3f75e115dec2c6515467f81f1d2bd3abb2590978719efef7dd01cd9109dedb093d8ec4b7444b3df17
+  data.tar.gz: ece93d5ef213f9153e16662a94de53c33c70415c002e57d81758544b0d9cf683a24236d91b31b03479ea7f1f976c277dd916a9616b13eceb69eea8873a2415d3

data/README.md

@@ -114,7 +114,7 @@ Example:
 title_html: "<b>hello</b>world"
 ```
 
-`pitch`: [optional] a small sentence or motto to quickly describe your blog. If no pitch is detected, Academic will fill the top bar with a navigation menu. If you want to display a short description for your website, Academic will NOT generate a navigation menu. Please note that `pitch` is only used in the top bar ; it is different from the `description` field (used in the footer and the meta tags for search engines).
+`pitch`: [optional] a small sentence or motto to quickly describe your blog. If no pitch is detected, Academic will fill the top bar with a navigation menu. If you want to display a short pitch in the top bar, Academic will put thput the navigation menu in the footer. Please note that `pitch` is only used in the top bar ; it is different from the `description` field (used in the footer and the meta tags for search engines).
 
 `description`: [recommended] short description for search engines. It's displayed in the footer of every page. Not to be confused with `pitch`.
 

data/_includes/contactlist.html

@@ -0,0 +1,31 @@
+<span class="contact-list-title">Liens :</span>
+<ul class="contact-list {{ include.class }}">
+  <li>
+    {% include icon-rss.html %}
+  </li>
+
+  {% if site.github_username %}
+  <li>
+    {% include icon-github.html username=site.github_username %}
+  </li>
+  {% endif %}
+
+  {% if site.twitter_username %}
+  <li>
+    {% include icon-twitter.html username=site.twitter_username %}
+  </li>
+  {% endif %}
+
+  {% if site.linkedin_username %}
+  <li>
+    {% include icon-linkedin.html username=site.linkedin_username %}
+  </li>
+  {% endif %}
+
+  {% if site.keybase_username %}
+  <li>
+    {% include icon-keybase.html username=site.keybase_username %}
+  </li>
+  {% endif %}
+
+</ul>

data/_includes/footer.html

@@ -2,7 +2,7 @@
 
   <div class="wrapper">
 
-      <ul class="info-list footer-col">
+      <ul class="footer-col footer-col-1">
         <li>
         {% if site.title_html %}
           <a href="{{ "/" | relative_url}}">{{ site.title_html }}</a>
@@ -27,22 +27,14 @@
 
       </ul>
 
-      <ul class="follow-list footer-col">
-        <li> </li>
-
-        <li>
-          <a href="/feed.xml">RSS</a>
-        </li>
-
-        {% if site.twitter_username %}
-        <li><a href="https://twitter.com/{{ site.twitter_username }}">Twitter</a></li>
-        {% endif %}
-
-        {% if site.github_username  %}
-        <li><a href="https://github.com/{{ site.github_username }}">Github</a></li>
-        {% endif %}
-
-      </ul>
+      {% if site.pitch %}
+        <nav>
+        {% include nav_menu.html class="footer-col footer-col-2"%}
+        {% include contactlist.html class="single-col" %}
+        </nav>
+      {% else %}
+        {% include contactlist.html class="footer-col footer-col-2" %}
+      {% endif %}
 
     <div class="bottom">
       <div class="tech">
@@ -51,6 +43,7 @@
         + <a target="_blank" href="{{ site.repo }}">Source</a>
         {% endif %}
       </div>
+
       <div class="legal">
       {% if site.cc == null %}©{% endif %}
         {% if site.title %}
@@ -66,8 +59,9 @@
       {% if site.cc %}
       est placé sous licence <a target="_blank" rel="license" href="https://creativecommons.org/licenses/{{ site.cc }}/4.0/" class="cc-licence">CC {{ site.cc }}</a>
       {% endif %}
-           </div>
+     </div>
     </div>
+
   </div>
 </footer>
 

data/_includes/icon-email.html

@@ -1 +1 @@
-<a href="mailto:{{site.email}}"><span class="icon icon--email">{% include icon-email.svg %}</span><span class="username">contact</span></span></a>
+<a href="mailto:{{site.email}}" title="Email"><span class="icon icon--email">{% include icon-email.svg %}</span><span class="username">contact</span></span></a>

data/_includes/icon-file.html

@@ -1,4 +1,4 @@
-<a href="{{ include.curriculum.url }}"><span class="icon icon--cv">{% include icon-file.svg %}</span>
+<a href="{{ include.curriculum.url }}" title="Curriculum Vitae"><span class="icon icon--cv">{% include icon-file.svg %}</span>
   <span class="username">
     {% if include.curriculum.name %}
     {{ include.curriculum.name }}

data/_includes/icon-github.html

@@ -1 +1 @@
-<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>
+<a target="_blank" href="https://github.com/{{ include.username }}" title="Github"><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 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>
+<a target="_blank" href="https://keybase.io/{{ include.username }}" title="Keybase"><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 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>
+<a target="_blank" href="https://www.linkedin.com/in/{{ include.username }}" title="LinkedIn"><span class="icon icon--linkedin">{% include icon-linkedin.svg %}</span><span class="username">{{ include.username }}</span></a>

data/_includes/icon-rss.html

@@ -0,0 +1,5 @@
+<a href="/feed.xml" title="RSS"><span class="icon icon--feed">{% include icon-rss.svg %}</span>
+  <span class="username">flux
+  </span>
+</a>
+

data/_includes/icon-rss.svg

@@ -0,0 +1,5 @@
+<svg fill="#000000" height="16" viewBox="0 0 24 24" width="16" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <circle cx="6.18" cy="17.82" r="2.18"/>
+    <path d="M4 4.44v2.83c7.03 0 12.73 5.7 12.73 12.73h2.83c0-8.59-6.97-15.56-15.56-15.56zm0 5.66v2.83c3.9 0 7.07 3.17 7.07 7.07h2.83c0-5.47-4.43-9.9-9.9-9.9z"/>
+</svg>

data/_includes/icon-twitter.html

@@ -1 +1 @@
-<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>
+<a target="_blank" href="https://twitter.com/{{ include.username }}" title="Twitter"><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 target="_blank" 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 }}" title="Site"><span class="icon icon--website">{% include icon-website.svg %}</span><span class="username">{{ include.url | replace:'https://','' }}</span></a>

data/_includes/nav_menu.html

@@ -1,4 +1,5 @@
-<ul class="nav-list">
+<span class="nav-list-title">Menu :</span>
+<ul class="nav-list {{ include.class }}">
 {% 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>

data/_layouts/about.html

@@ -31,35 +31,8 @@ layout: default
       {% endif %}
     </ul>
 
-    <ul class="contact-list">
-      {% if site.github_username %}
-      <li>
-        {% include icon-github.html username=site.github_username %}
-      </li>
-      {% endif %}
-
-      {% if site.twitter_username %}
-      <li>
-        {% include icon-twitter.html username=site.twitter_username %}
-      </li>
-      {% endif %}
-
-      {% if site.linkedin_username %}
-      <li>
-        {% include icon-linkedin.html username=site.linkedin_username %}
-      </li>
-      {% endif %}
-
-    </ul>
-
-    <ul class="contact-list">
-      {% if site.keybase_username %}
-      <li>
-        {% include icon-keybase.html username=site.keybase_username %}
-      </li>
-      {% endif %}
+    {% include contactlist.html %}
 
-    </ul>
   </div>
   <article class="about-col about-col-2" itemscope itemtype="http://schema.org/BlogPosting">
 

data/_sass/academic.scss

@@ -98,7 +98,7 @@ $grey-color-lighter: lighten($grey-color, 90%) !default;
 $grey-color-dark:  darken($grey-color, 25%) !default;
 
 // Width of the content area
-$content-width:    34.2em;
+$content-width:    700px;
 
 $on-palm:          600px !default;
 $on-laptop:        800px !default;

data/_sass/academic/_base.scss

@@ -294,7 +294,8 @@ hr {
   display: inline-block;
   vertical-align: middle;
 
-  path {
+  circle,
+  path:last-of-type {
     fill: $grey-color;
   }
 }

data/_sass/academic/_layout.scss

@@ -73,6 +73,11 @@
     display: none;
   }
 
+  .nav-list-title {
+    display: none;
+  }
+
+
   .nav-list {
     list-style: none;
     margin: 0;
@@ -134,6 +139,16 @@
       padding-bottom: 5px;
     }
 
+    .nav-list {
+      .page-link:hover {
+        color: $brand-color;
+      }
+
+      li:hover {
+        border: none;
+      }
+    }
+
     .page-link {
       display: block;
       padding: 5px 10px;
@@ -146,42 +161,85 @@
   }
 }
 
-
-
 /**
  * Site footer
  */
+
 .site-footer {
+  @include size(vsmall);
   border-top: 1px solid $grey-color-light;
   color: $grey-color;
 
+  a {
+    color: $grey-color;
+  }
+
   .footer-col {
-    @include size(vsmall);
-    max-width: 50%;
     list-style: none;
     margin-left: 0;
     margin-top: $spacing-unit/2;
     margin-bottom: $spacing-unit;
 
-    a {
-      color: $grey-color;
+    .author, .author a {
+      color: $grey-color-light;
     }
   }
 
-  .info-list {
+  .footer-col-1 {
+    width: -webkit-calc(65% - (#{$spacing-unit} / 2));
+    width:         calc(65% - (#{$spacing-unit} / 2));
     float: left;
+  }
 
-    .author, .author a {
-      color: $grey-color-light;
+  .footer-col-2 {
+    width: -webkit-calc(35% - (#{$spacing-unit} / 2));
+    width:         calc(35% - (#{$spacing-unit} / 2));
+    float: right;
+  }
+
+  .single-col {
+    clear: both;
+    list-style: none;
+    margin: 0;
+    text-align: center;
+
+    li {
+      display: inline-block;
+      margin-left: 5px;
+      margin-right: 5px;
+    }
+
+    .username {
+      display: none;
+    }
+
+    svg {
+      width: 20px;
+      height: 20px;
+    }
+
+    .icon {
+      &:hover {
+        circle,
+        path:last-of-type {
+          fill: $text-color;
+        }
+      }
     }
   }
 
-  .follow-list {
-    float: right;
+  .nav-list-title,
+  .contact-list-title {
+    display: none;
+  }
+
+  .contact-list {
+    a .username:hover {
+      text-decoration: underline;
+    }
   }
 
   .bottom {
-    @include size(vsmall);
     color: $grey-color-light;
     width: 100%;
     clear: both;
@@ -202,11 +260,55 @@
 
 }
 
+@include media-query($on-laptop) {
+  .site-footer {
+    @include size(small);
+  }
+}
+
+@include media-query($on-palm) {
+  .site-footer {
+    .footer-col-1,
+    .footer-col-2 {
+      width:100%;
+      float: none;
+    }
+
+    .nav-list-title,
+    .contact-list-title {
+      display: inline;
+      font-weight: bold;
+    }
+
+    .nav-list {
+      margin-top: 0;
+    }
+
+    .contact-list {
+      text-align: left;
+      margin-top: 0;
+
+      li {
+        display: block;
+      }
+
+      .username {
+        display: inline;
+      }
+    }
+
+    .bottom {
+      text-align: left;
+    }
+  }
+
+}
+
 /**
  * Page content
  */
 .page-content {
-  padding: $spacing-unit 0;
+  padding: $spacing-unit 0 $spacing-unit / 2 0;
 }
 
 .post-content {
@@ -273,8 +375,6 @@
   overflow-y: hidden;
 
   @include media-query($on-laptop) {
-    margin-bottom: $spacing-unit / 1.5;
-
     .post-meta {
       margin-bottom: $spacing-unit / 6;
     }
@@ -306,7 +406,11 @@
 
 .with-thumbnail {
   @include media-query($on-laptop) {
-    margin-bottom: 0px;
+    margin-bottom: $spacing-unit / 2;
+  }
+
+  @include media-query($on-palm) {
+    margin-bottom: 0;
   }
 
   .wrapper {
@@ -393,7 +497,20 @@
 
   @include media-query($on-palm) {
     float: none;
+
+    .contact-list {
+      text-align: center;
+
+      &:last-of-type {
+        margin-bottom: $spacing-unit / 2;
+      }
+    }
   }
+
+}
+
+.contact-list-title {
+  display: none;
 }
 
 .contact-list {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: academic
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - gaalcaras
@@ -62,6 +62,7 @@ files:
 - LICENSE.txt
 - README.md
 - _includes/calltoaction.html
+- _includes/contactlist.html
 - _includes/date.html
 - _includes/footer.html
 - _includes/head.html
@@ -76,6 +77,8 @@ files:
 - _includes/icon-keybase.svg
 - _includes/icon-linkedin.html
 - _includes/icon-linkedin.svg
+- _includes/icon-rss.html
+- _includes/icon-rss.svg
 - _includes/icon-twitter.html
 - _includes/icon-twitter.svg
 - _includes/icon-website.html