Merge pull request #2045 from luixxiul/loadTime

cosmetic change for .loadtime
brave · Jun 3, 2016 · 465e76d · 465e76d
2 parents ca7f5c4 + 6963569
commit 465e76d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/js/components/urlBar.js b/js/components/urlBar.js
@@ -300,7 +300,10 @@ class UrlBar extends ImmutableComponent {
         {
           this.props.titleMode || this.aboutPage
           ? null
-          : <span className='loadTime'>{this.loadTime}</span>
+          : <span className={cx({
+            'loadTime': true,
+            'onFocus': this.props.urlbar.get('active')
+            })}>{this.loadTime}</span>
         }
 
         {

diff --git a/less/navigationBar.less b/less/navigationBar.less
@@ -268,11 +268,18 @@
 
   .loadTime {
     color: @loadTimeColor;
+    background: @navigationBarBackground;
     font-size: 12px;
     right: 10px;
     text-align: right;
     margin: 4px 0 0 0;
     top: 9px;
+    cursor: default;
+    padding-top: 1px;
+
+    &.onFocus {
+        display: none;
+    }
   }
 
   .noScript {
@@ -313,7 +320,7 @@
     cursor: text;
     font-size: @defaultFontSize;
     font-weight: normal;
-    margin: 3px 10px 0 3px;
+    margin: 3px 0 0 3px;
     outline: none;
     text-overflow: ellipsis;
     flex-grow: 1;