From 14ffd954b885f6e8025b5de27b7fa644146d1fa8 Mon Sep 17 00:00:00 2001
From: ninabreznik <ninabreznik@gmail.com>
Date: Thu, 5 Oct 2017 02:51:52 +0100
Subject: [PATCH] Update contextView

---
 src/app/editor/contextView.js  | 39 ++++++++++++++++++----------------
 src/app/editor/editor.js       |  3 +--
 src/app/panels/editor-panel.js | 12 +++++------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/app/editor/contextView.js b/src/app/editor/contextView.js
index 1763a9e6b7..0df13e80dd 100644
--- a/src/app/editor/contextView.js
+++ b/src/app/editor/contextView.js
@@ -1,40 +1,43 @@
 'use strict'
 var yo = require('yo-yo')
+var csjs = require('csjs-inject')
 var remix = require('ethereum-remix')
 var styleGuide = remix.ui.styleGuide
-var SourceMappingDecoder = remix.util.SourceMappingDecoder
 var styles = styleGuide()
-var csjs = require('csjs-inject')
+var SourceMappingDecoder = remix.util.SourceMappingDecoder
 
 var css = csjs`
   .contextview            {
-      background-color  : ${styles.colors.backgroundBlue};
       opacity           : 0.8;
-      width             : 20em;
-      height            : 6em;
-      border-color      : transparent;
-      border-radius     : 3px;
-      border            : .3px solid hsla(0, 0%, 40%, .2);
     }
   .container              {
-    padding             : 1em;
+    padding             : 5px 15px;
+  }
+  .line                   {
+    display             : flex;
+    justify-content     : flex-end;
+    align-items         : center;
+    text-overflow       : ellipsis;
+    overflow            : hidden;
+    white-space         : nowrap;
+    color               : ${styles.editor.text_Primary};
+    font-size           : 11px;
   }
   .type                   {
     font-style        : italic;
-    text-overflow     : ellipsis;
-    width             : 18em;
-    overflow          : hidden;
-    white-space       : nowrap;
+    margin-right      : 5px;
   }
   .name                   {
     font-weight       : bold;
-    text-overflow     : ellipsis;
-    width             : 18em;
-    overflow          : hidden;
-    white-space       : nowrap;
+    margin-right      : 15px;
   }
   .jumpto                 {
     cursor            : pointer;
+    margin-right      : 5px;
+    color             : ${styles.editor.icon_Color_Editor};
+  }
+  jumpto:hover            {
+    color             : ${styles.editor.icon_HoverColor_Editor};
   }
   .referencesnb           {
     float             : right;
@@ -126,7 +129,7 @@ class ContextView {
       }
     }
 
-    return yo`<div>
+    return yo`<div class=${css.line}>
       <div title=${type} class=${css.type} >${type}</div>
       <div title=${node.attributes.name} class=${css.name} >${node.attributes.name}</div>
       <i title='Go to Definition' class="fa fa-share ${css.jumpto}" aria-hidden="true" onclick=${jumpTo}></i>
diff --git a/src/app/editor/editor.js b/src/app/editor/editor.js
index c5720d4bfa..31ffea1bcf 100644
--- a/src/app/editor/editor.js
+++ b/src/app/editor/editor.js
@@ -15,7 +15,6 @@ var styles = styleGuide()
 var css = csjs`
   .ace-editor {
     background-color  : ${styles.editor.backgroundColor_Editor};
-    border-top: 20px solid ${styles.editor.backgroundColor_Tabs_Highlights};
     width     : 100%;
   }
 `
@@ -47,7 +46,7 @@ document.head.appendChild(yo`
       position:absolute;
       z-index:20;
       background-color:hsla(0, 82%, 82%, 1); /* red in style-guide.js */
-     }    
+     }
   </style>
 `)
 
diff --git a/src/app/panels/editor-panel.js b/src/app/panels/editor-panel.js
index 491d8668e3..9132df398b 100644
--- a/src/app/panels/editor-panel.js
+++ b/src/app/panels/editor-panel.js
@@ -170,12 +170,10 @@ var css = csjs`
     width             : 100%;
   }
   .contextviewcontainer{
-    position          : absolute;
-    z-index           : 100;
-    right             : 20px;
-    top               : 10px;
-    width             : 20em;
-  }  
+    width             : 100%;
+    height            : 30px;
+    background-color  : ${styles.editor.backgroundColor_Tabs_Highlights};
+  }
   .banner             {
     width             : 25em;
   }
@@ -279,7 +277,7 @@ class EditorPanel {
       <div class=${css.content}>
         <div class=${css.contextviewcontainer}>
           ${self._api.contextview.render()}
-        </div>      
+        </div>
         ${self._view.editor}
         ${self._view.terminal}
       </div>