From 7789f00bac202e4aea9d36f03f2e5375227723cc Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Tue, 31 Oct 2017 07:52:36 -0400
Subject: [PATCH] Switch to Aktiv Grotesk

---
 .../{index.blade.md => index.blade.php}       | 33 ++++---------------
 docs/tailwind.js                              |  9 ++++-
 2 files changed, 14 insertions(+), 28 deletions(-)
 rename docs/source/{index.blade.md => index.blade.php} (57%)

diff --git a/docs/source/index.blade.md b/docs/source/index.blade.php
similarity index 57%
rename from docs/source/index.blade.md
rename to docs/source/index.blade.php
index 26e976ab3..ff210d0ae 100644
--- a/docs/source/index.blade.md
+++ b/docs/source/index.blade.php
@@ -1,32 +1,13 @@
----
-extends: _layouts.master
----
+@extends('_layouts.master')
 
 @section('body')
-
 <div class="min-h-screen bg-pattern bg-center bg-smoke-light border-t-6 border-tailwind-teal flex items-center justify-center leading-tight p-6 pb-16">
     <div>
-        <svg class="mx-auto block" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="145" height="123" viewBox="0 0 145 123">
-            <defs>
-                <circle id="b" cx="73" cy="40" r="40"></circle>
-                <filter id="a" width="117.5%" height="117.5%" x="-8.8%" y="-6.2%" filterUnits="objectBoundingBox">
-                    <feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-                    <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="2"></feGaussianBlur>
-                    <feColorMatrix in="shadowBlurOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"></feColorMatrix>
-                </filter>
-                <linearGradient id="c" x1="0%" y1="0%" y2="100%">
-                    <stop offset="0%" stop-color="#2383AE"></stop>
-                    <stop offset="100%" stop-color="#6DD7B9"></stop>
-                </linearGradient>
-            </defs>
-            <g fill="none" fill-rule="evenodd" transform="translate(0 2)">
-                <use fill="black" filter="url(#a)" xlink:href="#b"></use>
-                <use fill="#FFFFFF" xlink:href="#b"></use>
-                <path fill="url(#c)" d="M58.6 33.92C60.52 26.24 65.32 22.4 73 22.4c11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32zM44.2 51.2c1.92-7.68 6.72-11.52 14.4-11.52 11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32z"></path>
-                <path fill="#222B2F" d="M5.28 120v-13H.6v-3h12.77v3H8.72v13H5.28zm15.7 0v-1.2a4.8 4.8 0 0 1-3.68 1.49c-1.85 0-4.03-1.25-4.03-3.84 0-2.71 2.18-3.7 4.03-3.7 1.54 0 2.9.48 3.67 1.42v-1.61c0-1.18-1-1.94-2.54-1.94-1.25 0-2.4.45-3.39 1.36l-1.15-2.04a7.6 7.6 0 0 1 5.07-1.82c2.64 0 5.06 1.06 5.06 4.4V120h-3.05zm0-2.78v-1.44c-.51-.68-1.47-1.01-2.46-1.01-1.2 0-2.18.65-2.18 1.75 0 1.08.98 1.7 2.18 1.7.99 0 1.95-.33 2.45-1zm7.98-10.52c-.99 0-1.83-.81-1.83-1.82a1.82 1.82 0 1 1 1.82 1.82zM27.44 120v-11.6h3.05V120h-3.05zm6.48 0v-16h3.04v16h-3.04zm16.64 0l-2.44-7.9-2.45 7.9H42.4l-3.52-11.6h3.16l2.16 7.8 2.55-7.8h2.71l2.54 7.8 2.16-7.8h3.17L53.8 120h-3.24zm10.2-13.3c-.99 0-1.83-.81-1.83-1.82a1.82 1.82 0 1 1 1.82 1.82zM59.24 120v-11.6h3.05V120h-3.05zm14.3 0v-7c0-1.62-.84-2.17-2.14-2.17a3.3 3.3 0 0 0-2.64 1.37v7.8h-3.04v-11.6h3.04v1.52a5.3 5.3 0 0 1 4.06-1.8c2.54 0 3.77 1.44 3.77 3.7V120h-3.05zm14.44 0v-1.46a4.55 4.55 0 0 1-3.58 1.75c-2.92 0-5.13-2.21-5.13-6.07 0-3.8 2.18-6.1 5.13-6.1 1.37 0 2.67.6 3.58 1.78V104h3.07v16h-3.07zm0-3.74v-4.1a3.35 3.35 0 0 0-2.64-1.33c-1.73 0-2.93 1.37-2.93 3.39 0 1.99 1.2 3.36 2.93 3.36 1.03 0 2.11-.56 2.64-1.32zm20.74 4.03c-4.68 0-8.4-3.36-8.4-8.28s3.72-8.28 8.4-8.28a7.39 7.39 0 0 1 6.82 3.91l-2.93 1.44a4.38 4.38 0 0 0-3.89-2.33c-2.78 0-4.9 2.23-4.9 5.26 0 3.02 2.12 5.25 4.9 5.25 1.78 0 3.22-1 3.9-2.32l2.92 1.41a7.43 7.43 0 0 1-6.82 3.94zm8.16-2.55l1.87-2.59a7.02 7.02 0 0 0 5.09 2.16c1.87 0 2.78-.89 2.78-1.8 0-1.2-1.4-1.6-3.24-2.04-2.62-.6-5.98-1.32-5.98-4.9 0-2.66 2.3-4.82 6.08-4.82a8.9 8.9 0 0 1 6.24 2.23l-1.9 2.5a6.83 6.83 0 0 0-4.58-1.75c-1.54 0-2.36.67-2.36 1.63 0 1.08 1.35 1.42 3.2 1.85 2.64.6 6 1.39 6 4.94 0 2.93-2.1 5.14-6.41 5.14-3.07 0-5.28-1.03-6.8-2.55zm14.8 0l1.87-2.59a7.02 7.02 0 0 0 5.09 2.16c1.87 0 2.78-.89 2.78-1.8 0-1.2-1.4-1.6-3.24-2.04-2.62-.6-5.98-1.32-5.98-4.9 0-2.66 2.3-4.82 6.08-4.82a8.9 8.9 0 0 1 6.24 2.23l-1.9 2.5a6.83 6.83 0 0 0-4.58-1.75c-1.54 0-2.36.67-2.36 1.63 0 1.08 1.35 1.42 3.2 1.85 2.64.6 6 1.39 6 4.94 0 2.93-2.1 5.14-6.41 5.14-3.07 0-5.28-1.03-6.8-2.55z"></path>
-            </g>
-        </svg>
-        <h1 class="mt-12 font-normal text-4xl text-center">A Utility-First CSS Framework<br class="hidden sm:inline-block"> for Rapid UI Development</h1>
+        <div>
+            <svg class="mx-auto block h-24 mb-3" viewBox="0 0 90 90" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><circle id="b" cx="40" cy="40" r="40"/><filter x="-8.8%" y="-6.2%" width="117.5%" height="117.5%" filterUnits="objectBoundingBox" id="a"><feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0" in="shadowBlurOuter1"/></filter><linearGradient x1="0%" y1="0%" y2="100%" id="c"><stop stop-color="#2383AE" offset="0%"/><stop stop-color="#6DD7B9" offset="100%"/></linearGradient></defs><g fill="none" fill-rule="evenodd"><g transform="translate(5 5)"><use fill="#000" filter="url(#a)" xlink:href="#b"/><use fill="#FFF" xlink:href="#b"/></g><path d="M25.6 33.92C27.52 26.24 32.32 22.4 40 22.4c11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32zM11.2 51.2c1.92-7.68 6.72-11.52 14.4-11.52 11.52 0 12.96 8.64 18.72 10.08 3.84.96 7.2-.48 10.08-4.32-1.92 7.68-6.72 11.52-14.4 11.52-11.52 0-12.96-8.64-18.72-10.08-3.84-.96-7.2.48-10.08 4.32z" fill="url(#c)" transform="translate(5 5)"/></g></svg>
+            <h1 class="text-center font-semibold text-3xl tracking-tight">Tailwind <span class="tracking-tight">CSS</span></h1>
+        </div>
+        <h2 class="mt-12 font-light text-4xl text-center">A Utility-First CSS Framework<br class="hidden sm:inline-block"> for Rapid UI Development</h2>
         <div class="mt-12 flex justify-center leading-none">
             <a class="rounded-full font-semibold block px-12 py-3 border-2 border-tailwind-teal hover:border-orange hover:bg-orange text-white bg-tailwind-teal " href="/docs/installation">Get Started</a>
             <a class="rounded-full font-semibold block px-12 py-3 border-2 border-tailwind-teal hover:border-orange hover:text-orange text-tailwind-teal ml-4" href="https://github.com/tailwindcss/tailwindcss">GitHub</a>
@@ -90,7 +71,5 @@ extends: _layouts.master
             <span class="ml-2">Twitter</span>
         </a>
     </div>
-
 </div>
-
 @endsection
diff --git a/docs/tailwind.js b/docs/tailwind.js
index 82bcb429f..9b00ca94f 100644
--- a/docs/tailwind.js
+++ b/docs/tailwind.js
@@ -14,7 +14,7 @@ config.colors = {
 }
 
 config.fonts = {
-  'sans': 'Proxima Nova, proxima-nova, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue',
+  'sans': 'Aktiv Grotesk, aktiv-grotesk, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue',
   'serif': 'Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif',
   'mono': 'Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
 }
@@ -32,11 +32,18 @@ config.textSizes = {
 }
 
 config.fontWeights = {
+  'light': 300,
   'normal': 400,
   'semibold': 500,
   'bold': 700,
 }
 
+config.tracking = {
+  'tight': '-0.02em',
+  'normal': '0',
+  'wide': '0.05em',
+}
+
 config.textColors = config.colors
 
 config.backgroundColors = config.colors