Skip to content

Commit 0500990

Browse files
author
Kendo Bot
committed
Sync with Kendo UI Professional
1 parent 3819d8b commit 0500990

File tree

7 files changed

+33
-33
lines changed

7 files changed

+33
-33
lines changed

docs-aspnet-core/_config.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@ navigation:
2828
"vs-integration":
2929
title: "Visual Studio Integration"
3030
position: 5
31-
"migration":
32-
title: "Migration"
33-
position: 6
34-
"tutorials":
35-
title: "Tutorials"
31+
"backwards-compatibility":
32+
title: "Breaking Changes"
3633
position: 7
37-
"troubleshoot":
38-
title: "Troubleshooting"
39-
position: 8
4034

4135

4236

docs-aspnet-core/backwards-compatibility/2018-backwards-compatibility.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ position: 1
99

1010
# 2018 Releases
1111

12+
## Kendo UI R2 2018
13+
14+
### Changes from 2018 R1 SP1
15+
16+
As of the Kendo UI R2 2018 release, the sample application, which represents an offline version of the [Telerik UI for ASP.NET Core Demos](http://demos.telerik.com/aspnet-core), is only available for Visual Studio 2017. The Visual Studio 2015 version which contains the deprecated `project.json` base version is no longer distributed.
17+
1218
## Kendo UI R1 2018 SP1
1319

1420
### Changes from 2018 R1
1521

16-
To enable more complex widget configuration scenarios and ensure the tag-naming consistency across the Telerik UI for ASP.NET Core suite, the Kendo UI R1 2018 release introduces changes in the tags of the following wrappers:
22+
To enable more complex scenarios for widget configuration and ensure the tag-naming consistency across the Telerik UI for ASP.NET Core suite, the Kendo UI R1 2018 release introduces changes in the tags of the following wrappers:
1723

1824
* Dialog&mdash;Previously, it was possible to nest content directly in the `<kendo-dialog>` tag. Now the content must be nested within a `<content>` tag.
1925
* Window&mdash;Previously, it was possible to nest content directly in the `<kendo-window>` tag. Now the content must be nested within a `<content>` tag.

docs-aspnet-core/getting-started/getting-started-linux.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Below are listed the steps for you to follow when creating an ASP.NET Core web s
5656

5757
Restore complete, 10070ms elapsed
5858

59-
kendo@kendo-docker:~/Projects/WebApplicationBasic$
59+
kendo@kendo-docker:~/Projects$
6060

6161
8. Start the application by running [`dotnet run`](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-run). The following example demonstrates the response you are expected to receive.
6262

@@ -74,16 +74,7 @@ Below are listed the steps for you to follow when creating an ASP.NET Core web s
7474

7575
### Add the Telerik.UI.for.AspNet.Core NuGet Package
7676

77-
1. Open the `project.json` file by using a text editor, add the `Telerik.UI.for.AspNet.Core` dependency, and replace `productVersion` with an actual **Telerik UI for ASP.NET Core** version&mdash;for example, `{{site.cdnVersion}}`.
78-
79-
###### Example
80-
81-
"dependencies": {
82-
...
83-
"Telerik.UI.for.AspNet.Core": "{{site.cdnVersion}}"
84-
}
85-
86-
2. Add the private Telerik NuGet feed. You could either:
77+
1. Add the private Telerik NuGet feed. You could either:
8778

8879
* Create the following two configuration files containing your `telerik.com` credentials on your machine: `~/.config/NuGet/NuGet.Config` and `~/.nuget/NuGet/NuGet.Config`; or
8980
* Create a `NuGet.Config` file in the project folder.
@@ -108,6 +99,12 @@ Below are listed the steps for you to follow when creating an ASP.NET Core web s
10899
</configuration>
109100
```
110101

102+
2. Install the `Telerik.UI.for.AspNet.Core` dependency:
103+
104+
###### Example
105+
106+
dotnet add package Telerik.UI.for.AspNet.Core
107+
111108
3. Open `Startup.cs` by using a text editor (IDE) and update it in the way demonstrated in the following examples.
112109

113110
* Locate the `ConfigureServices` method and add a call to `services.AddKendo` at the end.
@@ -146,7 +143,7 @@ Below are listed the steps for you to follow when creating an ASP.NET Core web s
146143

147144
5. Copy the Kendo UI client-side resources.
148145

149-
* Manual installation&mdash;To manually install the resources, copy the `js` and `styles` folders from the `telerik.ui.for.aspnetmvc` archive to `wwwroot\lib\kendo-ui`.
146+
* Manual installation&mdash;To manually install the resources, copy the `js` and `styles` folders from the `telerik.ui.for.aspnet.core` archive to `wwwroot\lib\kendo-ui`.
150147

151148
**Figure 2. Kendo UI resources**
152149

docs-aspnet-core/introduction.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,19 @@ Telerik UI for ASP.NET Core contains the following directories:
7575
* `vsdoc`&mdash;The intellisense definitions for the Kendo combined scripts (as the above).
7676
* `VSExtensions`&mdash;The extensions for Visual Studio 2015 and 2017.
7777
* `wrappers\aspnetcore\Binaries\AspNet.Core`&mdash;Containing the .nupkg NuGet package file.
78-
* `wrappers\aspnetcore\Examples\AspNet.Core\VS2015`&mdash;The ASP.NET Core sample application built with Visual Studio 2015.
7978
* `wrappers\aspnetcore\Examples\AspNet.Core\VS2017`&mdash;The ASP.NET Core sample application built with Visual Studio 2017.
8079
* `wrappers\aspnetcore\EditorTemplates\razor`&mdash;The ready-to-use editor templates based on the Kendo UI widgets.
8180

8281
## Sample Application
8382

8483
Telerik UI for ASP.NET Core comes with a sample .NET Core application which is an offline version of the [Telerik UI for ASP.NET Core Demos](http://demos.telerik.com/aspnet-core). The sample application is available in the following versions:
8584

86-
* The .NET Core application built with Visual Studio 2015
8785
* The .NET Core application built with Visual Studio 2017
8886

87+
> **Important**
88+
>
89+
> As of the Kendo UI R2 2018 release, the Visual Studio 2015 version of the sample application is no longer distributed because of its deprecated format and limited tooling support.
90+
8991
### Running the Sample Application
9092

9193
To run the sample application:
@@ -94,7 +96,6 @@ To run the sample application:
9496

9597
1. Open the sample Visual Studio Project:
9698

97-
* (For Visual Studio 2015) Open `wrappers\aspnetcore\Examples\AspNet.Core\VS2015\Kendo.Mvc.Examples\Kendo.Mvc.Examples.xproj`.
9899
* (For Visual Studio 2017) Open `wrappers\aspnetcore\Examples\AspNet.Core\VS2017\Kendo.Mvc.Examples\Kendo.Mvc.Examples.xproj`.
99100

100101
1. Press `CTRL+F5` to build and run the application.

styles/web/Default/card/layout.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
@card-actions-padding-x: 8px;
1313
@card-actions-padding-y: 8px;
1414
@card-actions-border-width: 1px;
15-
@button-padding-x: 8px;
16-
@button-padding-y: 4px;
15+
@card-button-padding-x: 8px;
16+
@card-button-padding-y: 4px;
1717
@card-deck-gap: 16px;
1818

1919
// Card
@@ -168,7 +168,7 @@
168168
}
169169

170170
> .k-button.k-flat:first-child {
171-
margin-left: (-@button-padding-x);
171+
margin-left: (-@card-button-padding-x);
172172
}
173173
}
174174
.k-card-action {
@@ -180,7 +180,7 @@
180180

181181
> .k-button {
182182
.border-radius( 0 );
183-
padding: (@card-actions-padding-y + @button-padding-y) @card-actions-padding-x;
183+
padding: (@card-actions-padding-y + @card-button-padding-y) @card-actions-padding-x;
184184
flex: 1 1 auto;
185185
}
186186
}

styles/web/common/menu.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ ul.k-menu-vertical > .k-item
159159

160160
.k-menu-scroll-wrapper .k-item > .k-link > .k-i-arrow-60-right,
161161
.k-popups-wrapper .k-item > .k-link > .k-i-arrow-60-right,
162-
.k-menu-group .k-link > .k-menu-expand-arrow
162+
.k-menu-group .k-link > .k-menu-expand-arrow,
163+
.k-menu-vertical .k-link > .k-menu-expand-arrow,
163164
{
164165
position: absolute;
165166
top: 50%;

styles/web/kendo.rtl.less

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,16 +513,17 @@
513513
margin-left: -8px;
514514
}
515515

516-
.k-rtl .k-menu-group .k-menu-expand-arrow
516+
.k-rtl .k-menu-group .k-menu-expand-arrow,
517+
.k-rtl .k-menu-vertical .k-link > .k-menu-expand-arrow,
517518
{
518519
right: auto;
519520
left: .2rem;
520521
}
521522

522-
.k-rtl .k-menu .k-group .k-item > .k-link
523+
.k-rtl .k-menu .k-menu-group .k-item > .k-link
523524
{
524-
padding-left: 1.8em;
525-
padding-right: .9em;
525+
padding-left: 4.929em;
526+
padding-right: 1.714em;
526527
}
527528

528529
.k-rtl .k-menu .k-image,

0 commit comments

Comments
 (0)