Merge branch 'use-less'

source/_includes/nav.html.twig

@@ -17,12 +17,7 @@
 
     <nav class="db dtc-ns v-mid w-100 tl tr-ns mt2 mt0-ns">
         {% for link in links %}
-            {% set classes = [
-                'f6 hover-blue link dib pv3',
-                page.url matches '#^' ~ (link.pattern ?: link.href) ~ '/?#' ? 'black bb b--blue bw1' : 'black-50',
-                not loop.first ? 'ml3',
-            ] %}
-            <a href="{{ link.href }}" class="{{ classes|join(' ')|trim }}">
+            <a href="{{ link.href }}" class="nav-item {{ page.url matches '#^' ~ (link.pattern ?: link.href) ~ '/?#' ? 'nav-item--active' }}">
                 {{- link.title -}}
             </a>
         {% endfor %}

source/_includes/talks-table.html.twig

@@ -1,5 +1,5 @@
 <div class="overflow-auto">
-    <table class="w-100 ba b--moon-gray">
+    <table class="w-100 ba b--black-20">
         <thead>
             <tr class="striped--near-white">
                 <th class="w-20-l pa2 tl bg-white">Date</th>

source/_layouts/default.html.twig

@@ -13,7 +13,7 @@
 
         {% include 'og' with { og: page.meta.og } %}
 
-        <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
+        <link rel="stylesheet" href="{{ site.url }}/assets/css/site.css">
         {% block stylesheets '' %}
 
         {% for size in site.apple_touch_icon_sizes %}
@@ -48,7 +48,7 @@
                 </div>
             </div>
 
-            <footer class="mw9 center mt4 bt b--moon-gray">
+            <footer class="mw9 center mt4 bt b--black-20">
                 <p class="f6">
                     &copy; 2010-{{ 'now'|date('Y') }} {{ site.title }}. Built with <a href="https://sculpin.io">Sculpin</a>.
                 </p>
@@ -57,7 +57,7 @@
             </footer>
         </div>
 
-        <script src="{{ site.url }}/assets/js/main.js"></script>
+        <script src="{{ site.url }}/assets/js/site.js"></script>
 
         {% if site.google_analytics_tracking_id %}
             <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', '{{ site.google_analytics_tracking_id }}', 'auto'); ga('send', 'pageview');</script>

source/_layouts/post.html.twig

@@ -10,11 +10,3 @@
     {% include 'post/pager' %}
     {% include 'post/about-author' %}
 {% endblock %}
-
-{% block stylesheets %}
-    <link rel="stylesheet" href="{{ site.url }}/assets/css/post.css">
-{% endblock %}
-
-{% block scripts %}
-    <script src="{{ site.url }}/assets/js/post.js"></script>
-{% endblock %}

source/_layouts/project.html.twig

@@ -11,7 +11,3 @@
     {% include 'project/skills' %}
     {% include 'project/company' %}
 {% endblock %}
-
-{% block stylesheets %}
-    <link rel="stylesheet" href="{{ site.url }}/assets/css/project.css">
-{% endblock %}

source/_layouts/talk.html.twig

@@ -9,7 +9,3 @@
     {% include 'talk/video' %}
     {% include 'talk/events' %}
 {% endblock %}
-
-{% block stylesheets %}
-    <link rel="stylesheet" href="{{ site.url }}/assets/css/talk.css">
-{% endblock %}