feature(EJ2-3785): Pulled the master branch to resolve the conflict error

pipeline · pipeline · commit df173e94afc3 · 2017-09-25T14:15:38.000Z
diff --git a/combo-box/ReadMe.md b/combo-box/ReadMe.md
@@ -0,0 +1,47 @@
+# DropDownList
+
+The DropDownList component contains a list of predefined values, from which the user can choose a single value. The functionality of DropDownList resembles the SELECT form element of HTML. When an arrow icon accompanied with this component is pressed, the dropdown displays a list of values, from which the user can select one.
+
+Also, it comes with full documentation and support which is available for commercial and community licensed users. To know more, please visit www.syncfusion.com.
+
+## Key features
+
+* Local and Remote Data Binding
+* Grouping & Sorting support
+* Template support
+* Incremental search & filter search support
+* Accessibility and Keyboard interaction
+
+## Resources
+[Demo](http://ej2.syncfusion.com/demos/#/material/dropdownlist/default.html)  
+[Documentation](http://ej2.syncfusion.com/documentation/dropdownlist)  
+[AngularDemo](http://ej2.syncfusion.com/angular/demos/#/material/dropdownlist/default)  
+[AngularDocumentation](http://ej2.syncfusion.com/angular/documentation/dropdownlist)
+[ReactDemo](http://ej2.syncfusion.com/react/demos/#/material/dropdownlist/default)  
+[ReactDocumentation](http://ej2.syncfusion.com/react/documentation/dropdownlist/)
+
+# ComboBox
+
+The ComboBox component allows the user to type a value or choose an option from the list of predefined
+options. When an arrow icon accompanied with this component is pressed, the dropdown displays a list of
+values, from which the user can select one.
+
+Also, it comes with full documentation and support which is available for commercial and community licensed users. To know more, please visit www.syncfusion.com.
+
+## Key features
+
+* Local and Remote Data Binding
+* Custom value support
+* Autofill support
+* Grouping & Sorting support
+* Template support
+* Filter search support
+* Accessibility and Keyboard interaction
+
+## Resources
+[Demo](http://ej2.syncfusion.com/demos/#/material/combobox/default.html)  
+[Documentation](http://ej2.syncfusion.com/documentation/combobox/)  
+[AngularDemo](http://ej2.syncfusion.com/angular/demos/#/material/combobox/default)  
+[AngularDocumentation](http://ej2.syncfusion.com/angular/documentation/combobox/)
+[ReactDemo](http://ej2.syncfusion.com/react/demos/#/material/combobox/default)  
+[ReactDocumentation](http://ej2.syncfusion.com/react/documentation/combobox/)
diff --git a/combo-box/fabric.scss b/combo-box/fabric.scss
@@ -0,0 +1 @@
+@import "ej2-dropdowns/styles/combo-box/fabric.scss";
diff --git a/combo-box/index.ts b/combo-box/index.ts
@@ -0,0 +1 @@
+export * from "@syncfusion/ej2-dropdowns/combo-box";
diff --git a/combo-box/material.scss b/combo-box/material.scss
@@ -0,0 +1 @@
+@import "ej2-dropdowns/styles/combo-box/material.scss";
diff --git a/drop-down-base/ReadMe.md b/drop-down-base/ReadMe.md
@@ -13,6 +13,35 @@ Also, it comes with full documentation and support which is available for commer
 * Accessibility and Keyboard interaction
 
 ## Resources
+[Demo](http://ej2.syncfusion.com/demos/#/material/dropdownlist/default.html)  
+[Documentation](http://ej2.syncfusion.com/documentation/dropdownlist)  
+[AngularDemo](http://ej2.syncfusion.com/angular/demos/#/material/dropdownlist/default)  
+[AngularDocumentation](http://ej2.syncfusion.com/angular/documentation/dropdownlist)
+[ReactDemo](http://ej2.syncfusion.com/react/demos/#/material/dropdownlist/default)  
+[ReactDocumentation](http://ej2.syncfusion.com/react/documentation/dropdownlist/)
 
-[Demo](http://ej2.syncfusion.com/demos/#/dropdownlist/default.html)  
-[Documentation](http://ej2.syncfusion.com/documentation/drop-down-list)
+# ComboBox
+
+The ComboBox component allows the user to type a value or choose an option from the list of predefined
+options. When an arrow icon accompanied with this component is pressed, the dropdown displays a list of
+values, from which the user can select one.
+
+Also, it comes with full documentation and support which is available for commercial and community licensed users. To know more, please visit www.syncfusion.com.
+
+## Key features
+
+* Local and Remote Data Binding
+* Custom value support
+* Autofill support
+* Grouping & Sorting support
+* Template support
+* Filter search support
+* Accessibility and Keyboard interaction
+
+## Resources
+[Demo](http://ej2.syncfusion.com/demos/#/material/combobox/default.html)  
+[Documentation](http://ej2.syncfusion.com/documentation/combobox/)  
+[AngularDemo](http://ej2.syncfusion.com/angular/demos/#/material/combobox/default)  
+[AngularDocumentation](http://ej2.syncfusion.com/angular/documentation/combobox/)
+[ReactDemo](http://ej2.syncfusion.com/react/demos/#/material/combobox/default)  
+[ReactDocumentation](http://ej2.syncfusion.com/react/documentation/combobox/)
diff --git a/drop-down-list/ReadMe.md b/drop-down-list/ReadMe.md
@@ -13,6 +13,35 @@ Also, it comes with full documentation and support which is available for commer
 * Accessibility and Keyboard interaction
 
 ## Resources
+[Demo](http://ej2.syncfusion.com/demos/#/material/dropdownlist/default.html)  
+[Documentation](http://ej2.syncfusion.com/documentation/dropdownlist)  
+[AngularDemo](http://ej2.syncfusion.com/angular/demos/#/material/dropdownlist/default)  
+[AngularDocumentation](http://ej2.syncfusion.com/angular/documentation/dropdownlist)
+[ReactDemo](http://ej2.syncfusion.com/react/demos/#/material/dropdownlist/default)  
+[ReactDocumentation](http://ej2.syncfusion.com/react/documentation/dropdownlist/)
 
-[Demo](http://ej2.syncfusion.com/demos/#/dropdownlist/default.html)  
-[Documentation](http://ej2.syncfusion.com/documentation/drop-down-list)
+# ComboBox
+
+The ComboBox component allows the user to type a value or choose an option from the list of predefined
+options. When an arrow icon accompanied with this component is pressed, the dropdown displays a list of
+values, from which the user can select one.
+
+Also, it comes with full documentation and support which is available for commercial and community licensed users. To know more, please visit www.syncfusion.com.
+
+## Key features
+
+* Local and Remote Data Binding
+* Custom value support
+* Autofill support
+* Grouping & Sorting support
+* Template support
+* Filter search support
+* Accessibility and Keyboard interaction
+
+## Resources
+[Demo](http://ej2.syncfusion.com/demos/#/material/combobox/default.html)  
+[Documentation](http://ej2.syncfusion.com/documentation/combobox/)  
+[AngularDemo](http://ej2.syncfusion.com/angular/demos/#/material/combobox/default)  
+[AngularDocumentation](http://ej2.syncfusion.com/angular/documentation/combobox/)
+[ReactDemo](http://ej2.syncfusion.com/react/demos/#/material/combobox/default)  
+[ReactDocumentation](http://ej2.syncfusion.com/react/documentation/combobox/)
diff --git a/fabric.scss b/fabric.scss
@@ -7,6 +7,7 @@
 @import "calendar/fabric.scss";
 @import "check-box/fabric.scss";
 @import "circular-gauge/fabric.scss";
+@import "combo-box/fabric.scss";
 @import "datepicker/fabric.scss";
 @import "dialog/fabric.scss";
 @import "drop-down-base/fabric.scss";
diff --git a/material.scss b/material.scss
@@ -7,6 +7,7 @@
 @import "calendar/material.scss";
 @import "check-box/material.scss";
 @import "circular-gauge/material.scss";
+@import "combo-box/material.scss";
 @import "datepicker/material.scss";
 @import "dialog/material.scss";
 @import "drop-down-base/material.scss";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "ej2-dropdowns/styles/combo-box/fabric.scss";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export * from "@syncfusion/ej2-dropdowns/combo-box";`