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

feat(header): enhance header controls with new actions and styles #5870

Merged
merged 1 commit into from
Jan 2, 2025
Merged

feat(header): enhance header controls with new actions and styles #5870

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
66 changes: 53 additions & 13 deletions apps/desktop/src/lib/stack/header/HeaderControlSection.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
<script lang="ts">
import Icon from '@gitbutler/ui/Icon.svelte';
import Tooltip from '@gitbutler/ui/Tooltip.svelte';

interface Props {
isDefault: boolean;
onDefaultSet: () => void;
onCollapseButtonClick: () => void;
}

const { isDefault, onDefaultSet }: Props = $props();
const { isDefault, onDefaultSet, onCollapseButtonClick }: Props = $props();
</script>

<div class="header-control" class:is-default={isDefault} data-drag-handle>
<div class="draggable-icon" data-drag-handle>
<Icon name="draggable" />
<div class="actions">
<div class="draggable-icon" data-drag-handle>
<Icon name="draggable" />
</div>

<Tooltip text="Collapse lane">
<button type="button" class="action-button" onclick={onCollapseButtonClick}>
<Icon name="fold-lane" />
</button>
</Tooltip>
</div>

<button type="button" class="target-btn" onclick={onDefaultSet} disabled={isDefault}>
Expand All @@ -33,21 +43,40 @@
display: flex;
align-items: center;
justify-content: space-between;
padding: 3px 2px 3px 6px;
padding: 4px 2px 4px 6px;
background-color: var(--clr-theme-ntrl-soft);
border: 1px solid var(--clr-border-2);
border-radius: var(--radius-m) var(--radius-m) 0 0;
width: 100%;

--hover-color: oklch(from var(--clr-scale-ntrl-70) l c h / 0.5);
--hover-color-on-target: oklch(from var(--clr-scale-pop-70) l c h / 0.7);

& .draggable-icon {
cursor: grab;
display: flex;
color: var(--clr-scale-ntrl-0);
opacity: 0.3;
transition: opacity var(--transition-fast);
opacity: 0.5;
}

& .actions {
display: flex;
align-items: center;
gap: 4px;
}

& .action-button {
display: flex;
align-items: center;
padding: 2px;
color: var(--clr-text-2);
border-radius: var(--radius-s);
opacity: 0.7;
transition: background-color var(--transition-fast);

&:hover {
opacity: 0.6;
color: var(--clr-text-2);
opacity: 1;
background-color: var(--clr-theme-ntrl-soft-hover);
}
}

Expand All @@ -57,19 +86,15 @@
gap: 4px;
padding: 1px 5px 1px 3px;
border-radius: var(--radius-s);
border: 1px solid transparent;

transition:
background-color var(--transition-fast),
border-color var(--transition-fast);
transition: background-color var(--transition-fast);

&:not(:disabled) {
cursor: pointer;
color: var(--clr-theme-ntrl-element);

&:hover {
background-color: var(--clr-theme-ntrl-soft-hover);
border-color: var(--clr-border-2);
}
}

Expand All @@ -88,5 +113,20 @@
/* MODIFIERS */
.is-default {
background-color: var(--clr-theme-pop-soft);

& .draggable-icon {
color: var(--clr-theme-pop-on-soft);
}

& .action-button {
color: var(--clr-theme-pop-on-soft);
opacity: 0.5;

&:hover {
color: var(--clr-theme-pop-on-soft);
opacity: 0.7;
background-color: var(--hover-color-on-target);
}
}
}
</style>
1 change: 1 addition & 0 deletions apps/desktop/src/lib/stack/header/StackHeader.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<div class="stack-header">
<HeaderControlSection
isDefault={branch.selectedForChanges}
{onCollapseButtonClick}
onDefaultSet={async () => {
await branchController.setSelectedForChanges(branch.id);
}}
Expand Down
Loading