diff --git a/news/2 Fixes/10464.md b/news/2 Fixes/10464.md new file mode 100644 index 000000000000..97915a54d313 --- /dev/null +++ b/news/2 Fixes/10464.md @@ -0,0 +1 @@ +Make spacing of icons on notebook toolbars match spacing on other VS code toolbars. \ No newline at end of file diff --git a/news/2 Fixes/10465.md b/news/2 Fixes/10465.md new file mode 100644 index 000000000000..5b8c805c537d --- /dev/null +++ b/news/2 Fixes/10465.md @@ -0,0 +1 @@ +Make jupyter server status centered in the UI and use the same font as the rest of VS code. \ No newline at end of file diff --git a/src/datascience-ui/interactive-common/common.css b/src/datascience-ui/interactive-common/common.css index 6594c089b744..551c9610f918 100644 --- a/src/datascience-ui/interactive-common/common.css +++ b/src/datascience-ui/interactive-common/common.css @@ -470,15 +470,15 @@ body, html { } .kernel-status { - margin-top: 2px; - flex: 1; display: flex; margin-left: auto; } .kernel-status-section { - padding: 2px 5px 2px 5px; - flex: 1; + padding: 0px 5px; + align-self: center; + margin-top: 1px; + margin-bottom: 2px; } .kernel-status-section-hoverable:hover { @@ -514,6 +514,8 @@ body, html { .kernel-status-icon { width: 16px; height: 0px; + padding: 1px; + margin-top: 2px; } .image-button-image { @@ -529,7 +531,10 @@ body, html { } .toolbar-menu-bar .image-button { - margin-right: 12px; + margin-top: 8px; + margin-bottom: 9px; + margin-left: 7px; + margin-right: 7px; } .image-button:focus { diff --git a/src/datascience-ui/interactive-common/kernelSelection.tsx b/src/datascience-ui/interactive-common/kernelSelection.tsx index e7bc5a1e3555..f2915ffe0ffb 100644 --- a/src/datascience-ui/interactive-common/kernelSelection.tsx +++ b/src/datascience-ui/interactive-common/kernelSelection.tsx @@ -34,8 +34,8 @@ export class KernelSelection extends React.Component { 4; // plus 4 for the icon const displayNameTextSize = this.props.kernel.displayName.length + this.props.kernel.jupyterServerStatus.length; const dynamicFont: React.CSSProperties = { - fontSize: this.props.font.size > 2 ? this.props.font.size - 2 : this.props.font.size, - fontFamily: this.props.font.family, + fontSize: 'var(--vscode-font-size)', // Use the same font and size as the menu + fontFamily: 'var(--vscode-font-family)', maxWidth: this.getMaxWidth(serverTextSize + displayNameTextSize + 5) // plus 5 for the line and margins }; const serverTextWidth: React.CSSProperties = { diff --git a/src/datascience-ui/native-editor/nativeEditor.less b/src/datascience-ui/native-editor/nativeEditor.less index f86d85e6df29..aa624cb694f9 100644 --- a/src/datascience-ui/native-editor/nativeEditor.less +++ b/src/datascience-ui/native-editor/nativeEditor.less @@ -284,7 +284,6 @@ } .native-button { - margin-top: 3px; background: transparent; z-index: 10; } @@ -488,5 +487,8 @@ collapse-bar controls-div [cell-input, cell-output, markdown-cell- } .native-editor-celltoolbar-middle .image-button { - margin-right: 8px; + margin-right: 3px; + margin-top: 4px; + margin-bottom: 4px; + margin-left: 3px; }