Skip to content

Commit

Permalink
A few image editor fixes but I'm leaving most of the image editor as …
Browse files Browse the repository at this point in the history
…a todo for v1, since it's kind of dark themed even in current arcade. I think we should make it match the theme, but doing so will mean a significant change in existing appearance.
  • Loading branch information
thsparks committed Feb 14, 2025
1 parent 63b2f10 commit db59066
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
4 changes: 3 additions & 1 deletion docfiles/themes/arcade-dark.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"id": "arcade-dark",
"name": "Arcade Dark",
"monacoBaseTheme": "vs-dark",
"overrideFiles": [],
"overrideFiles": [
"/docfiles/themes/overrides/arcade-dark-overrides.css"
],
"colors": {
"pxt-target-background1": "#1b1a19",
"pxt-target-foreground1": "#f3f2f1",
Expand Down
4 changes: 4 additions & 0 deletions docfiles/themes/overrides/arcade-dark-overrides.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.image-editor-change-name .image-editor-input {
/* The textbox background matches the footer of the image editor, so add a border */
border: 1px solid var(--pxt-neutral-stencil2);
}
6 changes: 3 additions & 3 deletions theme/image-editor/bottomBar.less
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
}

.image-editor-change-name .image-editor-input {
background: #ffffff;
color: var(--input-text-color);
background: var(--pxt-neutral-background2);
color: var(--pxt-neutral-foreground2);
border-bottom: none;

margin: 0;
Expand Down Expand Up @@ -120,4 +120,4 @@
.image-editor:not(.hide-done-button) .image-editor-change-name {
display: none;
}
}
}
11 changes: 6 additions & 5 deletions theme/image-editor/imageEditor.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
@import 'alert';

:root {
// TODO : Integrate with theme
--editor-bg-color: #1e1e1e;

--sidebar-bg-color: #252526;
Expand Down Expand Up @@ -303,20 +304,20 @@
display: flex;
align-items: center;
padding: 0 2rem;
background-color: @green;
color: @white;
background-color: var(--pxt-colors-green-background);
color: var(--pxt-colors-green-foreground);
cursor: pointer;
user-select: none;
margin: 0;
border-radius: 0;
}

.common-button.image-editor-confirm:hover {
background-color: darken(@green, 5%);
background-color: var(--pxt-colors-green-background-hover);
}

.common-button.image-editor-confirm:active {
background-color: darken(@green, 10%);
background-color: var(--pxt-colors-green-background-hover);
}

.image-editor.editing-tile {
Expand Down Expand Up @@ -418,4 +419,4 @@
.filter-title {
font-size: 1.5rem;
}
}
}

0 comments on commit db59066

Please sign in to comment.