Conrad Irwin
37d0b8424c
Merge branch 'main' into element-types
2023-11-14 12:10:26 -07:00
Marshall Bowers
76c15229c1
Combine LabelColor and IconColor into TextColor
2023-11-14 13:48:01 -05:00
Nathan Sobo
c6e8a097a3
Rename back to div
2023-11-14 01:41:55 -07:00
Nathan Sobo
27fb381cca
Checkpoint
2023-11-14 01:15:48 -07:00
Nate Butler
91f356a2f1
Begin documenting theme colors
2023-11-07 13:36:01 -05:00
Conrad Irwin
496518f3e8
Use gpui instead of gpui2 consistenytly
2023-11-06 11:50:33 -07:00
Marshall Bowers
bf80c1da5b
Rename fields in ThemeColors ( #3242 )
...
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.
This will help prevent this branch from diverging too far from `main`.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-06 11:53:27 -05:00
Nate Butler
3b91a76159
Merge branch 'main' into n/t2
2023-11-02 11:02:55 -04:00
Nathan Sobo
db9ccd7f34
Merge remote-tracking branch 'origin/main' into gpui2-no-send
2023-11-01 21:10:31 -06:00
Nathan Sobo
53066df522
Get project2 tests green
2023-11-01 20:14:40 -06:00
Marshall Bowers
3189cd779e
Remove unused impl
2023-11-01 10:52:25 -04:00
Nate Butler
bfb1f5ecf0
Continue refining theme, update tabs & tab bar
2023-11-01 01:41:33 -04:00
Marshall Bowers
18431051d9
Rework theme2 with new theme structure ( #3194 )
...
This PR reworks the theme definition in the `theme2` crate to be based
off of the new theme work that @iamnbutler has been working on.
We're still developing the new theme system, but it is complete enough
that we can now load the default theme and use it to theme the storybook
(albeit with some further refining of the color palette required).
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <marshall@zed.dev>
2023-10-31 22:23:00 -04:00
Max Brunsfeld
30dffbb409
Introduce a Render trait, make views implement it
...
Don't pass a render function separately from the view.
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio <as-cii@zed.dev>
2023-10-30 15:19:40 -07:00
Marshall Bowers
61694bba6a
Remove unneeded constructors for stories
2023-10-26 16:46:49 +02:00
Marshall Bowers
88ef74ec8f
Checkpoint: Compiling after view type removal
2023-10-26 15:20:38 +02:00
Nathan Sobo
0285284ae1
Rename IntoAnyElement trait to Component
2023-10-26 12:46:52 +02:00
Nathan Sobo
8ecfea55cd
Replace derive Element with derive IntoAnyElement everywhere
2023-10-26 12:38:23 +02:00
Nathan Sobo
927278e20d
Remove IntoAnyElement bound from Element trait
2023-10-26 11:49:36 +02:00
Marshall Bowers
9fb9885931
Checkpoint: Compiling
2023-10-26 10:08:39 +02:00
Marshall Bowers
e1032c5341
Remove ThemeColor in favor of theme2::Theme
2023-10-25 16:32:44 +02:00
Nathan Sobo
ec0b2e5430
Add on_drop listeners
2023-10-23 16:59:16 +02:00
Nathan Sobo
239b0c2f71
Clear active state when drag starts
2023-10-23 16:10:04 +02:00
Nathan Sobo
d1adce5890
Show red box when dragging
2023-10-23 15:09:22 +02:00
Nathan Sobo
96f2c4a9de
Checkpoint
2023-10-23 14:15:12 +02:00
Antonio Scandurra
e4fe9538d7
Checkpoint
2023-10-21 16:01:47 +02:00
Marshall Bowers
28b29d0985
Give each Tab its own ID
2023-10-19 16:42:21 -04:00
Marshall Bowers
52f2521f6a
Wire up active style for Tab
2023-10-19 16:37:54 -04:00
Marshall Bowers
e1e8b63eb5
Remove Clone bound from IconElement
2023-10-19 16:37:15 -04:00
Nate Butler
58650b7d2d
Checkpoint - Still Broken
2023-10-19 14:38:01 -04:00
Nate Butler
bca97f7186
Checkpoint – Broken
2023-10-19 12:58:17 -04:00
Antonio Scandurra
296a2b8e5d
Rename fill to bg
2023-10-18 09:39:23 +02:00
Marshall Bowers
262f5886a4
Checkpoint
2023-10-12 12:18:35 -04:00
Marshall Bowers
8cd112110e
Reconcile with upstream changes
2023-10-12 10:40:47 -04:00
Marshall Bowers
30088afa89
Colocate component stories with their components
2023-10-10 15:52:58 -04:00
Marshall Bowers
8db7f7ed37
Add Tab component
2023-10-06 18:43:25 -04:00
