Parcourir la source

Fixed close circle within tab manager to appropriately style when selected. Renamed files to make sense for the context

cameronoelsen il y a 7 ans
Parent
commit
8411cba77d

+ 1 - 1
packages/application/style/tabs.css

@@ -178,7 +178,7 @@
 
 .p-DockPanel-tabBar .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:hover {
   background-size: 16px;
-  background-image: var(--jp-icon-close-black);
+  background-image: var(--jp-icon-close-circle);
 }
 
 .p-TabBar-tab.p-mod-drag-image {

+ 8 - 3
packages/tabmanager-extension/style/index.css

@@ -109,15 +109,20 @@
 
 #tab-manager .p-TabBar-tab.p-mod-closable.jp-mod-dirty.jp-mod-active > .p-TabBar-tabCloseIcon {
   background-size: 10px;
-  background-image: var(--jp-inverse-icon-circle);
+  background-image: var(--jp-icon-inverse-circle);
 }
 
 
 #tab-manager .p-TabBar-tab.p-mod-closable.jp-mod-active > .p-TabBar-tabCloseIcon {
-  background-image: var(--jp-inverse-icon-close);
+  background-image: var(--jp-icon-inverse-close);
 }
 
 #tab-manager .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:hover {
   background-size: 16px;
-  background-image: var(--jp-icon-close-black);
+  background-image: var(--jp-icon-close-circle);
+}
+
+#tab-manager .p-TabBar-tab.p-mod-closable.jp-mod-active > .p-TabBar-tabCloseIcon:hover {
+  background-size: 16px;
+  background-image: var(--jp-icon-inverse-close-circle);
 }

+ 3 - 2
packages/theme-dark-extension/style/embed.css

@@ -63,8 +63,9 @@
   --jp-icon-close: url('./icons/md/close.svg');
   --jp-icon-inverse-close: url('./icons/md/close-inverse.svg');
   --jp-icon-circle: url('./icons/md/circle.svg');
-  --jp-inverse-icon-circle: url('./icons/md/circle-inverse.svg');
-  --jp-icon-close-black: url('./icons/md/close-black.svg');
+  --jp-icon-inverse-circle: url('./icons/md/circle-inverse.svg');
+  --jp-icon-close-circle: url('./icons/md/close-circle.svg');
+  --jp-icon-inverse-close-circle: url('./icons/md/close-circle-inverse.svg');
   --jp-icon-search: url('./icons/md/search.svg');
   --jp-icon-copy: url('./icons/md/copy.svg');
   --jp-icon-cut: url('./icons/md/cut.svg');

+ 16 - 0
packages/theme-dark-extension/style/icons/md/close-circle-inverse.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M8,0.7C3.9,0.7,0.7,3.9,0.7,8s3.3,7.3,7.3,7.3s7.3-3.3,7.3-7.3S12.1,0.7,8,0.7z M12.7,11.7l-0.9,0.9L8,8.9
+				l-3.7,3.7l-0.9-0.9L7.1,8L3.3,4.3l0.9-0.9L8,7.1l3.7-3.7l0.9,0.9L8.9,8L12.7,11.7z"/>
+		</g>
+	</g>
+</g>
+</svg>

+ 0 - 0
packages/theme-dark-extension/style/icons/md/close-black.svg → packages/theme-dark-extension/style/icons/md/close-circle.svg


+ 3 - 2
packages/theme-dark-extension/style/urls.css

@@ -60,8 +60,9 @@
   --jp-icon-close: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/close.svg');
   --jp-icon-inverse-close: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/close-inverse.svg');
   --jp-icon-circle: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/circle.svg');
-  --jp-inverse-icon-circle: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/circle-inverse.svg');
-  --jp-icon-close-black: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/close-black.svg');
+  --jp-icon-inverse-circle: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/circle-inverse.svg');
+  --jp-icon-close-circle: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/close-circle.svg');
+  --jp-icon-inverse-close-circle: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/close-circle-inverse.svg');
   --jp-icon-search: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/search.svg');
   --jp-icon-copy: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/copy.svg');
   --jp-icon-cut: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/cut.svg');

+ 3 - 2
packages/theme-light-extension/style/embed.css

@@ -63,8 +63,9 @@
   --jp-icon-close: url('./icons/md/close.svg');
   --jp-icon-inverse-close: url('./icons/md/close-inverse.svg');
   --jp-icon-circle: url('./icons/md/circle.svg');
-  --jp-inverse-icon-circle: url('./icons/md/circle-inverse.svg');
-  --jp-icon-close-black: url('./icons/md/close-black.svg');
+  --jp-icon-inverse-circle: url('./icons/md/circle-inverse.svg');
+  --jp-icon-close-circle: url('./icons/md/close-circle.svg');
+  --jp-icon-inverse-close-circle: url('./icons/md/close-circle-inverse.svg');
   --jp-icon-search: url('./icons/md/search.svg');
   --jp-icon-copy: url('./icons/md/copy.svg');
   --jp-icon-cut: url('./icons/md/cut.svg');

+ 16 - 0
packages/theme-light-extension/style/icons/md/close-circle-inverse.svg

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<g>
+	<g>
+		<g>
+			<path class="st0" d="M8,0.7C3.9,0.7,0.7,3.9,0.7,8s3.3,7.3,7.3,7.3s7.3-3.3,7.3-7.3S12.1,0.7,8,0.7z M12.7,11.7l-0.9,0.9L8,8.9
+				l-3.7,3.7l-0.9-0.9L7.1,8L3.3,4.3l0.9-0.9L8,7.1l3.7-3.7l0.9,0.9L8.9,8L12.7,11.7z"/>
+		</g>
+	</g>
+</g>
+</svg>

+ 0 - 0
packages/theme-light-extension/style/icons/md/close-black.svg → packages/theme-light-extension/style/icons/md/close-circle.svg


+ 3 - 2
packages/theme-light-extension/style/urls.css

@@ -60,8 +60,9 @@
   --jp-icon-close: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/close.svg');
   --jp-icon-inverse-close: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/close-inverse.svg');
   --jp-icon-circle: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/circle.svg');
-  --jp-inverse-icon-circle: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/circle-inverse.svg');
-  --jp-icon-close-black: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/close-black.svg');
+  --jp-icon-inverse-circle: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/circle-inverse.svg');
+  --jp-icon-close-circle: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/close-circle.svg');
+  --jp-icon-inverse-close-circle: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/close-circle-inverse.svg');
   --jp-icon-search: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/search.svg');
   --jp-icon-copy: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/copy.svg');
   --jp-icon-cut: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/cut.svg');