From e70095f2fe8125d1f40b2d0393228ae57873c418 Mon Sep 17 00:00:00 2001
From: Ian Rose <ian.r.rose@gmail.com>
Date: Fri, 21 Jun 2019 11:02:59 -0700
Subject: [PATCH 1/2] Center plugin listing alignment.

---
 packages/settingeditor/style/base.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/settingeditor/style/base.css b/packages/settingeditor/style/base.css
index 97e405f5adaf..11ccdcbca2bd 100644
--- a/packages/settingeditor/style/base.css
+++ b/packages/settingeditor/style/base.css
@@ -81,9 +81,11 @@
 }
 
 #setting-editor .jp-PluginList li {
+  display: flex;
+  flex-direction: row;
   border: 1px solid transparent;
   overflow: hidden;
-  padding: 2px 0 5px 5px;
+  padding: 4px 0 4px 4px;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
@@ -112,7 +114,6 @@
   width: 20px;
   margin-right: 3px;
   position: relative;
-  top: 3px;
 }
 
 #setting-editor .jp-SettingsRawEditor .jp-Toolbar {

From 897878fb1fcb42ef686789d7ff12c0720e6a520a Mon Sep 17 00:00:00 2001
From: Ian Rose <ian.r.rose@gmail.com>
Date: Fri, 21 Jun 2019 11:35:19 -0700
Subject: [PATCH 2/2] Center icons in status bar.

---
 packages/notebook/src/truststatus.tsx               |  2 +-
 packages/statusbar/src/components/icon.tsx          | 12 +++---------
 packages/statusbar/src/defaults/runningSessions.tsx |  4 ++--
 packages/statusbar/src/style/icon.ts                |  5 ++---
 packages/statusbar/src/style/text.ts                |  2 +-
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/packages/notebook/src/truststatus.tsx b/packages/notebook/src/truststatus.tsx
index 47b00f11ef3e..3e7d192e65d3 100644
--- a/packages/notebook/src/truststatus.tsx
+++ b/packages/notebook/src/truststatus.tsx
@@ -51,7 +51,7 @@ function NotebookTrustComponent(
   props: NotebookTrustComponent.IProps
 ): React.ReactElement<NotebookTrustComponent.IProps> {
   const source = cellTrust(props)[1];
-  return <IconItem source={source} offset={{ x: 0, y: 2 }} />;
+  return <IconItem source={source} />;
 }
 
 /**
diff --git a/packages/statusbar/src/components/icon.tsx b/packages/statusbar/src/components/icon.tsx
index d5450b584d72..74bcd444c583 100644
--- a/packages/statusbar/src/components/icon.tsx
+++ b/packages/statusbar/src/components/icon.tsx
@@ -26,16 +26,10 @@ export namespace IconItem {
  * A functional tsx component for an icon.
  */
 export function IconItem(
-  props: IconItem.IProps &
-    React.HTMLAttributes<HTMLDivElement> & {
-      offset: { x: number; y: number };
-    }
+  props: IconItem.IProps & React.HTMLAttributes<HTMLDivElement>
 ): React.ReactElement<IconItem.IProps> {
-  const { source, className, offset, ...rest } = props;
+  const { source, className, ...rest } = props;
   return (
-    <div
-      className={classes(className, source, style(icon(offset)))}
-      {...rest}
-    />
+    <div className={classes(className, source, style(icon()))} {...rest} />
   );
 }
diff --git a/packages/statusbar/src/defaults/runningSessions.tsx b/packages/statusbar/src/defaults/runningSessions.tsx
index f0926e261f65..bb9e1d030947 100644
--- a/packages/statusbar/src/defaults/runningSessions.tsx
+++ b/packages/statusbar/src/defaults/runningSessions.tsx
@@ -34,11 +34,11 @@ function RunningSessionsComponent(
     <GroupItem spacing={HALF_SPACING} onClick={props.handleClick}>
       <GroupItem spacing={HALF_SPACING}>
         <TextItem source={props.terminals} />
-        <IconItem source={'jp-StatusItem-terminal'} offset={{ x: 1, y: 3 }} />
+        <IconItem source={'jp-StatusItem-terminal'} />
       </GroupItem>
       <GroupItem spacing={HALF_SPACING}>
         <TextItem source={props.kernels} />
-        <IconItem source={'jp-StatusItem-kernel'} offset={{ x: 0, y: 2 }} />
+        <IconItem source={'jp-StatusItem-kernel'} />
       </GroupItem>
     </GroupItem>
   );
diff --git a/packages/statusbar/src/style/icon.ts b/packages/statusbar/src/style/icon.ts
index 1ee658c0918d..f65da7124bd1 100644
--- a/packages/statusbar/src/style/icon.ts
+++ b/packages/statusbar/src/style/icon.ts
@@ -4,12 +4,11 @@
 import vars from './variables';
 import { NestedCSSProperties } from 'typestyle/lib/types';
 
-export default ({ x, y }: { x: number; y: number }): NestedCSSProperties => {
+export default (): NestedCSSProperties => {
   return {
     backgroundRepeat: 'no-repeat',
+    backgroundPosition: 'center',
     backgroundSize: vars.iconImageSize,
-    backgroundPositionY: y !== 0 ? `${y}px` : undefined,
-    backgroundPositionX: x !== 0 ? `${x}px` : undefined,
     minHeight: vars.height,
     width: vars.iconWidth
   };
diff --git a/packages/statusbar/src/style/text.ts b/packages/statusbar/src/style/text.ts
index 8ec535c60bb9..98a0bb8a2cc0 100644
--- a/packages/statusbar/src/style/text.ts
+++ b/packages/statusbar/src/style/text.ts
@@ -11,6 +11,6 @@ export const baseText: NestedCSSProperties = {
 };
 
 export const textItem = style(baseText, {
-  lineHeight: '26px',
+  lineHeight: '24px',
   color: vars.textColor
 });