Merge pull request IgniteUI#1024 from IgniteUI/17.1

merging 17.1 into master
maheshkumartamboli · May 19, 2017 · ddc5364 · ddc5364
2 parents 8b86bc0 + d388094
commit ddc5364
Show file tree

Hide file tree

Showing 33 changed files with 671 additions and 286 deletions.
diff --git a/src/css/structure/modules/infragistics.ui.scheduler.css b/src/css/structure/modules/infragistics.ui.scheduler.css
diff --git a/src/css/structure/modules/infragistics.ui.spreadsheet.css b/src/css/structure/modules/infragistics.ui.spreadsheet.css
@@ -14,6 +14,11 @@
 	white-space: nowrap;
 }
 
+.ui-igspreadsheet .ui-menu-item > a {
+	text-decoration: none;
+	white-space: nowrap;
+}
+
 .ui-igspreadsheet .ui-menu-divider {
 	margin: 0;
 	border-top: none;
@@ -536,19 +541,37 @@
 	margin-top: -4px;
 	border-top: 4px solid transparent;
 	border-bottom: 4px solid transparent;
+}
+
+.ui-igspreadsheet-scrollbar-button-left:before
+{
 	border-right: 6px solid currentColor;
 }
 
+.ui-igspreadsheet-scrollbar-button-right:before
+{
+	border-left: 6px solid currentColor;
+}
+
 .ui-igspreadsheet-scrollbar-button-up:before,
 .ui-igspreadsheet-scrollbar-button-down:before
 {
 	margin-left: -4px;
 	margin-top: -3px;
 	border-left: 4px solid transparent;
 	border-right: 4px solid transparent;
+}
+
+.ui-igspreadsheet-scrollbar-button-up:before
+{
 	border-bottom: 6px solid currentColor;
 }
 
+.ui-igspreadsheet-scrollbar-button-down:before
+{
+	border-top: 6px solid currentColor;
+}
+
 .ui-igspreadsheet-scrollbar-track-left,
 .ui-igspreadsheet-scrollbar-track-right,
 .ui-igspreadsheet-scrollbar-track-up,
@@ -560,7 +583,6 @@
 .ui-igspreadsheet-scrollbar-thumb-vertical,
 .ui-igspreadsheet-scrollbar-thumb-horizontal
 {
-
 	box-sizing: border-box;
 }
 

diff --git a/src/css/themes/bootstrap3/_shared-styles/less/infragistics.igniteui.theme.less b/src/css/themes/bootstrap3/_shared-styles/less/infragistics.igniteui.theme.less
@@ -2673,7 +2673,7 @@ Spreadsheet colors
 }
 
 .ui-igspreadsheet .ui-menu-item:hover {
-    background: @spreadsheet-men-bg-hover;
+    background: @spreadsheet-menu-item-bg-hover;
     border-radius: 0;
 }
 

diff --git a/src/css/themes/bootstrap3/flatly/infragistics.theme.css b/src/css/themes/bootstrap3/flatly/infragistics.theme.css
@@ -1,11 +1,6 @@
 /******************************************/
 /* Infragistics Ignite UI Bootstrap theme */
 /******************************************/
-/*
-Spreadsheet
-=================
-*/
-/* needs to be improved with mixin*/
 /*  MIXINS  */
 /************/
 /* states */
@@ -81,6 +76,11 @@ Spreadsheet
   background-color: #7b190f !important;
   border: 1px solid #5d130b !important;
 }
+/*
+Spreadsheet
+=================
+*/
+/* needs to be improved with mixin*/
 /*  Misc    */
 /************/
 .boxShadow {

diff --git a/src/css/themes/bootstrap3/flatly/infragistics.theme.less b/src/css/themes/bootstrap3/flatly/infragistics.theme.less
@@ -141,6 +141,43 @@
     background-color: darken(@brand-danger, 30%)!important;
     border: 1px solid darken(@brand-danger, 36.5%)!important;
 }
+
+/*
+Spreadsheet
+=================
+*/
+@accent1: @brand-primary;
+
+@bar-background: #e4e4e4;
+@row-col-bar-border: #cccccc;
+
+@tab-bar-border: #999;
+
+@spreadsheet-accent: @brand-primary;
+@spreadsheet-icon:@brand-primary;
+
+@spreadsheet-cell-selection: @brand-primary;
+@spreadsheet-cell-selection-rgba: rgba(44,62,80, .22); /* needs to be improved with mixin*/
+
+@spreadsheet-text-color:#111;
+@spreadsheet-wight-text: #fff;
+
+@spreadsheet-empty-bg: #fff;
+
+@spreadsheet-disabled: #c4c4c4;
+
+@spreadsheet-danger: @brand-danger;
+
+@spreadsheet-menu-item-bg-hover: @spreadsheet-cell-selection-rgba;
+
+@spreadsheet-formula-btn-bg: @gray;
+
+@spreadsheet-header-selected-cell-bg:lighten(@brand-primary,30%);
+
+@spreadsheet-tab-text-color: #666;
+
+@spreadsheet-formula-btn-color: #fff;
+
 /*  Misc    */
 /************/
 

diff --git a/src/css/themes/bootstrap3/flatly/variables.less b/src/css/themes/bootstrap3/flatly/variables.less
@@ -5,18 +5,6 @@
 
 //== Colors
 
-@igGray1: #f0f0f0;
-@igGray2: #eee;
-@igGray3: #e8e8e8;
-@igGray4: #dadada;
-@igGray5: #bcbcbc;
-@igGray6: #ccc;
-@igGray7: #999;
-@igGray8: #888;
-@igGray9: #777;
-@igGray10: #444;
-@igGray11: rgba(0,0,0, 0.12);
-
 //
 //## Gray and brand colors for use across Bootstrap.
 
@@ -880,41 +868,3 @@
 @dl-horizontal-breakpoint:    @grid-float-breakpoint;
 //** Horizontal line color.
 @hr-border:                   @gray-lighter;
-
-
-
-/*
-Spreadsheet
-=================
-*/
-@accent1: @brand-primary;
-
-@bar-background: #e4e4e4;
-@row-col-bar-border: #cccccc;
-
-@tab-bar-border: #999;
-
-@spreadsheet-accent: @brand-primary;
-@spreadsheet-icon:@brand-primary;
-
-@spreadsheet-cell-selection: @brand-primary;
-@spreadsheet-cell-selection-rgba: rgba(44,62,80, .22); /* needs to be improved with mixin*/
-
-@spreadsheet-text-color:#111;
-@spreadsheet-wight-text: #fff;
-
-@spreadsheet-empty-bg: #fff;
-
-@spreadsheet-disabled: #c4c4c4;
-
-@spreadsheet-danger: @brand-danger;
-
-@spreadsheet-men-bg-hover: @spreadsheet-cell-selection-rgba;
-
-@spreadsheet-formula-btn-bg: @gray;
-
-@spreadsheet-header-selected-cell-bg:lighten(@brand-primary,30%);
-
-@spreadsheet-tab-text-color: #666;
-
-@spreadsheet-formula-btn-color: #fff;
diff --git a/src/css/themes/bootstrap3/infragistics.theme.css b/src/css/themes/bootstrap3/infragistics.theme.css
@@ -1,11 +1,6 @@
 /******************************************/
 /* Infragistics Ignite UI Bootstrap theme */
 /******************************************/
-/*
-    Spreadsheet
-  =================
-*/
-/* needs to be improved with mixin*/
 /*  MIXINS  */
 /************/
 /* states */
@@ -86,6 +81,11 @@
 .boxShadow {
   box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.25) !important;
 }
+/*
+    Spreadsheet
+  =================
+*/
+/* needs to be improved with mixin*/
 /********************/
 /* JQuery UI styles */
 /********************/

diff --git a/src/css/themes/bootstrap3/infragistics.theme.less b/src/css/themes/bootstrap3/infragistics.theme.less
@@ -17,6 +17,17 @@
 //**************/
 //import bootstrap variables to override the defaults
 @import "variables.less";
+@igGray1: #f0f0f0;
+@igGray2: #eee;
+@igGray3: #e8e8e8;
+@igGray4: #dadada;
+@igGray5: #bcbcbc;
+@igGray6: #ccc;
+@igGray7: #999;
+@igGray8: #888;
+@igGray9: #777;
+@igGray10: #444;
+@igGray11: rgba(0,0,0, 0.12);
 
 //***********/
 /*  MIXINS  */ 
@@ -138,6 +149,43 @@
     box-shadow: 3px 3px 5px rgba(0, 0, 0, 0.25)!important;
 }
 
+/*
+    Spreadsheet
+  =================
+*/
+@accent1: @brand-primary;
+
+@bar-background: #e4e4e4;
+@row-col-bar-border: #cccccc;
+
+@tab-bar-border: #999;
+
+@spreadsheet-accent: @brand-primary;
+@spreadsheet-icon:@brand-primary;
+
+@spreadsheet-cell-selection: @brand-primary;
+@spreadsheet-cell-selection-rgba: rgba(66,139,202, .22); /* needs to be improved with mixin*/
+
+@spreadsheet-text-color:#111;
+@spreadsheet-wight-text: #fff;
+
+@spreadsheet-empty-bg: #fff;
+
+@spreadsheet-disabled: #c4c4c4;
+
+@spreadsheet-danger: @brand-danger;
+
+@spreadsheet-menu-item-bg-hover: @spreadsheet-cell-selection-rgba;
+
+@spreadsheet-formula-btn-bg: @brand-primary;
+
+@spreadsheet-header-selected-cell-bg:lighten(@body-bg,15%);
+
+@spreadsheet-tab-text-color: #666;
+
+@spreadsheet-formula-btn-color: #fff;
+
+
 /********************/
 /* JQuery UI styles */
 /********************/

diff --git a/src/css/themes/bootstrap3/superhero/infragistics.theme.css b/src/css/themes/bootstrap3/superhero/infragistics.theme.css
@@ -1,11 +1,6 @@
 /******************************************/
 /* Infragistics Ignite UI Bootstrap theme */
 /******************************************/
-/*
-    Spreadsheet
-  =================
-*/
-/* needs to be improved with mixin*/
 /*  MIXINS  */
 /************/
 /* states */
@@ -81,6 +76,11 @@
   background-color: #761c19 !important;
   border: 1px solid #5a1614 !important;
 }
+/*
+    Spreadsheet
+  =================
+*/
+/* needs to be improved with mixin*/
 /*  Misc    */
 /************/
 .boxShadow {

diff --git a/src/css/themes/bootstrap3/superhero/infragistics.theme.less b/src/css/themes/bootstrap3/superhero/infragistics.theme.less
@@ -141,6 +141,44 @@
     background-color: darken(@brand-danger, 30%)!important;
     border: 1px solid darken(@brand-danger, 36.5%)!important;
 }
+
+/*
+    Spreadsheet
+  =================
+*/
+@accent1: @brand-primary;
+
+@bar-background: @gray-light;
+@row-col-bar-border: lighten(@gray-light,10%);
+
+@tab-bar-border:lighten(@gray-light,15%);
+
+@spreadsheet-accent: @brand-primary;
+@spreadsheet-icon:@brand-primary;
+
+@spreadsheet-cell-selection: @brand-primary;
+@spreadsheet-cell-selection-rgba: rgba(223,105,26, .22); /* needs to be improved with mixin*/
+
+@spreadsheet-text-color:#111;
+@spreadsheet-wight-text: #fff;
+
+@spreadsheet-empty-bg: #fff;
+
+@spreadsheet-disabled: #c4c4c4;
+
+@spreadsheet-danger: @brand-danger;
+
+@spreadsheet-menu-item-bg-hover: @spreadsheet-cell-selection-rgba;
+
+@spreadsheet-formula-btn-bg: @body-bg;
+
+@spreadsheet-header-selected-cell-bg:darken(@gray-light,25%);
+
+@spreadsheet-tab-text-color: #ddd;
+
+@spreadsheet-formula-btn-color: #ddd;
+
+
 /*  Misc    */
 /************/