From 664b8e26f0e0122a5d263e22cee30aaf485ea6c6 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 12 Oct 2015 13:10:03 -0700
Subject: [PATCH] Merge typeaheadjs.css into base.scss

---
 docs/public/css/base.scss          | 35 ++++++++++++++++++++++++++++++
 docs/public/css/typeaheadjs.css    | 35 ------------------------------
 docs/templates/shared/_head.liquid |  1 -
 3 files changed, 35 insertions(+), 36 deletions(-)
 delete mode 100644 docs/public/css/typeaheadjs.css

diff --git a/docs/public/css/base.scss b/docs/public/css/base.scss
index 81eaa3ec..0752bec1 100644
--- a/docs/public/css/base.scss
+++ b/docs/public/css/base.scss
@@ -143,3 +143,38 @@ footer {
         margin: 8px 0;
     }
 }
+
+/* typeahead **********************************************/
+
+.twitter-typeahead {
+    width: 100%;
+}
+
+.tt-menu {
+    width: 100%;
+    padding: 8px 0;
+    border: 1px solid #ccc;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    -webkit-border-radius: 8px;
+       -moz-border-radius: 8px;
+            border-radius: 8px;
+    -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+       -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+            box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.tt-suggestion {
+    padding: 3px 20px;
+    &:hover {
+        cursor: pointer;
+        color: #fff;
+        background-color: #446e9b;
+    }
+    &.tt-cursor {
+        color: #fff;
+        background-color: #446e9b;
+    }
+    p {
+        margin: 0;
+    }
+}
diff --git a/docs/public/css/typeaheadjs.css b/docs/public/css/typeaheadjs.css
deleted file mode 100644
index 5cc7b1b5..00000000
--- a/docs/public/css/typeaheadjs.css
+++ /dev/null
@@ -1,35 +0,0 @@
-.twitter-typeahead {
-    width: 100%;
-}
-
-.tt-menu {
-    width: 100%;
-    padding: 8px 0;
-    border: 1px solid #ccc;
-    border: 1px solid rgba(0, 0, 0, 0.2);
-    -webkit-border-radius: 8px;
-       -moz-border-radius: 8px;
-            border-radius: 8px;
-    -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-       -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
-            box-shadow: 0 5px 10px rgba(0,0,0,.2);
-}
-
-.tt-suggestion {
-    padding: 3px 20px;
-}
-
-.tt-suggestion:hover {
-    cursor: pointer;
-    color: #fff;
-    background-color: #446e9b;
-}
-
-.tt-suggestion.tt-cursor {
-    color: #fff;
-    background-color: #446e9b;
-}
-
-.tt-suggestion p {
-    margin: 0;
-}
diff --git a/docs/templates/shared/_head.liquid b/docs/templates/shared/_head.liquid
index 37041d50..b1457aa9 100644
--- a/docs/templates/shared/_head.liquid
+++ b/docs/templates/shared/_head.liquid
@@ -10,7 +10,6 @@
     <link rel="canonical" href="{{url}}{{permalink | remove:'/index'}}" />
     <link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
     <link rel="stylesheet" href="{{root}}/css/base.css" type="text/css">
-    <link rel="stylesheet" href="{{root}}/css/typeaheadjs.css" type="text/css">
     <!--[if lt IE 9]>
       <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>