Skip to content

Commit

Permalink
Update Kendo UI Core to the latest version - 2021.3.914 (#116)
Browse files Browse the repository at this point in the history 
Updated kendo to version 2021.3.914

Co-authored-by: DanielŻuławski
  • Loading branch information
@KrzysztofPajak
KrzysztofPajak committed Sep 21, 2021
1 parent de9a829 commit 6666a13
Show file tree
Hide file tree
Showing 44 changed files with 7,284 additions and 23 deletions.
4 changes: 2 additions & 2 deletions src/Web/Grand.Web.Admin/Areas/Admin/Views/Shared/HeadAdmin.cshtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@{
var supportRtl = workContext.WorkingLanguage.Rtl &&
!languageSettings.IgnoreRtlPropertyForAdminArea;
var kendoVersion = "2019.2.514";
var kendoVersion = "2021.3.914";

<link rel="stylesheet" type="text/css" href="/_content/Grand.Web.Admin/administration/bootstrap/css/daterangepicker.min.css" />
<link rel="stylesheet" type="text/css" href="/_content/Grand.Web.Admin/administration/build/css/font-awesome.min.css" />
Expand All @@ -22,7 +22,7 @@
{
<link rel="stylesheet" type="text/css" href="/_content/Grand.Web.Admin/administration/bootstrap/css/bootstrap-rtl.min.css" />
<link rel="stylesheet" type="text/css" href="/_content/Grand.Web.Admin/administration/build/css/custom-rtl.css" />
<link rel="stylesheet" type="text/css" href="@string.Format("/_content/Grand.Web.Admin/administration/kendo/styles/{0}/kendo.rtl.min.css", kendoVersion))" />
<link rel="stylesheet" type="text/css" href="@string.Format("/_content/Grand.Web.Admin/administration/kendo/styles/{0}/kendo.rtl.min.css", kendoVersion)" />
}
else
{
Expand Down
32 changes: 26 additions & 6 deletions src/Web/Grand.Web.Admin/wwwroot/administration/build/css/custom-rtl.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1224,10 +1224,16 @@ table.dataTable td.focus {
outline-offset: -1px;
}

.k-tabstrip-left > .k-tabstrip-items .k-state-active, .k-tabstrip-left > .k-tabstrip-items .k-tab-on-top {
.k-tabstrip-left > .k-tabstrip-items .k-state-active, .k-tabstrip-left > .k-tabstrip-items-wrapper .k-item.k-state-active, .k-tabstrip-left > .k-tabstrip-items .k-tab-on-top {
margin-right: -5px;
border-right-color: #1ABB9C;
border-right-width: 5px;
border-bottom: 0;
}

.k-tabstrip-items .k-item .k-link {
font-weight: 500;
white-space: nowrap;
}

table.display {
Expand Down Expand Up @@ -4654,7 +4660,21 @@ textarea:focus {
background-position: 0 -135px;
color: #00aeef;
}

.panel-default > .panel-heading {
font-weight: 500;
}
.k-button {
border-radius: 2px;
border-color: #f5f5f5;
color: #444;
background-color: #f5f5f5;
background-position: 50% 50%;
box-shadow: none;
font-weight: 500;
}
.k-tabstrip-top > .k-tabstrip-items-wrapper .k-item.k-state-active {
border-bottom-color: #1abb9c;
}
header {
width: 100%;
}
Expand Down Expand Up @@ -4968,7 +4988,7 @@ fieldset {
.k-window-title {
color: #000;
}
.modal-dialog.k-window-content.k-content {
.modal-dialog.k-window-content {
max-width: unset;
margin: 8px;
pointer-events: all;
Expand Down Expand Up @@ -5192,7 +5212,7 @@ fieldset {
.k-tabstrip-items .k-item .k-link {
color: #34495E;
}
.k-autocomplete, .k-draghandle, .k-dropdown-wrap, .k-header, .k-numeric-wrap, .k-panelbar .k-tabstrip-items .k-item, .k-picker-wrap, .k-progressbar, .k-state-highlight, .k-tabstrip-items .k-item, .k-textbox {
.k-tabstrip-items-wrapper, .k-autocomplete, .k-draghandle, .k-dropdown-wrap, .k-header, .k-window-titlebar, k-hstack, .k-numeric-wrap, .k-panelbar .k-tabstrip-items .k-item, .k-picker-wrap, .k-progressbar, .k-state-highlight, .k-tabstrip-items .k-item, .k-textbox {
background-color: #f5f5f5;
}
.k-panelbar .k-tabstrip-items .k-state-active, .k-tabstrip-items .k-state-active {
Expand Down Expand Up @@ -6655,7 +6675,7 @@ h2 {
overflow: scroll;
}
@media screen and (min-width: 768px) {
.modal-dialog.k-window-content.k-content {
.modal-dialog.k-window-content {
width: 600px;
margin: 30px auto;
}
Expand Down Expand Up @@ -6952,7 +6972,7 @@ h2 {
border: 1px solid #666;
border-top: 0;
}
[data-theme="dark"] .k-autocomplete, [data-theme="dark"] .x_title, [data-theme="dark"] .x_title .caption, [data-theme="dark"] .tableFixHead thead th, [data-theme="dark"] .k-draghandle, [data-theme="dark"] .k-dropdown-wrap, [data-theme="dark"] .k-header, [data-theme="dark"] .k-grid-header .k-header, [data-theme="dark"] .k-numeric-wrap, [data-theme="dark"] .k-panelbar .k-tabstrip-items .k-item, [data-theme="dark"] .k-picker-wrap, .k-progressbar, [data-theme="dark"] .k-state-highlight, [data-theme="dark"] .k-tabstrip-items .k-item, [data-theme="dark"] .k-textbox {
[data-theme="dark"] .k-hstack, [data-theme="dark"] .k-tabstrip-items-wrapper, [data-theme="dark"] .k-autocomplete, [data-theme="dark"] .x_title, [data-theme="dark"] .x_title .caption, [data-theme="dark"] .tableFixHead thead th, [data-theme="dark"] .k-draghandle, [data-theme="dark"] .k-dropdown-wrap, [data-theme="dark"] .k-header, [data-theme="dark"] .k-grid-header .k-header, [data-theme="dark"] .k-numeric-wrap, [data-theme="dark"] .k-panelbar .k-tabstrip-items .k-item, [data-theme="dark"] .k-picker-wrap, .k-progressbar, [data-theme="dark"] .k-state-highlight, [data-theme="dark"] .k-tabstrip-items .k-item, [data-theme="dark"] .k-textbox {
background-color: #616F7D;
}
[data-theme="dark"] .k-tabstrip-items .k-item .k-link {
Expand Down
42 changes: 27 additions & 15 deletions src/Web/Grand.Web.Admin/wwwroot/administration/build/css/custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ body {
color: #333;
background-color: #f5f5f5;
border-color: #ddd;
font-weight: 500;
}
.panel-body {
padding: 15px;
Expand Down Expand Up @@ -762,8 +763,15 @@ body {
padding: 0;
text-align: center;
}


.k-button {
border-radius: 2px;
border-color: #f5f5f5;
color: #444;
background-color: #f5f5f5;
background-position: 50% 50%;
box-shadow: none;
font-weight: 500;
}
.main_container .top_nav {
display: block;
margin-left: 230px;
Expand Down Expand Up @@ -1263,10 +1271,14 @@ body.nav-md .nav.side-menu > li.current-page, body.nav-md .nav.side-menu > li.ac
position: relative;
}

.k-tabstrip-left > .k-tabstrip-items > .k-item {
.k-tabstrip-left > .k-tabstrip-items > .k-item, .k-tabstrip-left > .k-tabstrip-items-wrapper > .k-tabstrip-items > .k-item {
border-right-width: 5px;
border-bottom: 0;
}
.k-tabstrip-left > .k-tabstrip-items-wrapper > .k-tabstrip-items > .k-item {
white-space: nowrap;
}
.k-tabstrip-left > .k-tabstrip-items .k-state-active, .k-tabstrip-left > .k-tabstrip-items .k-tab-on-top {
.k-tabstrip-left > .k-tabstrip-items .k-state-active, .k-tabstrip-left > .k-tabstrip-items .k-tab-on-top, .k-tabstrip-left > .k-tabstrip-items-wrapper > .k-tabstrip-items > .k-state-active.k-item {
margin-right: -5px;
border-right-color: #1ABB9C;
}
Expand Down Expand Up @@ -2243,12 +2255,12 @@ ul.msg_list li a .message {
top: 8px
}

.modal-dialog.k-window-content.k-content {
.modal-dialog.k-window-content {
max-width: unset;
margin: 8px;
pointer-events: all;
}
.modal-dialog.k-window-content.k-content input[type=file] {
.modal-dialog.k-window-content input[type=file] {
font: 400 13.3333px Arial;
}

Expand Down Expand Up @@ -3354,7 +3366,7 @@ textarea:focus {
}

@media (min-width: 768px) {
.modal-dialog.k-window-content.k-content {
.modal-dialog.k-window-content {
width: 600px;
margin: 30px auto;
}
Expand Down Expand Up @@ -6722,16 +6734,16 @@ form>h4 {
margin-top: 5px;
}

.k-panelbar .k-tabstrip-items .k-state-active, .k-tabstrip-items .k-state-active {
.k-panelbar .k-tabstrip-items .k-state-active, .k-tabstrip-items .k-state-active, .k-tabstrip-top > .k-tabstrip-items-wrapper .k-item.k-state-active {
background-color: #e6e6e6 !important;
border-bottom: 2px solid #1ABB9C;
}
.k-autocomplete, .k-draghandle, .k-dropdown-wrap, .k-header, .k-numeric-wrap, .k-panelbar .k-tabstrip-items .k-item, .k-picker-wrap, .k-progressbar, .k-state-highlight, .k-tabstrip-items .k-item, .k-textbox {
.k-tabstrip-items-wrapper, .k-autocomplete, .k-tabstrip-items-wrapper, .k-hstack, .k-draghandle, .k-dropdown-wrap, .k-hstack, .k-header, .k-numeric-wrap, .k-panelbar .k-tabstrip-items .k-item, .k-picker-wrap, .k-progressbar, .k-state-highlight, .k-tabstrip-items .k-item, .k-textbox {
background-color: #f5f5f5;
}
.k-tabstrip-items .k-item .k-link
{
color: #34495E
.k-tabstrip-items .k-item .k-link {
color: #34495E;
font-weight: 500;
}

.k-link, .k-nav-current.k-state-hover {
Expand Down Expand Up @@ -6786,7 +6798,7 @@ a.k-link.orderstatuslist:hover {
}

.k-widget.k-tabstrip {
border-style: solid;
border: 1px solid #e6e6e6;
}
.k-pager-wrap {
justify-content: flex-end;
Expand Down Expand Up @@ -7054,13 +7066,13 @@ table.tableFixHead {
border: 1px solid #666;
border-top: 0;
}
[data-theme="dark"] .k-autocomplete, [data-theme="dark"] .tableFixHead thead th, [data-theme="dark"] .k-draghandle, [data-theme="dark"] .k-dropdown-wrap, [data-theme="dark"] .k-header, [data-theme="dark"] .k-grid-header .k-header, [data-theme="dark"] .k-numeric-wrap, [data-theme="dark"] .k-panelbar .k-tabstrip-items .k-item, [data-theme="dark"] .k-picker-wrap, .k-progressbar, [data-theme="dark"] .k-state-highlight, [data-theme="dark"] .k-tabstrip-items .k-item, [data-theme="dark"] .k-textbox {
[data-theme="dark"] .k-autocomplete, [data-theme="dark"] .k-tabstrip-items-wrapper, [data-theme="dark"] .k-hstack , [data-theme="dark"] .tableFixHead thead th, [data-theme="dark"] .k-draghandle, [data-theme="dark"] .k-dropdown-wrap, [data-theme="dark"] .k-header, [data-theme="dark"] .k-grid-header .k-header, [data-theme="dark"] .k-numeric-wrap, [data-theme="dark"] .k-panelbar .k-tabstrip-items .k-item, [data-theme="dark"] .k-picker-wrap, .k-progressbar, [data-theme="dark"] .k-state-highlight, [data-theme="dark"] .k-tabstrip-items .k-item, [data-theme="dark"] .k-textbox {
background-color: #616F7D;
}
[data-theme="dark"] .k-tabstrip-items .k-item .k-link {
color: #f9f9f9;
}
[data-theme="dark"] .k-panelbar .k-tabstrip-items .k-state-active, [data-theme="dark"] .k-tabstrip-items .k-state-active {
[data-theme="dark"] .k-panelbar .k-tabstrip-items .k-state-active, [data-theme="dark"] .k-tabstrip-items .k-state-active, [data-theme="dark"] .k-tabstrip-items .k-state-active, [data-theme="dark"] .k-tabstrip-top > .k-tabstrip-items-wrapper .k-item.k-state-active {
background-color: #1D2E40 !important;
}
[data-theme="dark"] .k-tabstrip-items .k-item.k-state-hover {
Expand Down
17 changes: 17 additions & 0 deletions ...Admin/wwwroot/administration/kendo/scripts/2021.3.914/cultures/kendo.culture.en-US.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ...n/wwwroot/administration/kendo/scripts/2021.3.914/cultures/kendo.culture.en-US.min.js.map
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6666a13

Please sign in to comment.