From c19fc9569ea07bd9a6aeed35d739e6a89d0c3d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pior?= <piorek82@gmail.com>
Date: Thu, 22 Feb 2018 14:51:15 +0100
Subject: [PATCH 1/2] #6855 adjust banner layout

---
 js/notebook/src/tree/Widgets/BannerWidget.ts | 60 +++++++-------------
 js/notebook/src/tree/styles/tree.css         |  5 +-
 2 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/js/notebook/src/tree/Widgets/BannerWidget.ts b/js/notebook/src/tree/Widgets/BannerWidget.ts
index 6a8d498543..b643e2bd61 100644
--- a/js/notebook/src/tree/Widgets/BannerWidget.ts
+++ b/js/notebook/src/tree/Widgets/BannerWidget.ts
@@ -41,12 +41,6 @@ export default class BannerWidget extends Widget {
         <path style="fill:#0000000;" d="M 65.480469 13.867188 L 64.949219 13.125 L 64.835938 12.964844 L 64.304688 12.222656 L 61.160156 7.824219 L 62.21875 7.824219 L 64.832031 11.484375 L 67.449219 7.824219 L 68.507812 7.824219 L 65.363281 12.222656 L 65.480469 12.386719 L 68.742188 7.824219 L 69.800781 7.824219 L 66.007812 13.125 L 69.824219 18.464844 L 68.765625 18.464844 Z M 65.480469 13.867188 "/>
     </g>
 </svg>  
-`;
-
-  static readonly BASIC_HTML_ELEMENT_TEMPLATE = `
-<div id="beakerx_env_toolbar" class="list_toolbar">
-    <div id="beakerx_info"></div>
-</div>
 `;
 
   constructor(api: BeakerXApi) {
@@ -54,7 +48,6 @@ export default class BannerWidget extends Widget {
 
     this.addClass('bx-banner-widget');
 
-    $(BannerWidget.BASIC_HTML_ELEMENT_TEMPLATE).appendTo(this.node);
     api
       .getVersion()
       .then((version) => {
@@ -64,48 +57,33 @@ export default class BannerWidget extends Widget {
 
   private createBanner(version: string): void {
     $(this.node)
-      .find('#beakerx_info')
       .empty()
       .append(
         this.createLinkedBannerElementRow(),
-        this.createLinkedVersionElementRow(version),
-        this.createLinkedFromElementRow()
-      );
-  }
+        document.createTextNode('from '),
+        $('<a>', {
+          target: '_blank',
+          href: 'http://opensource.twosigma.com/',
+          text: 'Two Sigma Open Source',
+        }),
 
-  private createLinkedFromElementRow() {
-    return $('<div>', {
-      text: 'from '
-    }).append(
-      $('<a>', {
-        target: '_blank',
-        href: 'http://opensource.twosigma.com/',
-        text: 'Two Sigma Open Source',
-      })
-    );
-  }
+        document.createTextNode(' version '),
 
-  private createLinkedBannerElementRow() {
-    return $('<div>').append(
-      $('<a>', {
-        class: 'beakerx_site_link',
-        target: '_blank',
-        href: 'http://BeakerX.com',
-      }).append(
-        $(`${BannerWidget.SVG_LOGO}`)
-      )
-    );
+        $('<a>', {
+          target: '_blank',
+          href: `${BannerWidget.GITHUB_RELEASE_TAG_BASE_URL}${version}`,
+          text: version
+        })
+      );
   }
 
-  private createLinkedVersionElementRow(version: string) {
-    return $('<div>', {
-      text: 'version '
+  private createLinkedBannerElementRow() {
+    return $('<a>', {
+      class: 'beakerx_site_link',
+      target: '_blank',
+      href: 'http://BeakerX.com',
     }).append(
-      $('<a>', {
-        target: '_blank',
-        href: `${BannerWidget.GITHUB_RELEASE_TAG_BASE_URL}${version}`,
-        text: version
-      })
+      $(`${BannerWidget.SVG_LOGO}`)
     );
   }
 
diff --git a/js/notebook/src/tree/styles/tree.css b/js/notebook/src/tree/styles/tree.css
index a37b4826c8..b59929a7c4 100644
--- a/js/notebook/src/tree/styles/tree.css
+++ b/js/notebook/src/tree/styles/tree.css
@@ -67,7 +67,10 @@
 }
 
 .bx-banner-widget svg {
-  height: 35px;
+  width: 206px;
+  height: 59px;
+  margin: 0 15px 0 0;
+  transform: translateY(5px);
 }
 
 .bx-options-widget {

From cc2a3fdd0ac1cdf6b8085840533687e28275e280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pior?= <piorek82@gmail.com>
Date: Fri, 23 Feb 2018 10:42:49 +0100
Subject: [PATCH 2/2] #6855 reorder elements, adjust margin

---
 js/notebook/src/tree/Widgets/BannerWidget.ts | 16 +++++++++-------
 js/notebook/src/tree/styles/tree.css         |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/notebook/src/tree/Widgets/BannerWidget.ts b/js/notebook/src/tree/Widgets/BannerWidget.ts
index b643e2bd61..5bbb6dce44 100644
--- a/js/notebook/src/tree/Widgets/BannerWidget.ts
+++ b/js/notebook/src/tree/Widgets/BannerWidget.ts
@@ -60,20 +60,22 @@ export default class BannerWidget extends Widget {
       .empty()
       .append(
         this.createLinkedBannerElementRow(),
-        document.createTextNode('from '),
+        document.createTextNode(' version '),
+
         $('<a>', {
           target: '_blank',
-          href: 'http://opensource.twosigma.com/',
-          text: 'Two Sigma Open Source',
+          href: `${BannerWidget.GITHUB_RELEASE_TAG_BASE_URL}${version}`,
+          text: version
         }),
 
-        document.createTextNode(' version '),
+        document.createTextNode(', from '),
 
         $('<a>', {
           target: '_blank',
-          href: `${BannerWidget.GITHUB_RELEASE_TAG_BASE_URL}${version}`,
-          text: version
-        })
+          href: 'http://opensource.twosigma.com/',
+          text: 'Two Sigma Open Source',
+        }),
+
       );
   }
 
diff --git a/js/notebook/src/tree/styles/tree.css b/js/notebook/src/tree/styles/tree.css
index b59929a7c4..8b05c75e63 100644
--- a/js/notebook/src/tree/styles/tree.css
+++ b/js/notebook/src/tree/styles/tree.css
@@ -64,12 +64,12 @@
 
 .bx-banner-widget .beakerx_site_link {
   display: inline-block;
+  margin: 0 75px 0 0;
 }
 
 .bx-banner-widget svg {
   width: 206px;
   height: 59px;
-  margin: 0 15px 0 0;
   transform: translateY(5px);
 }