Selaa lähdekoodia

Merge pull request #6039 from ian-r-rose/statusbar-icon

Statusbar icon
Steven Silvester 6 vuotta sitten
vanhempi
commit
a2681c4c2b

+ 1 - 2
packages/statusbar-extension/package.json

@@ -12,8 +12,7 @@
     "lib/**/*.d.ts",
     "lib/**/*.js.map",
     "lib/**/*.js",
-    "style/*.css",
-    "style/images/*.svg",
+    "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}",
     "schema/*.json"
   ],
   "main": "lib/index.js",

+ 1 - 19
packages/statusbar-extension/schema/plugin.json

@@ -1,27 +1,9 @@
 {
-  "jupyter.lab.setting-icon-class": "status-bar-icon",
+  "jupyter.lab.setting-icon-class": "jp-StatusBarIcon",
   "jupyter.lab.setting-icon-label": "Status Bar",
   "title": "Status Bar",
   "description": "Status Bar settings.",
   "properties": {
-    "enabledDefaultItems": {
-      "type": "array",
-      "title": "Default Status Items",
-      "description": "Which default items should appear in the status bar",
-      "default": [
-        "command-edit-item",
-        "editor-syntax-item",
-        "file-path-item",
-        "file-upload-item",
-        "kernel-status-item",
-        "line-col-item",
-        "notebook-trust-item",
-        "running-sessions-item",
-        "tab-space-item",
-        "memory-usage-item",
-        "saving-status-item"
-      ]
-    },
     "visible": {
       "type": "boolean",
       "title": "Status Bar Visibility",

+ 2 - 0
packages/statusbar-extension/src/index.ts

@@ -42,6 +42,8 @@ import { IMainMenu } from '@jupyterlab/mainmenu';
 
 import { Title, Widget } from '@phosphor/widgets';
 
+import '../style/index.css';
+
 export const STATUSBAR_PLUGIN_ID = '@jupyterlab/statusbar-extension:plugin';
 
 /**

+ 9 - 0
packages/statusbar-extension/style/index.css

@@ -0,0 +1,9 @@
+/*-----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+
+/* A status bar icon */
+.jp-StatusBarIcon {
+  background-image: url('./status-bar-icon.svg');
+}

+ 5 - 0
packages/statusbar-extension/style/status-bar-icon.svg

@@ -0,0 +1,5 @@
+<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.75 19.25V0.75H19.25V19.25H0.75Z" transform="translate(2 2)" stroke="#757575" stroke-width="1.5"/>
+<rect width="12.7273" height="12.7273" transform="translate(5.63647 5.63672)" fill="#757575"/>
+<path d="M0 0H11.8182V0.818182C11.8182 1.37047 11.3705 1.81818 10.8182 1.81818H0V0Z" transform="translate(4.72729 13.8164)" fill="white"/>
+</svg>

+ 1 - 1
packages/theme-dark-extension/style/icons/md/baseline-web-24px.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-5 14H4v-4h11v4zm0-5H4V9h11v4zm5 5h-4V9h4v9z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
+<svg fill="#E0E0E0" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-5 14H4v-4h11v4zm0-5H4V9h11v4zm5 5h-4V9h4v9z"/><path d="M0 0h24v24H0z" fill="none"/></svg>

+ 1 - 1
packages/theme-light-extension/style/icons/md/baseline-web-24px.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-5 14H4v-4h11v4zm0-5H4V9h11v4zm5 5h-4V9h4v9z"/><path d="M0 0h24v24H0z" fill="none"/></svg>
+<svg fill="#616161" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-5 14H4v-4h11v4zm0-5H4V9h11v4zm5 5h-4V9h4v9z"/><path d="M0 0h24v24H0z" fill="none"/></svg>