Skip to content

Commit 85083d8

Browse files
committed
2016 Volume 2 SP-1 release changes merged.
1 parent e9fe9b8 commit 85083d8

File tree

169 files changed

+2595
-980
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+2595
-980
lines changed

Content/ej/mobile/android-theme/ej.mobile.android-core.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/android-theme/ej.mobile.android.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/ej.mobile.all.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/flat-theme/ej.mobile.flat-core.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/flat-theme/ej.mobile.flat-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/ios7-theme/ej.mobile.ios7-core.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/ios7-theme/ej.mobile.ios7.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/windows-theme/ej.mobile.windows-core.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/mobile/windows-theme/ej.mobile.windows.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Content/ej/web/bootstrap-theme/ej.theme.less

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@
637637
@kanban-select-cardhead-border:lighten(@default-border-color,3%);
638638
@kanban-cardhead-border:lighten(@default-border-color,3%);
639639
@kanban-toolbar-border:@default-border-color;
640-
640+
@kanban-filter-done-stcolor: @active-bg-stcolor;
641641
.kanban-cell-bg(){
642642
.custom-gradient(@default-gradient-color, lighten(@default-bg-stcolor, 4%), @default-bg-endcolor, 0%, 0%);
643643
}
@@ -1025,6 +1025,10 @@ color: white;
10251025
color:@hover-font-color;
10261026
//background-color:@hover-bg-endcolor;
10271027
}
1028+
.e-grid tr.e-traverse {
1029+
.row-Hover();
1030+
color:@hover-font-color;
1031+
}
10281032
.e-grid .e-scrollcss {
10291033
.gheader-gradient();
10301034
}
@@ -2104,7 +2108,7 @@ color:#5c5c5c;
21042108
{
21052109
box-shadow: 0 0 2px @shadow-bg-color;
21062110
}
2107-
.e-btn.e-select,.e-btn.e-disable.e-select:hover,.e-tbtn.e-disable
2111+
.e-btn.e-select,.e-btn.e-ntouch.e-disable.e-select:hover, .e-btn.e-disable.e-select:hover,.e-tbtn.e-disable
21082112
{
21092113
.bs-default-gradient();
21102114
color: @default-font-color;
@@ -2114,27 +2118,27 @@ color:#5c5c5c;
21142118
.e-btn.e-disable,.e-btn.e-disable .e-icon{
21152119
cursor:default;
21162120
}
2117-
.e-btn.e-select:hover
2121+
.e-btn.e-ntouch.e-select:hover
21182122
{
21192123
.hover-gradient();
21202124
border-color: @hover-border-color;
21212125
color: @hover-font-color;
21222126
}
2123-
.e-btn.e-select:active ,.e-btn.e-disable.e-active.e-select:hover, .e-tbtn.e-active
2127+
.e-btn.e-ntouch.e-select:active, .e-btn.e-select:active ,.e-btn.e-ntouch.e-disable.e-active.e-select:hover, .e-btn.e-disable.e-active.e-select:hover, .e-tbtn.e-active
21242128
{
21252129
.active-gradient();
21262130
border-color: @active-border-color;
21272131
color: @active-font-color;
21282132
}
2129-
.e-drp-btn.e-select,.e-btn.e-select .e-icon,.e-btn.e-select.e-disable:hover,.e-btn.e-select.e-disable:hover .e-icon
2133+
.e-drp-btn.e-select,.e-btn.e-select .e-icon,.e-btn.e-ntouch.e-select.e-disable:hover,.e-btn.e-select.e-disable:hover,.e-btn.e-ntouch.e-select.e-disable:hover .e-icon, .e-btn.e-ntouch.e-select.e-disable:hover .e-icon
21302134
{
21312135
color: @default-icon-color;
21322136
}
2133-
.e-drp-btn.e-select:hover,.e-btn.e-select:hover .e-icon
2137+
.e-drp-btn.e-ntouch.e-select:hover,.e-btn.e-ntouch.e-select:hover .e-icon, .e-drp-btn.e-select:hover,.e-btn.e-ntouch.e-select:hover .e-icon
21342138
{
21352139
color: @hover-icon-color;
21362140
}
2137-
.e-drp-btn.e-select:active,.e-btn.e-select:active .e-icon,.e-btn.e-active .e-icon,.e-btn.e-disable.e-select.e-active:hover .e-icon
2141+
.e-drp-btn.e-ntouch.e-select:active, .e-drp-btn.e-select:active,.e-btn.e-ntouch.e-select:active .e-icon, .e-btn.e-select:active .e-icon,.e-btn.e-active .e-icon,.e-btn.e-ntouch.e-disable.e-select.e-active:hover .e-icon,.e-btn.e-ntouch.e-disable.e-select.e-active:hover .e-icon
21382142
{
21392143
color: @active-icon-color;
21402144
}
@@ -2305,6 +2309,7 @@ color:#5c5c5c;
23052309
.e-colorpicker .e-color-image, .e-presetWrapper .e-color-image, .e-presetWrapper.e-menu.e-context .e-color-image.e-mhover {
23062310
background-image: @colorpicker-image;
23072311
background-color: transparent;
2312+
filter: none;
23082313
}
23092314

23102315
.e-presetWrapper .e-presetHeader, .e-colorpicker .e-element .e-icon:before {
@@ -2334,6 +2339,12 @@ color:#5c5c5c;
23342339
background: @content-bg-color;
23352340
}
23362341

2342+
.e-colorpicker .e-context.e-menu .e-mhover > a, .e-colorpicker .e-context.e-menu .e-mhover > span,
2343+
.e-colorpicker .e-context.e-menu .e-mfocused, .e-colorpicker .e-context.e-menu .e-mfocused > a, .e-colorpicker .e-context.e-menu .e-mfocused > span {
2344+
background: transparent;
2345+
}
2346+
2347+
23372348

23382349

23392350
.e-fileexplorer,.e-fileexplorer input,input.e-fe-dialog-text,
@@ -2942,7 +2953,7 @@ color:#5c5c5c;
29422953

29432954

29442955
.svg-rotate-ie {
2945-
cursor: url("../common-images/Rotate.cur"), url("/themes/common-images/Rotate.cur"), url("../themes/common-images/Rotate.cur"), default;
2956+
cursor: url("../common-images/Rotate.cur"), default;
29462957
}
29472958
.svg-rotate {
29482959
cursor: url("../common-images/Rotate.cur"), default;
@@ -3576,7 +3587,7 @@ word-break: break-all;
35763587
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
35773588
border-color: @content-border-color;
35783589
}
3579-
.e-menu.e-horizontal > .e-list > ul:after {
3590+
.e-menu.e-horizontal > .e-list.e-active.e-menu-arrow:after {
35803591
border-color: transparent transparent @content-bg-color;
35813592
border-style: @border-type;
35823593
}
@@ -6214,8 +6225,7 @@ content:"\e6a0";
62146225
{
62156226
padding: 0 6px 6px;
62166227
}
6217-
.e-pivotschemadesigner .expandSchema {
6218-
background: url("../images/expand.png") repeat scroll 0 0 rgba(0, 0, 0, 0);
6228+
.e-pivotschemadesigner .expandSchema {
62196229
display: block;
62206230
float: right;
62216231
height: 25px;
@@ -6227,8 +6237,7 @@ content:"\e6a0";
62276237
.e-pivotschemadesigner .collapseSchema {
62286238
float: right;
62296239
height: 25px;
6230-
position: relative;
6231-
background-image:url("../images/colapse.png");
6240+
position: relative;
62326241
top: -615px;
62336242
width: 23px;
62346243
}
@@ -8029,7 +8038,7 @@ background-color:@hover-bg-stcolor !important;
80298038
content:@gantt-edit-icon-content;
80308039
}
80318040

8032-
.e-treegrid .e-treegrid-delete:before{
8041+
.e-treegrid .e-treegrid-delete.e-delete:before{
80338042
content:@gantt-delete-icon-content;
80348043
}
80358044

@@ -8548,6 +8557,9 @@ box-shadow: -1px 0 10px 0 black;
85488557
.e-kanban .e-rowcell .e-shrinkheader {
85498558
color:@active-bg-stcolor;
85508559
}
8560+
.e-kanban-context .e-checkbox .e-checkmark {
8561+
color:@active-bg-stcolor! important;
8562+
}
85518563
.e-kanban .e-kanbanheader.e-slheader .e-headercell,.e-kanban.e-swimlane-responsive .e-columnrow .e-rowcell{
85528564
border-bottom: 4px solid @default-bg-stcolor;
85538565
}
@@ -8615,6 +8627,10 @@ box-shadow: -1px 0 10px 0 black;
86158627
{
86168628
color:@content-font-color;
86178629
}
8630+
.e-kanbanfilter-window .e-filter-scrollcontent, .e-kbnfilterwindow-head
8631+
{
8632+
color:@content-font-color;
8633+
}
86188634
.e-kanban .e-slexpand, .e-kanban .e-slcollapse
86198635
{
86208636
color: @default-icon-color;
@@ -8636,6 +8652,10 @@ box-shadow: -1px 0 10px 0 black;
86368652
{
86378653
color: @active-icon-color;
86388654
}
8655+
.e-kanban .e-kanbancard.e-cardselection.e-hover .e-cardcollapse:before, .e-kanban .e-kanbancard.e-cardselection.e-hover .e-cardexpand:before
8656+
{
8657+
color: @hover-icon-color;
8658+
}
86398659
.e-kanban .e-headercell .e-totalcard
86408660
{
86418661
color: lighten(@content-font-color, 54%);
@@ -8700,6 +8720,9 @@ box-shadow: -1px 0 10px 0 black;
87008720
.e-kanban .e-kanbantoolbar .e-select .e-text {
87018721
color: @active-font-color;
87028722
}
8723+
.e-kanban .e-kanbantoolbar .e-select.e-hover a{
8724+
color: @content-font-color;
8725+
}
87038726
.e-kanban .e-kanbantoolbar .e-text,.e-kanban .e-kanbantoolbar .e-quickfilter .e-text
87048727
{
87058728
color:@content-font-color;
@@ -8713,6 +8736,7 @@ box-shadow: -1px 0 10px 0 black;
87138736
}
87148737
.e-kanban .e-rowcell.e-exceed {
87158738
background: @kanban-cell-exceed;
8739+
filter: none! important;
87168740
}
87178741
.e-kanban .e-rowcell.e-deceed {
87188742
background: @kanban-cell-deceed;
@@ -8803,8 +8827,8 @@ box-shadow: -1px 0 10px 0 black;
88038827
.e-kanban.e-responsive .e-kanbantoolbar:not(.e-adaptive-search) .e-searchitem:hover{
88048828
.hover-gradient();
88058829
}
8806-
.e-kanban.e-responsive .e-filter-done:hover{
8807-
color:@hover-bg-stcolor;
8830+
.e-kanbanfilter-window .e-filter-done:hover{
8831+
color:@kanban-filter-done-stcolor;
88088832
}
88098833
.e-kanban.e-responsive .e-filter-done{
88108834
color:@active-bg-stcolor;
@@ -9610,7 +9634,7 @@ div.e-dlg-field-validation-error:before {
96109634
color: @active-font-color;
96119635
}
96129636

9613-
.e-tile .e-tile-image {
9637+
.e-tile .e-image-parent, .e-tile-image {
96149638
.tile-bg-gradient;
96159639
}
96169640

0 commit comments

Comments
 (0)