Merge pull request #7272 from meeseeksmachine/auto-backport-of-pr-726…

…6-on-1.x Backport PR #7266 on branch 1.x (removed svg styling from old icon behavior fallback)
jupyterlab · Oct 2, 2019 · dbc4368 · dbc4368
2 parents 56c4401 + 255adb7
commit dbc4368
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/packages/ui-components/src/icon/iconregistry.tsx b/packages/ui-components/src/icon/iconregistry.tsx
@@ -67,11 +67,7 @@ export class IconRegistry implements IIconRegistry {
       if (fallback) {
         if (container) {
           container.textContent = title || '';
-          container.className = classes(
-            name,
-            className,
-            propsStyle ? iconStyleFlat(propsStyle) : ''
-          );
+          container.className = classes(name, className);
           return container;
         } else {
           // the non-container fallback isn't implemented
@@ -146,17 +142,7 @@ export class IconRegistry implements IIconRegistry {
     if (!resolvedName) {
       // TODO: remove fallback in jlab 2.0
       if (fallback) {
-        return (
-          <Tag
-            className={classes(
-              name,
-              className,
-              propsStyle ? iconStyleFlat(propsStyle) : ''
-            )}
-          >
-            {title || ''}
-          </Tag>
-        );
+        return <Tag className={classes(name, className)}>{title || ''}</Tag>;
       }
 
       // bail if failing silently

diff --git a/packages/ui-components/src/style/icon.ts b/packages/ui-components/src/style/icon.ts
@@ -220,6 +220,12 @@ const containerCSSTabManager: NestedCSSProperties = {
   position: 'relative'
 };
 
+const containerCSSToolbarButton: NestedCSSProperties = {
+  display: 'inline-block',
+  margin: 'auto',
+  verticalAlign: 'middle'
+};
+
 const containerCSSKind: { [k in IconKindType]: NestedCSSProperties } = {
   breadCrumb: {},
   dockPanelBar: containerCSSDockPanelBar,
@@ -231,7 +237,7 @@ const containerCSSKind: { [k in IconKindType]: NestedCSSProperties } = {
   splash: containerCSSSplash,
   statusBar: {},
   tabManager: containerCSSTabManager,
-  toolbarButton: {},
+  toolbarButton: containerCSSToolbarButton,
   unset: {}
 };