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

Make side bar icons match between dashboard and graph editor #12410

Merged
merged 4 commits into from
Mar 4, 2025
+25 −13
Merged

Make side bar icons match between dashboard and graph editor #12410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3f8348
Make side bar icons match between dashboard and graph editor
AdRiley Mar 4, 2025
c931435
Code review feedback
AdRiley Mar 4, 2025
5182aa6
Fix
AdRiley Mar 4, 2025
8ecfde6
corepack pnpm run ci:prettier --write
AdRiley Mar 4, 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
20 changes: 17 additions & 3 deletions app/gui/src/project-view/assets/icons.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 7 additions & 9 deletions app/gui/src/project-view/components/DockPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import { documentationEditorBindings } from '@/bindings'
import ResizeHandles from '@/components/ResizeHandles.vue'
import SizeTransition from '@/components/SizeTransition.vue'
import SvgButton from '@/components/SvgButton.vue'
import ToggleIcon from '@/components/ToggleIcon.vue'
import { useResizeObserver } from '@/composables/events'
import { Rect } from '@/util/data/rect'
Expand Down Expand Up @@ -65,14 +66,10 @@ const tabStyle = {
v-for="{ tab, title, icon } in props.tabButtons"
:key="tab"
class="tab"
:class="{ activeTab: currentTab === tab }"
:style="tabStyle"
>
<ToggleIcon
:modelValue="currentTab == tab"
:title="title"
:icon="icon"
@update:modelValue="currentTab = tab"
/>
<SvgButton :title="title" :name="icon" @click="currentTab = tab" />
</div>
</div>
<ResizeHandles
Expand Down Expand Up @@ -135,9 +132,10 @@ const tabStyle = {
display: flex;
align-items: center;
justify-content: center;
&:has(.toggledOn) {
background-color: #fff;
}
}

.activeTab {
background-color: #fff;
}

.toggleDock {
Expand Down
2 changes: 1 addition & 1 deletion app/gui/src/project-view/stores/rightDock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export type RightDockStore = ReturnType<typeof useRightDock>

export type RightDockTab = ExtractTabs<typeof tabButtons>
export const { buttons: tabButtons, isValidTab } = defineTabButtons([
{ tab: 'docs', icon: 'text', title: 'Documentation Editor' },
{ tab: 'docs', icon: 'document', title: 'Documentation Editor' },
{ tab: 'help', icon: 'help', title: 'Component Help' },
])

Expand Down
Loading