From a1fc510ae06982c96fc573711f28e00240955fa2 Mon Sep 17 00:00:00 2001
From: Benjamin Attal <attal.benjamin@gmail.com>
Date: Wed, 28 May 2014 23:53:30 -0400
Subject: [PATCH] Remove merge artifacts.  Tweak hidden-info styles.

---
 static/js/index.js     |  2 +-
 static/sass/index.sass | 15 ++++++++-------
 templates/index.html   | 28 ----------------------------
 3 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/static/js/index.js b/static/js/index.js
index f337054..2d84791 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -174,7 +174,7 @@ function createResult(codelet) {
     dateCreated.innerHTML = 'Created ' + codelet.date_created;
     authors.innerHTML = 'Authors: ';
     $.each(codelet.authors, function(i, a) {
-        authors.innerHTML += '<a href=#>' + a + '; </a>';
+        authors.innerHTML += '<a href=#>' + a + ' </a>';
     });
 
     sidebar.innerHTML = '';
diff --git a/static/sass/index.sass b/static/sass/index.sass
index 8656178..300df45 100644
--- a/static/sass/index.sass
+++ b/static/sass/index.sass
@@ -290,10 +290,11 @@ div#results
         1) Sidebar
             - Add way to cycle through hits in the code.
         2) Hidden info
-            - Use effect to make it transition into view.
             - Add links for authors.
+            - Remove language field.
         3) Header
             - Add an icon for the website.
+            - Add language tag.
         4) Code body
             - Add highlighting.*/
     div.result
@@ -319,7 +320,7 @@ div#results
 
         table
             border-collapse: collapse
-            border: 1px solid #ccc
+            border: 1px solid $baseColor3
             height: inherit
 
             tr
@@ -328,13 +329,13 @@ div#results
                 #sidebar
                     width: $sidebarWidth
                     background-color: #eee
-                    border-right: 1px solid #ccc
+                    border-right: 1px solid $baseColor3
                     height: inherit
 
                 #code
                     width: $codeWidth
                     height: inherit
-                    border-right: 1px solid #ccc
+                    border-right: 1px solid $baseColor3
 
                     #tablecontainer
                         overflow: scroll
@@ -365,9 +366,9 @@ div#results
                     width: $hiddenInfoWidth
                     margin-left: -$hiddenInfoWidth
                     height: 100%
-                    padding-top: 25px
+                    padding-top: 50px
                     text-align: center
-                    font-size: 1.2em
+                    font-size: 1em
                     line-height: 1.5em
                     @include vendor(transition, margin-left 0.2s ease-in-out)
 
@@ -383,7 +384,7 @@ div#results
                     #language
                         display: inline-block
                         font-weight: bold
-                        color: purple
+                        color: orange
 
                     #authors
                         a
diff --git a/templates/index.html b/templates/index.html
index 1fa9391..ec2a493 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -90,34 +90,6 @@
               <span class="regex">Regex</span>
             </div>
           </div>
-<<<<<<< HEAD
-=======
-
-          <div id="lower-half">
-            <ul>
-              <li>
-                <label for="symbols">Symbols</label>
-                <input type="text" name="symbols" id="symbols"><br>
-              </li>
-
-              <li>
-                <label for="functions">Functions</label>
-                <input type="text" name="functions" id="functions"><br>
-              </li>
-
-              <li>
-                <label for="classes">Classes</label>
-                <input type="text" name="classes" id="classes"><br>
-              </li>
-
-              <li>
-                <label for="variables">Variables</label>
-                <input type="text" name="variables" id="variables"><br>
-              </li>
-
-            </ul>
-          </div>
->>>>>>> Search results are now code blocks. Used pygments to parse a block of code into html, and used html styles to highlight the text.
         </div>
       </div>
     </form>