Skip to content
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

Reduce spaces between icons on top and bottom bars in the IDE panel UI #893

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Reduce spaces between icons on top and bottom bars in the IDE panel UI #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b502db
Stashing work
kmagiera Jan 9, 2025
0912374
Prevent settings buttons from staying highlighted after the dropdown …
kmagiera Jan 10, 2025
810c322
Use consistent margins for bottom and top panels
kmagiera Jan 10, 2025
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
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/DeviceSelect.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
font-size: 13px;
line-height: 1;
cursor: pointer;
height: 36px;
height: var(--swm-button-size);
border: 0px solid transparent;
border-radius: 18px;
gap: 5px;
Expand Down
4 changes: 3 additions & 1 deletion packages/vscode-extension/src/webview/components/DeviceSettingsDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ function DeviceSettingsDropdown({ children, disabled }: DeviceSettingsDropdownPr
</DropdownMenu.Trigger>

<DropdownMenu.Portal>
<DropdownMenu.Content className="dropdown-menu-content device-settings-content">
<DropdownMenu.Content
className="dropdown-menu-content device-settings-content"
onCloseAutoFocus={(e) => e.preventDefault()}>
<h4 className="device-settings-heading">Device Settings</h4>
<form>
<Label>Device appearance</Label>
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/IconButtonWithOptions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
left: 0;
right: 0;
bottom: 0;
font-size: 12px !important;
font-size: 10px !important;
opacity: 1;
transition: opacity 200ms ease-out;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/ReplayOverlay.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
line-height: 1;
overflow: hidden;
cursor: pointer;
height: 36px;
height: var(--swm-button-size);
border: 0px solid transparent;
border-radius: 18px;
gap: 5px;
Expand Down
4 changes: 3 additions & 1 deletion packages/vscode-extension/src/webview/components/SettingsDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ function SettingsDropdown({ project, isDeviceRunning, children, disabled }: Sett
</DropdownMenu.Trigger>

<DropdownMenu.Portal>
<DropdownMenu.Content className="dropdown-menu-content">
<DropdownMenu.Content
className="dropdown-menu-content"
onCloseAutoFocus={(e) => e.preventDefault()}>
<DropdownMenu.Item
className="dropdown-menu-item"
onSelect={() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/UrlSelect.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
line-height: 1;
overflow: hidden;
cursor: pointer;
height: 36px;
height: var(--swm-button-size);
border: 0px solid transparent;
border-radius: 18px;
gap: 5px;
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/ZoomControls.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
font-size: 13px;
line-height: 1;
cursor: pointer;
height: 36px;
height: var(--swm-button-size);
border: 0px solid transparent;
gap: 5px;
background-color: var(--swm-zoom-controls-background);
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/shared/Alert.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.alert-dialog-content {
background-color: var(--swm-popover-background);
border-radius: 36px;
border-radius: var(--swm-button-size);
display: grid;
grid-template-columns: 50px 1fr min-content;
gap: 4px;
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-extension/src/webview/components/shared/Button.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
align-items: center;
justify-content: center;
cursor: pointer;
height: 36px;
height: var(--swm-button-size);
padding: 0 12px;
background: none;
border: 0px solid transparent;
Expand Down
9 changes: 4 additions & 5 deletions packages/vscode-extension/src/webview/components/shared/IconButton.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
align-items: center;
justify-content: center;
cursor: pointer;
height: 36px;
width: 36px;
height: var(--swm-button-size);
width: var(--swm-button-size);
background: none;
border: 0px solid transparent;
border-radius: 36px;
border-radius: var(--swm-button-size);
color: var(--swm-button);
transition: all 200ms 0ms ease-in-out;
flex-shrink: 0;
Expand Down Expand Up @@ -66,7 +66,7 @@
color: var(--swm-button-counter);
background-color: var(--swm-button-counter-background);
padding: 2px 4px;
font-size: 11px;
font-size: 10px;
position: absolute;
top: 20%;
left: 20px;
Expand All @@ -77,6 +77,5 @@

.icon-button-counter.visible {
top: 20%;
left: 25px;
opacity: 1;
}
1 change: 1 addition & 0 deletions packages/vscode-extension/src/webview/styles/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ body[data-vscode-theme-kind="vscode-high-contrast"] {

/* Button */
--swm-button: var(--swm-default-text);
--swm-button-size: 30px;
--swm-button-disabled: var(--swm-disabled-text);
--swm-button-hover: var(--background-dark-80);

Expand Down
6 changes: 1 addition & 5 deletions packages/vscode-extension/src/webview/views/PreviewView.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
display: flex;
align-items: center;
width: 100%;
margin: 10px;
margin: 8px;
gap: 4px;
}

Expand All @@ -12,10 +12,6 @@
margin: -4px;
}

.button-group-top {
margin-bottom: 8px;
}

.feedback-button {
color: var(--swm-disabled-text);
}
Expand Down
Loading