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

Limit light selection to "widget-colored" widgets only #11358

Merged
merged 5 commits into from
Oct 21, 2024
Merged

Limit light selection to "widget-colored" widgets only #11358

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7715a6
Limit light backgroud to widget-colored widgets only
farmaazon Oct 18, 2024
1c7030d
changelog
farmaazon Oct 18, 2024
3758116
Fix compile ghost-error
farmaazon Oct 18, 2024
0383de1
Fix formatting
farmaazon Oct 18, 2024
e2e620c
Merge branch 'develop' into wip/farmaazon/table-widget-styling
farmaazon Oct 21, 2024
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@
is available in right-click context menu.
- [Rows and Columns may be now reordered by dragging in Table Input
Widget][11271]
- [Fix invisible selection in Table Input Widget][11358]

[11151]: https://github.com/enso-org/enso/pull/11151
[11271]: https://github.com/enso-org/enso/pull/11271
[11358]: https://github.com/enso-org/enso/pull/11358

#### Enso Standard Library

Expand Down
1 change: 1 addition & 0 deletions app/gui/src/project-view/assets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
--color-widget: rgb(255 255 255 / 0.12);
--color-widget-focus: rgb(255 255 255 / 0.25);
--color-widget-selected: rgb(255 255 255 / 0.58);
--color-widget-selection: rgba(255 255 255 / 0.2 );
--color-port-connected: rgb(255 255 255 / 0.15);

/* colors for specific icons */
Expand Down
4 changes: 0 additions & 4 deletions app/gui/src/project-view/components/GraphEditor/GraphNodes.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,4 @@ const graphNodeSelections = shallowRef<HTMLElement>()
contain: layout size style;
will-change: transform;
}

.layer:deep(::selection) {
background-color: rgba(255, 255, 255, 20%);
}
</style>
4 changes: 4 additions & 0 deletions app/gui/src/project-view/components/GraphEditor/widgets/WidgetText.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,5 +132,9 @@ export const widgetDefinition = defineWidget(
outline: none;
background: var(--color-widget-focus);
}

&:deep(::selection) {
Copy link
Contributor

Choose a reason for hiding this comment

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

:deep is not needed; Vue doesn't scope pseudo-element selectors.

background: var(--color-widget-selection);
}
}
</style>
3 changes: 3 additions & 0 deletions app/gui/src/project-view/components/widgets/NumericInputWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ defineExpose({
&:focus {
background: var(--color-widget-focus);
}
&::selection {
background: var(--color-widget-selection);
}
}

.NumericInputWidget.slider {
Expand Down
Loading