393 Commits

Author	SHA1	Message	Date
Mattias Granlund	a54ed979f3	Remove concept of sessions from front end	2023-11-28 10:09:22 +01:00
PavelLaptev	666da83180	segment control css update	2023-11-28 01:40:45 +01:00
Mattias Granlund	48db234f2a	Improve behaviour of file selection	2023-11-28 00:13:08 +00:00
Mattias Granlund	174e295f3a	Improve no changes branch state	2023-11-28 00:13:08 +00:00
PavelLaptev	2d51fdcf1d	css fixes	2023-11-28 00:55:23 +01:00
Pavel Laptev	352a626817	Merge branch 'master' into css-changes	2023-11-28 00:50:06 +01:00
PavelLaptev	0ebac9075d	css fixes	2023-11-28 00:45:20 +01:00
Mattias Granlund	fb32a06d31	Make file card resizable	2023-11-27 22:39:41 +00:00
Mattias Granlund	ab29fd4e84	Add tags for file card	2023-11-27 23:08:59 +01:00
Mattias Granlund	42883198d0	Improve file selection in branch card	2023-11-27 22:28:43 +01:00
Mattias Granlund	344c24b702	Improve a bunch of stuff	2023-11-27 22:15:26 +01:00
Mattias Granlund	9e61bc05b0	Show file diff next to branch lane	2023-11-27 21:42:01 +01:00
Mattias Granlund	f2827b8978	fix: update dropdown component to include wrapper div for proper styling and positioning	2023-11-27 18:53:08 +00:00
Mattias Granlund	9471e8567a	Move branch lane to branch card	2023-11-27 18:38:33 +00:00
Mattias Granlund	ca106bc3e4	Update navigation bar and selected states	2023-11-27 17:23:51 +00:00
Kiril Videlov	bb1928de1b	fix lint issue	2023-11-27 18:18:44 +01:00
Kiril Videlov	fac45a2d6b	chore: update styling and conditional rendering in branch component	2023-11-27 18:18:44 +01:00
PavelLaptev	61b09582f1	merged upstream	2023-11-27 18:02:01 +01:00
Mattias Granlund	5d3f2e7084	chore: update styling of input field to improve visibility and add placeholder color	2023-11-27 16:59:13 +00:00
Mattias Granlund	88526d237a	Fix commit issue ... - selecting what to commit is currently unavailable	2023-11-27 16:53:25 +00:00
PavelLaptev	22577c6d20	Update tokens	2023-11-27 17:47:39 +01:00
Mattias Granlund	efa80954f6	Refactor the commit box and dropdown button	2023-11-27 16:45:35 +00:00
Kiril Videlov	d1b73fe9cf	chore: remove unused 'baseCurrent' property from Branch class and update its usage in applyBranch function	2023-11-27 14:28:43 +01:00
Kiril Videlov	927bc6c5c1	feat: rename activeBranches$ to stashedBranches$ in VirtualBranchService and update references in the component	2023-11-27 14:21:53 +01:00
Kiril Videlov	15e2c0eb2d	chore: update branch conflict handling and apply button behavior	2023-11-27 14:07:17 +01:00
Mattias Granlund	5d3381cae9	Fix project selector	2023-11-27 11:45:29 +00:00
Mattias Granlund	da3516c31a	Sync to cloud when clicking that button in the sidebar	2023-11-27 11:24:51 +00:00
Scott Chacon	dd8b7fd1b0	Merge pull request #1734 from gitbutlerapp/add-link-to-project-page ... Add link to project page	2023-11-27 11:47:45 +01:00
Mattias Granlund	4a752ed086	Restyle button component and update all instances	2023-11-27 10:46:03 +00:00
Scott Chacon	1a1d7228ac	maybe formatted	2023-11-27 11:30:56 +01:00
Scott Chacon	6b950b3b16	add link to project page	2023-11-27 10:51:25 +01:00
Mattias Granlund	0c5bac544d	Continue restyling branches	2023-11-27 00:56:53 +00:00
PavelLaptev	e7222250a1	input and textBox	2023-11-27 00:09:40 +01:00
PavelLaptev	c99a5f28d7	new icons	2023-11-26 21:14:45 +01:00
Mattias Granlund	dac321f3a0	Create components out of BranchLane stuff	2023-11-26 17:54:52 +00:00
Mattias Granlund	44a87b4001	Update branch lane header	2023-11-26 13:22:31 +00:00
PavelLaptev	9473d4b0fd	fixes	2023-11-26 13:34:22 +01:00
Mattias Granlund	69a69788fb	Create account link component and style it according to design	2023-11-26 11:54:15 +00:00
Mattias Granlund	032386e3cb	Fix casing inconsistency in css tokens	2023-11-26 11:52:32 +00:00
Mattias Granlund	b23e5c1178	style: update loading state and styling for merge button	2023-11-26 11:51:27 +00:00
Mattias Granlund	58e4869998	Fix focus related bug in segmented control	2023-11-26 11:05:08 +00:00
PavelLaptev	d2f8610fb2	new icons	2023-11-26 03:29:22 +01:00
PavelLaptev	b198c64cab	tokens update	2023-11-26 03:25:40 +01:00
Mattias Granlund	01efef77e0	Make segment controls equal width	2023-11-25 13:44:17 +00:00
Mattias Granlund	370b8f589b	Update IconButton to reflect design	2023-11-25 13:41:39 +00:00
Mattias Granlund	cf3600a3f7	Auto close project selector	2023-11-25 12:24:43 +00:00
Mattias Granlund	d9f6249a55	Add branch filtering to sidebar	2023-11-25 12:23:14 +00:00
PavelLaptev	3687cf2d40	- updated sidebar paddings. Changed 16 to 12 spacers	2023-11-25 02:27:48 +01:00
PavelLaptev	a547df9b76	dark theme update	2023-11-25 02:09:51 +01:00
PavelLaptev	d398fa3d66	added new color tokens for accent outlines	2023-11-25 01:57:10 +01:00