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

Jump to bottom

Adding ColorPicker #241

Merged
merged 32 commits into from
Mar 5, 2024
Merged

Adding ColorPicker #241

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
215833c
Init
niels9001 Sep 20, 2023
be939c7
Use default GetTemplateChild
niels9001 Sep 20, 2023
9809275
Visual updates
niels9001 Sep 20, 2023
a4cd709
Adding ColorPicker and ColorPickerButton
niels9001 Sep 23, 2023
6006bf3
XAML styler
niels9001 Sep 23, 2023
7441c3c
Merge branch 'main' into niels9001/colorpicker
niels9001 Sep 23, 2023
f19604b
Adding icon
niels9001 Sep 23, 2023
72e6e9a
Adding missing brushes
niels9001 Sep 23, 2023
e3505f8
Setting default width + fixing background bug
niels9001 Sep 23, 2023
f630d8b
Merge branch 'main' into niels9001/colorpicker
niels9001 Oct 6, 2023
3c96fa9
Fix CI
niels9001 Oct 6, 2023
f239728
Merge branch 'main' into niels9001/colorpicker
niels9001 Nov 28, 2023
0687e66
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Jan 9, 2024
f661b12
Merge branch 'main' into niels9001/colorpicker
michael-hawker Jan 10, 2024
fb9fb6b
Update components/ColorPicker/src/ColorPickerSlider.Properties.cs
niels9001 Jan 10, 2024
a9d5395
Fixed PackageId
Arlodotexe Jan 18, 2024
00f6e74
Add ToolkitSegmentedSourceProject
Arlodotexe Jan 18, 2024
b84dc58
Use absolute paths for ProjectReference
Arlodotexe Jan 18, 2024
e3dd4be
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Jan 24, 2024
33ee0cc
Fixed ProjectReference prop names
Arlodotexe Jan 24, 2024
7d7263a
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Jan 30, 2024
45e2443
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Jan 31, 2024
4e2c007
UI improvements
niels9001 Feb 1, 2024
08b5e0a
XAML styler
niels9001 Feb 1, 2024
146b4d9
Merge branch 'main' into niels9001/colorpicker
niels9001 Feb 1, 2024
5a48acf
Merge branch 'main' into niels9001/colorpicker
niels9001 Feb 8, 2024
54d9881
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Feb 28, 2024
9524352
Include MSBuild.Sdk.Extras/3.0.23 on UWP only
Arlodotexe Feb 28, 2024
7186176
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Feb 29, 2024
77fd1df
Merge branch 'main' into niels9001/colorpicker
niels9001 Mar 4, 2024
416c813
Workaround for Segmented layout files being included in ColorPicker
Arlodotexe Mar 5, 2024
95204d6
Merge branch 'main' into niels9001/colorpicker
Arlodotexe Mar 5, 2024
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
Prev Previous commit
Next Next commit
Merge branch 'main' into niels9001/colorpicker
  • Loading branch information
@Arlodotexe
Arlodotexe committed Jan 30, 2024
commit 7d7263a4bbed7a6dfadfaccb99cc7e5e6dfc9b3c

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.