Skip to content

Fixes for UI issues #11130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2020
Merged

Fixes for UI issues #11130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/2 Fixes/10464.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make spacing of icons on notebook toolbars match spacing on other VS code toolbars.
1 change: 1 addition & 0 deletions news/2 Fixes/10465.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make jupyter server status centered in the UI and use the same font as the rest of VS code.
15 changes: 10 additions & 5 deletions src/datascience-ui/interactive-common/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -514,6 +514,8 @@ body, html {
.kernel-status-icon {
width: 16px;
height: 0px;
padding: 1px;
margin-top: 2px;
}

.image-button-image {
Expand All @@ -529,7 +531,10 @@ body, html {
}

.toolbar-menu-bar .image-button {
margin-right: 12px;
margin-top: 8px;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or margin: 8px 7px 9px 7px

margin-bottom: 9px;
margin-left: 7px;
margin-right: 7px;
}

.image-button:focus {
Expand Down
4 changes: 2 additions & 2 deletions src/datascience-ui/interactive-common/kernelSelection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export class KernelSelection extends React.Component<IKernelSelectionProps> {
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 = {
Expand Down
6 changes: 4 additions & 2 deletions src/datascience-ui/native-editor/nativeEditor.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@
}

.native-button {
margin-top: 3px;
background: transparent;
z-index: 10;
}
Expand Down Expand Up @@ -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;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Personally I prefer margin: 4px 3px.

margin-top: 4px;
margin-bottom: 4px;
margin-left: 3px;
}