feature(EJ2-4457): conflict resolved (origin/EJ2-4457-grid-bootstrap)

pipeline · pipeline · commit 443d824bddf4 · 2017-09-28T18:06:21.000Z
diff --git a/bootstrap.scss b/bootstrap.scss
@@ -4,16 +4,21 @@
 @import "base/bootstrap.scss";
 @import "auto-complete/bootstrap.scss";
 @import "button/bootstrap.scss";
+@import "calendar/bootstrap.scss";
 @import "check-box/bootstrap.scss";
 @import "combo-box/bootstrap.scss";
+@import "datepicker/bootstrap.scss";
 @import "dialog/bootstrap.scss";
 @import "drop-down-base/bootstrap.scss";
 @import "drop-down-list/bootstrap.scss";
+@import "grid/bootstrap.scss";
 @import "h-scroll/bootstrap.scss";
 @import "input/bootstrap.scss";
 @import "list-view/bootstrap.scss";
 @import "numerictextbox/bootstrap.scss";
+@import "pager/bootstrap.scss";
 @import "popup/bootstrap.scss";
 @import "radio-button/bootstrap.scss";
+@import "timepicker/bootstrap.scss";
 @import "toolbar/bootstrap.scss";
 @import "tooltip/bootstrap.scss";
diff --git a/calendar/ReadMe.md b/calendar/ReadMe.md
@@ -7,4 +7,6 @@ Calendar interface for selecting dates with options for disabling dates, restric
 [Calendar Demo](http://ej2.syncfusion.com/demos/#/calendar/default.html)    
 [Calendar Documentation](http://ej2.syncfusion.com/documentation/calendar)  
 [DatePicker Demo](http://ej2.syncfusion.com/demos/#/datepicker/default.html)       
-[DatePicker Documentation](http://ej2.syncfusion.com/documentation/datepicker) 
+[DatePicker Documentation](http://ej2.syncfusion.com/documentation/datepicker) 
+[TimePicker Demo](http://ej2.syncfusion.com/demos/#/timepicker/default.html)       
+[TimePicker Documentation](http://ej2.syncfusion.com/documentation/timepicker) 
diff --git a/calendar/bootstrap.scss b/calendar/bootstrap.scss
@@ -0,0 +1 @@
+@import "ej2-calendars/styles/calendar/bootstrap.scss";
diff --git a/datepicker/ReadMe.md b/datepicker/ReadMe.md
@@ -7,4 +7,6 @@ Calendar interface for selecting dates with options for disabling dates, restric
 [Calendar Demo](http://ej2.syncfusion.com/demos/#/calendar/default.html)    
 [Calendar Documentation](http://ej2.syncfusion.com/documentation/calendar)  
 [DatePicker Demo](http://ej2.syncfusion.com/demos/#/datepicker/default.html)       
-[DatePicker Documentation](http://ej2.syncfusion.com/documentation/datepicker) 
+[DatePicker Documentation](http://ej2.syncfusion.com/documentation/datepicker) 
+[TimePicker Demo](http://ej2.syncfusion.com/demos/#/timepicker/default.html)       
+[TimePicker Documentation](http://ej2.syncfusion.com/documentation/timepicker) 
diff --git a/datepicker/bootstrap.scss b/datepicker/bootstrap.scss
@@ -0,0 +1 @@
+@import "ej2-calendars/styles/datepicker/bootstrap.scss";
diff --git a/grid/bootstrap.scss b/grid/bootstrap.scss
@@ -0,0 +1 @@
+@import "ej2-grids/styles/grid/bootstrap.scss";
diff --git a/pager/bootstrap.scss b/pager/bootstrap.scss
@@ -0,0 +1 @@
+@import "ej2-grids/styles/pager/bootstrap.scss";
diff --git a/timepicker/ReadMe.md b/timepicker/ReadMe.md
@@ -7,4 +7,6 @@ Calendar interface for selecting dates with options for disabling dates, restric
 [Calendar Demo](http://ej2.syncfusion.com/demos/#/calendar/default.html)    
 [Calendar Documentation](http://ej2.syncfusion.com/documentation/calendar)  
 [DatePicker Demo](http://ej2.syncfusion.com/demos/#/datepicker/default.html)       
-[DatePicker Documentation](http://ej2.syncfusion.com/documentation/datepicker) 
+[DatePicker Documentation](http://ej2.syncfusion.com/documentation/datepicker) 
+[TimePicker Demo](http://ej2.syncfusion.com/demos/#/timepicker/default.html)       
+[TimePicker Documentation](http://ej2.syncfusion.com/documentation/timepicker) 
diff --git a/timepicker/bootstrap.scss b/timepicker/bootstrap.scss
@@ -0,0 +1 @@
+@import "ej2-calendars/styles/timepicker/bootstrap.scss";

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "ej2-calendars/styles/calendar/bootstrap.scss";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "ej2-calendars/styles/datepicker/bootstrap.scss";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "ej2-grids/styles/grid/bootstrap.scss";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "ej2-grids/styles/pager/bootstrap.scss";`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+@import "ej2-calendars/styles/timepicker/bootstrap.scss";`