finished fixing/migrating the close icons

jupyterlab · Jan 3, 2020 · 1942359 · 1942359
1 parent ec1563c
commit 1942359
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 37 deletions.
diff --git a/packages/documentsearch/src/searchoverlay.tsx b/packages/documentsearch/src/searchoverlay.tsx
@@ -508,8 +508,8 @@ class SearchOverlay extends React.Component<
           <closeIcon.react
             className="jp-icon-hover"
             justify="center"
-            height="20px"
-            width="20px"
+            height="16px"
+            width="16px"
           />
         </button>
       </div>,

diff --git a/packages/documentsearch/style/base.css b/packages/documentsearch/style/base.css
@@ -172,20 +172,6 @@
   background-color: var(--jp-layout-color2);
 }
 
-.jp-DocumentSearch-close-button {
-  display: inline-block;
-  background-size: 16px;
-  background-image: var(--jp-icon-close);
-  background-repeat: no-repeat;
-  background-position: center;
-  vertical-align: middle;
-}
-
-.jp-DocumentSearch-close-button:hover {
-  background-size: 16px;
-  background-image: var(--jp-icon-close-circle);
-}
-
 .jp-DocumentSearch-search-options {
   padding: 0 8px;
   margin-left: 3px;

diff --git a/packages/running/src/index.tsx b/packages/running/src/index.tsx
@@ -183,9 +183,9 @@ function Section(props: { manager: IRunningSessions.IManager }) {
         <header className={SECTION_HEADER_CLASS}>
           <h2>{props.manager.name} Sessions</h2>
           <ToolbarButtonComponent
-            tooltip={`Shut Down All ${props.manager.name} Sessions…`}
             iconRenderer={closeIcon}
             onClick={onShutdown}
+            tooltip={`Shut Down All ${props.manager.name} Sessions…`}
           />
         </header>
 

diff --git a/packages/running/style/base.css b/packages/running/style/base.css
@@ -32,24 +32,6 @@
   justify-content: flex-end;
 }
 
-.jp-RunningSessions-shutdownAll {
-  flex: 1 1 auto;
-  height: var(--jp-private-running-button-height);
-  width: var(--jp-private-running-button-width);
-  max-width: 100px;
-  min-width: 16px;
-  min-height: 16px;
-  padding: 4px 6px;
-  background: var(--jp-layout-color1);
-  border: none;
-  outline: 0;
-  background-image: var(--jp-icon-close);
-  background-size: 16px;
-  vertical-align: middle;
-  background-repeat: no-repeat;
-  background-position: center;
-}
-
 .jp-RunningSessions-section {
   display: flex;
   flex: 0 1 auto;

diff --git a/packages/theme-light-extension/style/urls.css b/packages/theme-light-extension/style/urls.css
@@ -11,8 +11,6 @@
 
   /*--jp-icon-bug: url('icons/md/bug.svg');*/
   /*--jp-icon-circle: url('icons/md/circle.svg');*/
-  /*--jp-icon-close-circle: url('icons/md/close-circle.svg');*/
-  /*--jp-icon-close: url('icons/md/close.svg');*/
 
   /*--jp-icon-inverse-circle: url('icons/md/circle-inverse.svg');*/
   /*--jp-icon-inverse-close-circle: url('icons/md/close-circle-inverse.svg');*/
@@ -24,6 +22,8 @@
 
   /*--jp-icon-check: url('icons/md/checkmark.svg');*/
   /*--jp-icon-check-disabled: url('icons/md/checkmark-disabled.svg');*/
+  /*--jp-icon-close: url('icons/md/close.svg');*/
+  /*--jp-icon-close-circle: url('icons/md/close-circle.svg');*/
   /*--jp-icon-console: url('icons/jupyter/console.svg');*/
   /*--jp-icon-download: url('icons/md/download.svg');*/
   /*--jp-icon-filter-list: url('icons/md/ic_filter_list_24px.svg');*/