gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-18 23:02:31 +03:00
Code Issues Packages Projects Releases Wiki Activity
9,699 Commits 151 Branches 1,064 Tags 60 MiB
b9124e8545
Commit Graph

913 Commits

Author SHA1 Message Date
Caleb Owens
a0359486ad
Remove unrequired utils package 
* Ref https://github.com/storybookjs/storybook/pull/29008
 2024-09-25 00:17:59 +02:00
Caleb Owens
2793bc4f13
Bump to release versions 2024-09-25 00:17:45 +02:00
Jeppe Reinhold
f27050018a
Upgrade to Storybook 8.3.0-beta.0, introduce VItest testing to UI package 2024-09-25 00:09:06 +02:00
estib
6ce77554fe Modal: Expose the open or closed state 
Expose the state of whether the modal is open or not.

[Some more info about this pattern.](https://github.com/sveltejs/svelte/issues/11974#issuecomment-2157837477)
 2024-09-24 13:36:25 +02:00
Caleb Owens
9ed21936f5 fix: Correct condition for removing right column 2024-09-18 11:51:44 +02:00
Nico Domino
6476a1c754
feat: use new Tabs components to organise Preferences page (#4906) 2024-09-17 11:22:17 +02:00
Caleb Owens
b6a4f7cd35 Improve scrolling of update modal 2024-09-16 20:50:45 +02:00
Nico Domino
a0b83556d2
feat: create 'Apperance' settings page and add highlight branchlane setting (#4921) 
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-09-16 12:49:28 +02:00
estib
08fb9effc4 Merge remote-tracking branch 'origin/master' into keyboard-shortcuts 2024-09-16 11:40:23 +02:00
Mattias Granlund
ba360d2e85
Base avatar bg color on srcUrl instead of tooltip (#4903) 
* Base avatar bg color on srcUrl instead of tooltip

- consistent per author

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-09-13 23:20:37 +00:00
estib
5395d00a1a Merged origin/master into keyboard-shortcuts 2024-09-12 14:47:17 +02:00
Pavel Laptev
8723bd5c17 selected hunk colors update 2024-09-12 01:48:01 +02:00
estib
b8c60adc64 Merge branch 'master' into keyboard-shortcuts 2024-09-11 15:50:07 +02:00
estib
b08fb7d101 Commit Input: Close on 'Escape' 
Pressing 'Escape' will close the commit input file
 2024-09-11 14:30:29 +02:00
Pavel Laptev
85462206a4
Edit mode UI updates (#4862) 
* Show full status tag only if file modified

* tooltip to the page added
 2024-09-10 11:35:17 +02:00
estib
0a6493087b FileListItem: Track whether all or some hunks have been selected 
If only some of the hunks have been selected, display the file checkbox as indeterminate
 2024-09-08 12:21:49 +02:00
estib
d3c1ed8ed4 Style: Checkbox indeterminate state 
Make it so that the indeterminate state of the checkbox matches the selected style
 2024-09-08 12:16:56 +02:00
Esteban Vega
d1462f1ea5
UI: Info Button component (#4829) 
* UI: Info Button component

Info button that displays a custom component on hover.

* Extend tooltip

Optionally, toggle the tooltip on click.
If enabled, clicking outside will close the tooltip

* Click outside: Broaden the elements that can be ignored

Broaden the types of elements that can be ignored

* Info Button: Ignore the SVG when checking for clicking outside

* Info Button: Add Storybook

* Info Button: Use a separate component for the tooltip arrow

That way we can set the border-radius easliy, plus it's probably a bit more CSS-compatible with picky browser engines

* TooltipWrapper shared component

Factor out the common logic of the Tooltip and Info Button so that there is no duplicated functionality and so that the Info Button doesn't have to depend on the Tooltip

* Tooltip and the InfoButton use the TooltipWrapper

Use the shared component.
Also:
- Info button is opened (and stays open) on hover

* separate tooltip components

* icon transition effect added

* button tooltip to the body level + utils function

* Remove log

---------

Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-09-07 22:12:52 +02:00
Nico Domino
32d766c2d6
fix: bump all svelte related dependencies (#4828) 2024-09-06 12:25:41 +02:00
Mattias Granlund
fe379de47c Fix storybook build errors 2024-09-04 10:29:24 +03:00
Pavel Laptev
444b03ff38
style(sidebar): Update padding and color for PR tags in SidebarEntry (#4811) 
* style(sidebar): Update padding and color for PR tags in SidebarEntry

* Tooltip update
 2024-09-02 12:51:30 +02:00
Pavel Laptev
c820a33e41
Tooltip-refactoring-+-new-component (#4804) 
* tooltip component + custom svelte transitions

* update some tooltips

* replace old toogle

* replace old tooltip hook

* remove old tooltip hook

* lint fixes

* design tokens update
 2024-09-01 20:30:36 +02:00
Nico Domino
e62acb1192
fix: revert modal transition back to animation (#4805) 2024-08-30 15:53:40 +02:00
Pavel Laptev
fe3c73ccfd
FileListItem fix (#4799) 
* show lock icons and lock tooltip

* replace state with derived

* allow to drag files
 2024-08-30 13:11:23 +02:00
Pavel Laptev
425136da20
Edit mode updates (#4792) 
* Add `Scrollbar` and `ScrollableContainer` to the UI lib

* event fixes

* replace app components with UI

* Move `ContentWrapper` to the UI side

* update file status badge colors

* move scrollbar components back to to app

because of the user settings

* dummy commit card added to the edit mode

* add the commit line

* edit modal UI tweaks

* remove unused code

* lint fixes

* lint fixes
 2024-08-30 11:21:11 +02:00
Nico Domino
0f48b53108
feat: add <form /> to Modal implementation (#4780) 2024-08-29 11:34:47 +02:00
Pavel Laptev
f4594dcfb4 disable hovers for file list items 2024-08-27 14:55:48 +02:00
Nico Domino
e52676c9b3
fix: rm mappings where the target file name is too common (#4766) 2024-08-27 09:57:52 +00:00
Pavel Laptev
681d118a1f icon prop fix 2024-08-23 16:25:32 +02:00
Pavel Laptev
9ffe096323 badge component modified 2024-08-23 16:20:57 +02:00
Pavel Laptev
2b5b5c00aa remove unused code 2024-08-23 15:49:49 +02:00
Pavel Laptev
964f700f04 update FileListItem and FileIcon components 2024-08-23 15:42:00 +02:00
Pavel Laptev
7ce3f35c12 Added to UI: FileIcon 2024-08-23 00:05:03 +02:00
Pavel Laptev
f8f20c2604 refactor: Change FileListItem story title to 'Misc / FileListItem' instead of 'Elements / FileListItem' 2024-08-22 23:35:00 +02:00
Pavel Laptev
29f9d3fb9d casing issues fixes 2024-08-22 20:24:02 +00:00
Pavel Laptev
f93cec81dd feat(ui): add FileListItem component and Storybook story 2024-08-22 22:19:23 +02:00
Pavel Laptev
18570f36ba rename stories 2024-08-22 22:08:28 +02:00
Pavel Laptev
bbb2db580c Badge styles update 2024-08-22 21:58:41 +02:00
Pavel Laptev
f05cca3572 button types import moved 2024-08-22 21:57:40 +02:00
Pavel Laptev
21eeb5f5c9
minor UI lib updates (#4740) 
* button icons change

* Shorter copy

* checkbox updated to Svelte 5

- added `Checkbox` story

* Fix checkbox and badge props

* change story name

* segement color transition update

* illustrations update

* update SVG illustration colors

* style: Update button CSS variables for different button styles.
 2024-08-22 15:39:09 +02:00
Mattias Granlund
9c100fca49 Visually distinguish draft prs in branch list 2024-08-22 13:46:33 +01:00
Pavel Laptev
daa285f41e
Login flow update and UI updated (#4716) 
* UI: Fix disabled `WelcomeAction` state

* update stories structure

* update UI components structure

* fix path to icons.json

* fix path to `timeAgo` functions

* added `LinkButton` component and updated login functions

* copy change

* remove `console.log`

* lint: formatting fixes

* remove `console.log` from the `Modal` story

* casing change

* remove duplicated folders (casing issue)
 2024-08-19 11:55:19 +02:00
Pavel Laptev
f4541cbb94 add new modal size 2024-08-17 09:02:00 +01:00
Pavel Laptev
5b2a58a35a fix modal shadow 2024-08-17 09:02:00 +01:00
Pavel Laptev
c3f02e633c added new text style 2024-08-17 09:02:00 +01:00
Nico Domino
7dc829960a
fix: tooltips when used in elevated contexts (#4703) 2024-08-16 12:17:43 +02:00
Pavel Laptev
fdea1cb0f5
UI lib: text utility classes (#4684) 2024-08-14 09:52:20 +02:00
Nico Domino
11ff8a71cc
feat: initial addProject test with WebdriverIO (#4589) 
Co-authored-by: Mattias Granlund <mtsgrd@gmail.com>
Co-authored-by: Test User <test@example.com>
 2024-08-13 17:31:19 +02:00
Pavel Laptev
273b7f9332
UI updates (#4676) 2024-08-12 09:34:18 +02:00
Pavel Laptev
1e68698cd1 UX/UI: Improve selected state for sidebar buttons 2024-08-09 12:34:29 +02:00
Pavel Laptev
c940d74631 Fix: path to fonts in UI 2024-08-08 21:15:05 +02:00
Nico Domino
7d1b7b99db
fix(ui): update ui output (#4649) 2024-08-08 14:51:37 +02:00
Caleb Owens
5bead87303 Add inline unified word diffs 2024-08-07 18:50:14 +02:00
Caleb Owens
de8cf25439 SidebarEntry can be displayed without lastCommitAt 2024-08-07 11:35:15 +02:00
Pavel Laptev
70022a4656 update local tag color 2024-08-06 23:19:46 +02:00
Pavel Laptev
09605acd46 copy update 2024-08-06 23:12:31 +02:00
Pavel Laptev
b93b335dfe
Sidebar branches UI update (#4631) 
* update "added/removed" and "commits" tags

* Update: search transition duration

* gap between tags update
 2024-08-06 16:52:59 +02:00
Pavel Laptev
1bba118b9b
Sidebar branches UI (#4622) 
* update illustration

* update tooltip show delay

* remove `showBorderWhenScrolled`

* sticky headers added
 2024-08-06 13:11:56 +02:00
Caleb Owens
439b5e8b20 feat(SidebarEntry): Enhance commit info display 
Improve last commit details presentation in sidebar entry
- Add tooltip with full date on hover
- Include 'ago' suffix in TimeAgo component
- Wrap commit info in conditional block for cleaner rendering
 2024-08-06 10:31:43 +02:00
Caleb Owens
5c8ade70c2 feat(ui): Improve SidebarEntry layout and styling 
Add 'authors-and-tags' class to row-group for better organization.
Hide empty first child in authors-and-tags group to prevent gaps.
Enhances visual consistency and reduces unnecessary white space.
 2024-08-06 10:23:31 +02:00
Nico Domino
cec6ed6fbf
fix: add two additional tsconfig options (#4592) 2024-08-05 14:21:38 +00:00
Caleb Owens
8eb5371b0a Fix the worst conflicts I've ever delt with 2024-08-05 14:01:49 +02:00
Pavel Laptev
aaf933f42d
UI package update (#4598) 
* add `Button` and `Icon` to UI library

* Update Button.stories.ts

* button stories added

* remove unused dependencies

* update button stories

* Update DemoButton.stories.ts

* update tokens

* dark theme toggle fix

* replace buttons with buttons from the package UI

* Update FileCardHeader.svelte

* Update BranchLaneContextMenu.svelte

* replace the app `Icon` component with the `UI` component

* fix `Icon` import in the `package UI`

* update imports for `icons.json`

* fix wrong type on Storybook

* update imports for `types`

* fix import order

* storybook grouping update
 2024-08-05 13:20:03 +02:00
Caleb Owens
1e342de03a fix merge 2024-08-05 11:45:45 +02:00
Caleb Owens
0b31743a2e mergey merge 2024-08-05 11:43:10 +02:00
Caleb Owens
aec1bda197 stuff 2024-08-05 11:37:39 +02:00
Pavel Laptev
48d2e8baea
Package UI update (#4594) 
* bump SB version

* fix Segmented control import

* formatting fix

* fix formatting on build

* migrate to Terrazzo + utility classes WIP

* copy update

* Update c-colors.mdx

* fix hex color

* move diff variables into tokens

* Update c-colors.mdx

* Update pnpm-lock.yaml

* Update pnpm-lock.yaml

* update terrazzo

* Update pnpm-lock.yaml
 2024-08-04 14:53:45 +02:00
Nico Domino
e5498665b4
feat: add WebdriverIO based E2E test setup (#4561) 2024-08-02 10:46:56 +00:00
Pavel Laptev
c177419aee
Package UI update (#4587) 
* bump SB version

* fix Segmented control import

* formatting fix
 2024-08-02 11:39:27 +02:00
Caleb Owens
691c5b3700 linty linty fixy fixy 2024-08-01 18:24:34 +02:00
Caleb Owens
00b778638a Demoing conflict resolution 2024-08-01 18:09:23 +02:00
Nico Domino
cda04e9b5b
feat: clone repo onboarding step (#4542) 
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-08-01 16:54:49 +02:00
Mattias Granlund
0cee9378cc Switch tooltip from mouseover to pointerenter 
- makes tooltip work on disabled buttons
 2024-08-01 15:12:39 +01:00
Caleb Owens
32b9b523ca stuff and things 2024-08-01 14:11:54 +02:00
Caleb Owens
70422439d7 integrated the thign 2024-07-31 19:41:08 +02:00
Caleb Owens
09de80f6f0 Mergy merge 2024-07-31 13:11:02 +02:00
Caleb Owens
43600c0a13 Moved some stuff into the UI package 2024-07-31 13:08:48 +02:00
Pavel Laptev
942baa44d2 fix reset font-weight 2024-07-31 11:45:06 +02:00
Pavel Laptev
9f2cc1cfbd deletion lines highlight color update 2024-07-31 11:23:11 +02:00
Pavel Laptev
73b2d3c045 bump the contrast for the added lines text 2024-07-31 11:18:12 +02:00
Pavel Laptev
6fe1f25959
Diff-hunk-style-fixes (#4551) 
* remove styles duplication

* Add hunk background color

* fix: gap between commits when dragging

* update hunk line colors

* fix: number columns cliping

* fix: number column border clipping

* diff styles update

* update "large diff" message style
 2024-07-31 00:31:26 +02:00
Caleb Owens
142798383f Merged origin/master into sidebar-branches 2024-07-30 17:11:00 +02:00
Pavel Laptev
6194a58f5b
segment control added (#4544) 2024-07-30 17:08:02 +02:00
Pavel Laptev
ab0c70b673
Package UI updates (#4539) 
* documentation update + design tokens generation

* ts config update

* formatting fix

* update tokens config format

* ignore JS files check

* Storybook version bump

* formatting fix

* dark theme toggle added
 2024-07-30 16:45:19 +02:00
Caleb Owens
32868092ed Merged origin/master into sidebar-branches 2024-07-30 13:45:00 +02:00
Nico Domino
9646684f92
feat: refactor diff rendering (#4497) 
Co-authored-by: Pavel Laptev <pawellaptew@gmail.com>
 2024-07-30 13:27:19 +02:00
Nico Domino
852522dcc0
fix: skip turbo in init-node-env (#4537) 2024-07-30 08:03:47 +00:00
Pavel Laptev
2e3e733ac5 Merged origin/master into sidebar-branches 2024-07-29 14:24:48 +02:00
Pavel Laptev
1c6b03eb6b
UI Package: refactor (#4529) 
* Separate styles responsibilities

* Add misssing dependencies

* Intro page added

* formatting fix
 2024-07-29 13:52:14 +02:00
Nico Domino
44a08d4645
fix: run @gitbutler/ui package steps sequentially (#4526) 2024-07-29 12:36:03 +02:00
Pavel Laptev
88b8f4b1bb
Update the use and structure of styles (#4524) 
* update the structure in the UI package

* remove styles from the app

* tokens update

* fix serif font style

* style: reduce margin-bottom in NotOnGitButlerBranch component. remove unused css

* style: Update background color on hover in Board component.

* fix fonts duplication

* styles restructuring

* GitButler WIP Commit

* watch command changed

---------

Co-authored-by: GitButler <gitbutler@gitbutler.com>
 2024-07-29 11:29:54 +02:00
Nico Domino
45d340ef37
fix: nightly build (#4522) 2024-07-29 08:49:22 +00:00
Pavel Laptev
701bcc2719
tokens update (#4512) 2024-07-27 23:26:37 +02:00
Pavel Laptev
c70d837e02
update dark more illustration token (#4511) 2024-07-27 22:48:50 +02:00
Nico Domino
1ced81fd06
fix: cleanup repo organisation (#4503) 2024-07-27 13:29:32 +02:00
Pavel Laptev
b29229f3b6
commits-section-buttons (#4498) 
* Added push button

* `integrate commits` wip

* CSS for sticky buttons

* update interaction observer + revert line group changes

* fix border bottom if there are no remote commits

* fix interaction observer

* remove unused components

* Fix line drawing with the new push buttons

---------

Co-authored-by: Caleb Owens <caleb@gitbutler.com>
 2024-07-27 00:47:02 +02:00
Pavel Laptev
becfd09520 segment control updates 2024-07-23 16:23:55 +02:00
Pavel Laptev
1f656d8f8c remove old component, component name changed 2024-07-23 16:17:49 +02:00
Pavel Laptev
7caf2715d1 new segmented controller component 2024-07-23 16:13:10 +02:00
Pavel Laptev
2c78ad3ece merge upstream 2024-07-23 12:30:36 +02:00