diff --git a/README.md b/README.md index 4f96ce29..5e1775c0 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,34 @@ +<<<<<<< HEAD +![logo](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/icon.png) + +![c#-version](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/c#-version.png) ![IDE-version](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/IDE-version.png) [![nuget-version](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/nuget-version.png)](https://www.nuget.org/packages/HandyControl) + +# 欢迎使用 HandyControl + +> HandyControl包含了我在开发过程中觉得wpf原生库中所欠缺的东西,现在所有的控件均已编码完毕,我会抽空将最为常用的部分一一开源,因个人能力和时间精力的原因,控件库中难免会留有bug,如果你发现了它们请给我提issue,谢谢。 + +让我们开门见山,HandyControl已经开源的控件截图有: + +### 1、颜色拾取器ColorPicker + +![颜色拾取器ColorPicker](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/ColorPicker.gif) + +### 2、加载条Loading + +![加载条Loading](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Loading.gif) + +### 3、轮播Carousel + +![轮播Carousel](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Carousel.gif) + +### 4、页码条Pagination + +![轮播Pagination](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Pagination.gif) + +### 5、展开折叠框Expander + +![展开折叠框Expander](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif) +======= # 欢迎使用 HandyControl 让我们开门见山,HandyControl已经开源的控件截图有: @@ -21,3 +52,4 @@ ### 5、展开折叠框Expander ![展开折叠框Expander](https://raw.githubusercontent.com/NaBian/HandyControl/master/Resources/Expander.gif) +>>>>>>> d5da44732dc78b85ef45afd41c79e8e91a29c954