Browse Source

Removed icons associated with FontAwesome from JSON editor and added material design icons in their place

cameronoelsen 7 years ago
parent
commit
b541c3100c

+ 17 - 17
packages/codeeditor/style/index.css

@@ -43,35 +43,35 @@
 }
 
 
-.jp-JSONEditor-commitButton::before {
-  font-family: FontAwesome;
-  content: '\f00c'; /* check */
-  padding-left: 4px;
+.jp-JSONEditor-commitButton, .jp-JSONEditor-revertButton, .jp-JSONEditor-collapser.jp-mod-collapse-enabled {
+  height: 16px;
+  width: 16px;
+  background-size: 18px;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 
 
-.jp-JSONEditor-revertButton::before {
-  font-family: FontAwesome;
-  content: '\f0e2'; /* undo */
+.jp-JSONEditor-commitButton {
+  background-image: var(--jp-icon-checkmark);
+  margin-left: 8px;
 }
 
 
-.jp-JSONEditor-collapser {
-  flex: 1 1 auto;
+.jp-JSONEditor-revertButton {
+  background-image: var(--jp-icon-undo);
 }
 
 
-.jp-JSONEditor-collapser.jp-mod-collapse-enabled::before {
-  padding-left: 6px;
-  font-family: FontAwesome;
-  content: '\f0d8'; /* caret-up */
+.jp-JSONEditor-collapser.jp-mod-collapse-enabled {
+  margin-left: 6px;
+  background-image: var(--jp-icon-caretup);
 }
 
 
-.jp-JSONEditor-collapser.jp-mod-collapse-enabled.jp-mod-collapsed::before {
-  padding-left: 6px;
-  font-family: FontAwesome;
-  content: '\f0d7'; /* caret-down */
+.jp-JSONEditor-collapser.jp-mod-collapse-enabled.jp-mod-collapsed {
+  margin-left: 6px;
+  background-image: var(--jp-icon-caretdown);
 }
 
 

+ 12 - 0
packages/theme-dark-extension/style/icons/md/undo.svg

@@ -0,0 +1,12 @@
+<?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 18 18" style="enable-background:new 0 0 18 18;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#E0E0E0;}
+</style>
+<path class="st0" d="M0,0h18v18H0V0z"/>
+<path class="st1" d="M9.4,6c-2,0-3.8,0.7-5.2,2L1.5,5.2V12h6.8L5.5,9.3c1-0.9,2.4-1.4,3.8-1.4c2.7,0,4.9,1.7,5.7,4.1l1.8-0.6
+	C15.8,8.3,12.9,6,9.4,6z"/>
+</svg>

+ 1 - 0
packages/theme-dark-extension/style/urls.css

@@ -88,6 +88,7 @@
   --jp-icon-caretdown: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/caretdown.svg');
   --jp-icon-caretleft: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/caretleft.svg');
   --jp-icon-caretright: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/caretright.svg');
+  --jp-icon-undo: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/md/undo.svg');
   --jp-about-header-logo: url('./lab/api/themes/jupyterlab-theme-dark-extension/icons/jupyter/jupyter.svg');
   --jp-about-header-logo: url('/lab/api/themes/jupyterlab-theme-dark-extension/images/jupyter-white-moons.svg');
   --jp-about-header-wordmark: url('/lab/api/themes/jupyterlab-theme-dark-extension/images/jupyterlab-wordmark-inverse.svg');

+ 4 - 0
packages/theme-light-extension/style/icons/md/undo.svg

@@ -0,0 +1,4 @@
+<svg fill="#000000" height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M12.5 8c-2.65 0-5.05.99-6.9 2.6L2 7v9h9l-3.62-3.62c1.39-1.16 3.16-1.88 5.12-1.88 3.54 0 6.55 2.31 7.6 5.5l2.37-.78C21.08 11.03 17.15 8 12.5 8z"/>
+</svg>

+ 1 - 0
packages/theme-light-extension/style/urls.css

@@ -89,6 +89,7 @@
   --jp-icon-caretdown: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/caretdown.svg');
   --jp-icon-caretleft: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/caretleft.svg');
   --jp-icon-caretright: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/caretright.svg');
+  --jp-icon-undo: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/md/undo.svg');
   --jp-about-header-logo: url('./lab/api/themes/jupyterlab-theme-light-extension/icons/jupyter/jupyter.svg');
   --jp-about-header-wordmark: url('./lab/api/themes/jupyterlab-theme-light-extension/images/jupyterlab-wordmark.svg');
 }