Skip to content

Commit e0bdbf2

Browse files
authored
Merge pull request #3 from telerik/master
Sync
2 parents bee95dd + 0b1fc16 commit e0bdbf2

File tree

964 files changed

+37635
-5083
lines changed

Some content is hidden

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

964 files changed

+37635
-5083
lines changed

docs-aspnet-core/_assets/stylesheets/icon-font.css

Lines changed: 174 additions & 174 deletions
Large diffs are not rendered by default.

docs-aspnet-core/_assets/stylesheets/styles.css

Lines changed: 358 additions & 44 deletions
Large diffs are not rendered by default.

docs-aspnet-core/_assets/stylesheets/theme.css

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -22,30 +22,6 @@
2222
height: 47px;
2323
}
2424

25-
#page-tabs {
26-
list-style: none;
27-
background-color: #f5f7f8;
28-
padding-left: 20px;
29-
}
30-
31-
#page-tabs li {
32-
display: inline-block;
33-
padding: 0 20px 3px;
34-
line-height: 58px;
35-
}
36-
37-
#page-tabs .active {
38-
padding-bottom: 0;
39-
border-bottom: 3px solid #00b312;
40-
}
41-
42-
#page-tabs a {
43-
display: inline-block;
44-
color: #2d3e50;
45-
text-decoration: none;
46-
font-size: 14px;
47-
}
48-
4925

5026
/* Main Naivation */
5127

@@ -94,18 +70,22 @@
9470
#page-nav .article {
9571
position: absolute;
9672
margin: 0;
97-
padding: 0;
73+
padding: 0;
9874
left: 20px;
9975
top: 5px;
10076
}
77+
#page-nav .k-icon:before {
78+
content: "";
79+
display: none;
80+
}
10181

102-
#page-nav .k-plus { background: url(../images/plus.png); }
103-
#page-nav .k-minus { background: url(../images/minus.png); }
82+
#page-nav .k-plus, #page-nav .k-i-expand { background: url(../images/plus.png); }
83+
#page-nav .k-minus, #page-nav .k-i-collapse { background: url(../images/minus.png); }
10484
#page-nav .article { top: 6px; background: url(../images/file.png); }
10585
#page-nav .k-state-selected .article { background: url(../images/file-white.png); }
10686

107-
#page-nav .k-group .k-group .k-plus { background: url(../images/folder-close.png); }
108-
#page-nav .k-group .k-group .k-minus { background: url(../images/folder-open.png); }
87+
#page-nav .k-group .k-group .k-plus, #page-nav .k-group .k-group .k-i-expand { background: url(../images/folder-close.png); }
88+
#page-nav .k-group .k-group .k-minus, #page-nav .k-group .k-group .k-i-collapse { background: url(../images/folder-open.png); }
10989

11090
/* Nav Level 1 */
11191

@@ -280,23 +260,23 @@
280260
#page-nav .k-group .k-group .k-group .k-group .k-group .current-topic .k-group .k-in a { padding-left: 92px; }
281261

282262
.btn {
263+
margin: 0 4px;
264+
padding: 5px 30px;
265+
border: 1px solid #505156;
283266
color: #fff;
284267
background-color: #2a2d33;
285-
border: 1px solid #505156;
286268
background-clip: padding-box;
269+
font-size: 15px;
270+
font-weight: bold;
271+
text-align: center;
272+
line-height: 1.33334;
287273
position: relative;
288274
display: inline-block;
289-
padding: 0.667em 2.000em;
290-
line-height: 0.933em;
291275
transition-property: background-color, color;
292276
transition-duration: 0.2s;
293277
transition-timing-function: ease;
294278
border-radius: 2px;
295279
-webkit-appearance: none;
296-
font-size: 15px;
297-
font-weight: bold;
298-
text-align: center;
299-
margin: 0.7em 0;
300280
cursor: pointer;
301281
}
302282

@@ -308,7 +288,6 @@
308288
.btn-primary {
309289
background-color: #ee5315;
310290
border-color: #ee5315;
311-
margin-right: 1.200em;
312291
}
313292

314293
.btn-primary:hover {
Lines changed: 32 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,35 @@
1-
<div id="logo-bar">
2-
<a href="{{site.baseurl}}/introduction">
3-
<img alt="ASP.NET Core logo" class="logo" src="{{site.baseurl}}/images/{{page.product}}.png">
4-
</a>
5-
</div>
1+
<aside class="TK-Hat">
2+
<figure class="TK-Hat-Brand">
3+
<a href="https://www.progress.com" class="TK-PRGS-Logo">
4+
<svg xmlns="http://www.w3.org/2000/svg" width="94" height="40" viewBox="0 0 512 120">
5+
<path fill="#5ce500" d="M95.52 29.33v51a3.93 3.93 0 0 1-1.78 3.08l-1.67 1-12.72 7.35-8.59 5-1.78 1V42.6L21.23 15 43.91 1.93 46 .74a3.94 3.94 0 0 1 3.56 0L81 18.9l14.51 8.38v2.05zM58.36 48.72l-9.79-5.66-22.91-13.23a4 4 0 0 0-3.56 0L1.77 41.57 0 42.6l34.49 19.91v39.83l20.3-11.73 1.79-1a3.94 3.94 0 0 0 1.78-3.08V48.72zM0 82.43l23.86 13.78V68.63z"></path>
6+
<path fill="#4b4e52" d="M148.09 27.28h-26v70.48h11.55V70.1h14.57c15.77 0 24.45-7.7 24.45-21.69 0-6.35-2.4-21.12-24.55-21.12m12.78 21.31c0 7.95-4.12 11.19-14.24 11.19h-13v-22.1h14.57c8.56 0 12.71 3.57 12.71 10.91M207 46.41l.87.42-2 10.42-1.35-.42a11.32 11.32 0 0 0-3.34-.51c-10.79 0-11.67 8.59-11.67 19v22.44h-10.64V46h10v6.24c2.73-4.2 6-6.37 10.37-6.9a14.55 14.55 0 0 1 7.76 1.07M233.29 45c-8.42 0-15.16 3.2-19.5 9.27-4.56 6.37-5.23 13.85-5.23 17.74 0 16.36 9.7 26.92 24.73 26.92 18.26 0 24.73-14.71 24.73-27.3 0-7.25-2.15-13.82-6-18.51-4.41-5.31-10.87-8.12-18.7-8.12m0 44.38c-8.37 0-13.57-6.66-13.57-17.37s5.2-17.55 13.57-17.55S247 61.23 247 71.78c0 10.83-5.24 17.56-13.66 17.56m114.55-42.93l.87.42-2 10.42-1.35-.42a11.26 11.26 0 0 0-3.33-.51c-10.78 0-11.66 8.59-11.66 19v22.44h-10.66V46h10v6.24c2.73-4.2 6-6.37 10.37-6.9a14.54 14.54 0 0 1 7.73 1.06m38.4 34.76l-.2.57c-2.23 6.36-7.57 7.7-11.65 7.7-8.09 0-13.3-5.37-13.81-14.09h36.59l.13-1a31.26 31.26 0 0 0 .12-4.12v-.93C396.93 54.78 387.48 45 374 45c-7.9 0-14.37 3.1-18.73 9a30.85 30.85 0 0 0-5.54 18c0 16 9.95 26.74 24.74 26.74 11.45 0 19.33-5.82 22.2-16.38l.33-1.2h-10.7zM361 66.05c.9-7.17 5.81-11.73 12.79-11.73 5.33 0 11.64 3.1 12.52 11.73H361zm-60.7-15.71c-3.45-3.58-8.06-5.39-13.76-5.39-15.69 0-22.83 13.81-22.83 26.63 0 13.16 7.06 26.44 22.83 26.44a18.33 18.33 0 0 0 13.35-5.42c0 2.28-.1 4.45-.16 5.38-.58 8.54-4.68 12.51-12.91 12.51-4.47 0-9.61-1.59-10.6-6l-.22-1h-10.54l.17 1.41c1.1 9.12 9.11 14.79 20.9 14.79 10.34 0 17.7-3.9 21.28-11.26 1.73-3.55 2.6-8.72 2.6-15.37V46h-10.13v4.34zm-13.11 38.15c-3.74 0-12.43-1.69-12.43-17.37 0-10.3 4.87-16.7 12.71-16.7 6.06 0 12.52 4.39 12.52 16.7 0 10.87-4.79 17.37-12.81 17.37m159.67-6.31c0 8.23-6.83 16.53-22.09 16.53-13.5 0-21.53-5.85-22.61-16.45l-.15-1.1h10.52l.21.84c1.29 6.38 7.37 7.72 12.24 7.72 5.34 0 11-1.72 11-6.54 0-2.44-1.59-4.18-4.73-5.16-1.86-.55-4.15-1.2-6.56-1.87-4.16-1.16-8.47-2.38-11.12-3.29-6.56-2.35-10.33-6.93-10.33-12.56 0-10.43 10.16-15.11 20.22-15.11 13.46 0 20.42 5.07 21.3 15.49l.09 1.07H434.5l-.14-.82c-1-6-7-6.9-10.48-6.9-3 0-10 .53-10 5.5 0 2.25 1.93 3.91 5.89 5.06 1.18.33 2.94.78 5 1.31 4.22 1.09 9.48 2.46 12.13 3.37 6.59 2.32 9.93 6.67 9.93 13m49.39 0c0 8.23-6.83 16.53-22.09 16.53-13.5 0-21.53-5.85-22.61-16.45l-.11-1.09H462l.12.74c1.29 6.38 7.37 7.72 12.24 7.72 5.34 0 11-1.72 11-6.54 0-2.44-1.59-4.18-4.72-5.16-1.86-.55-4.15-1.2-6.57-1.87-4.16-1.16-8.46-2.38-11.11-3.29-6.57-2.35-10.33-6.93-10.33-12.56 0-10.43 10.16-15.11 20.22-15.11 13.46 0 20.42 5.07 21.29 15.49l.09 1.07H483.9l-.14-.82c-1-6-7-6.9-10.48-6.9-3 0-9.95.53-9.95 5.5 0 2.25 1.93 3.91 5.89 5.06 1.18.33 2.94.78 5 1.31 4.22 1.09 9.48 2.46 12.13 3.37 6.58 2.32 9.93 6.67 9.93 13m8.43-30.78a7.37 7.37 0 1 1 7.29-7.37 7.23 7.23 0 0 1-7.29 7.37m0-13.49a6.12 6.12 0 1 0 6 6.12 5.91 5.91 0 0 0-6-6.12m-.85 7.49v2.46h-2.17v-7.74h3.62a2.58 2.58 0 0 1 2.86 2.7 2.26 2.26 0 0 1-1.49 2.34l1.77 2.7H506l-1.49-2.46h-.68zm1.21-3.49h-1.21v1.73h1.21a.86.86 0 0 0 1-.85.88.88 0 0 0-1-.89"></path>
7+
</svg>
8+
</a>
9+
</figure>
10+
</aside>
611

7-
<div id="page-search">
8-
{% include search.html %}
9-
</div>
12+
<header id="page-header">
13+
<span class="toggle-nav"><span></span></span>
1014

11-
<span class="show-search">
12-
<span class="k-icon k-i-search"></span>
13-
</span>
15+
<div id="logo-bar">
16+
<a href="{{site.baseurl}}/introduction">
17+
<img alt="ASP.NET Core logo" class="logo" src="{{site.baseurl}}/images/{{page.product}}.svg">
18+
</a>
19+
</div>
1420

15-
<div class="nav-buttons">
16-
<a href="http://demos.telerik.com/{{page.product}}/" class="btn demos-btn">Demos</a>
17-
<a href="http://www.telerik.com/aspnet-mvc/mvc6-features" class="btn about-btn">About</a>
18-
<a href="http://www.telerik.com/purchase/aspnet-core-ui" class="btn pricing-btn">Pricing</a>
19-
<a href="https://www.telerik.com/download-trial-file/v2/aspnet-core-ui" class="btn btn-primary">Try now</a>
20-
</div>
21+
<div id="page-search">
22+
{% include search.html %}
23+
</div>
24+
25+
<span class="show-search">
26+
<span class="k-icon k-i-search"></span>
27+
</span>
28+
29+
<div class="nav-buttons">
30+
<a href="http://demos.telerik.com/{{page.product}}/" class="btn demos-btn">Demos</a>
31+
<a href="http://www.telerik.com/aspnet-mvc/mvc6-features" class="btn about-btn">About</a>
32+
<a href="http://www.telerik.com/purchase/aspnet-core-ui" class="btn pricing-btn">Pricing</a>
33+
<a href="https://www.telerik.com/download-trial-file/v2/aspnet-core-ui" class="btn btn-primary">Try now</a>
34+
</div>
35+
</header>

docs-aspnet-core/_layouts/index.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@
4545
</noscript>
4646
<script>(function(w, d, s, l, i) { w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); })(window, document, 'script', 'dataLayer', '{{site.google_tag_manager}}');</script>
4747
<!-- End Google Tag Manager -->
48-
<header id="page-header">
49-
<span class="toggle-nav"><span></span></span>
50-
{% include header.html %}
51-
</header>
48+
{% include header.html %}
5249

5350
{{ content }}
5451
</body>

docs-aspnet-core/_layouts/page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
});
3131
</script>
3232
</div>
33-
34-
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs/{{ page.url | replace: '.html','' }}.md"><span class="k-font-icon k-i-pencil"></span> Edit this page</a>{% endif %}
33+
34+
{% if page.editable %}<a id="page-edit-link" href="https://github.com/telerik/kendo-ui-core/edit/master/docs/{{ page.url | replace: '.html','' }}.md"><span class="k-icon k-i-pencil"></span> Edit this page</a>{% endif %}
3535
{% if page.kind == "api" %}<div id="markdown-toc"></div>{% endif %}
3636

3737
<div id="page-article">

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ To add the NuGet packages:
8888
8989
4. Open `Startup.cs` by using a text editor (IDE) and update it in the way demonstrated in the following examples.
9090
91-
Locate the `ConfigureServices` method and add a call to `services.AddKendo` at the end.
91+
Locate the `ConfigureServices` method and add the calls shown in the code snippet below:
9292
9393
###### Example
9494
@@ -163,11 +163,6 @@ To add the NuGet packages:
163163
asp-fallback-test-class="k-theme-test-class"
164164
asp-fallback-test-property="opacity" asp-fallback-test-value="0" />
165165
</environment>
166-
</head>
167-
<body>
168-
169-
...
170-
171166
<environment names="Development">
172167
...
173168
@@ -190,7 +185,7 @@ To add the NuGet packages:
190185
</environment>
191186
192187
@RenderSection("scripts", required: false)
193-
</body>
188+
</head>
194189
195190
<!--*-->
196191
8. Use a Kendo UI widget by adding the snippet from the following example to `~/Views/Home/Index.cshtml`.
@@ -201,14 +196,8 @@ To add the NuGet packages:
201196
202197
@(Html.Kendo().DatePicker()
203198
.Name("datepicker")
204-
.Deferred()
205199
)
206200
207-
@* All initialization scripts are rendered to the bottom of the page, see _Layout.cshtml *@
208-
@section scripts {
209-
@Html.Kendo().DeferredScripts()
210-
}
211-
212201
<!--_-->
213202
Now that all is done, you can see the sample page.
214203

docs-aspnet-core/helpers/html-helpers/autocomplete.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ slug: htmlhelpers_autocomplete_aspnetcore
77

88
# AutoComplete HtmlHelper Overview
99

10-
The AutoComplete HtmlHelper extension is a server-side wrapper for the [Kendo UI AutoComplete](http://demos.telerik.com/kendo-ui/autocomplete/index).
10+
The AutoComplete HtmlHelper extension is a server-side wrapper for the [Kendo UI AutoComplete](http://demos.telerik.com/kendo-ui/autocomplete/index) widget.
1111

1212
It enables you to configure the Kendo UI AutoComplete widget from server-side code. The [AutoComplete](http://docs.telerik.com/kendo-ui/controls/editors/autocomplete/overview) provides suggestions depending on the typed text. It also allows multiple value entries. The suggestions shown by the widget come either from a local array or from a remote data service.
1313

@@ -82,7 +82,7 @@ The following example demonstrates how to define the AutoComplete by using the A
8282

8383
The following example demonstrates the basic configuration of the AutoComplete HtmlHelper and how to get the AutoComplete instance.
8484

85-
```tab-Razor
85+
```
8686
@(Html.Kendo().AutoComplete()
8787
.Name("autocomplete")
8888
.DataTextField("ProductName")

docs-aspnet-core/helpers/html-helpers/button.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ The following example demonstrates how to define the Button by using the Button
1919

2020
###### Example
2121

22-
```tab-Razor
22+
```
2323
@(Html.Kendo().Button()
2424
.Name("textButton")
2525
.HtmlAttributes( new {type = "button"} )
@@ -34,8 +34,7 @@ The following example demonstrates the basic configuration of the Button HtmlHel
3434

3535
###### Example
3636

37-
```tab-Razor
38-
37+
```
3938
@(Html.Kendo().Button()
4039
.Name("textButton")
4140
.Tag("span")

docs-aspnet-core/helpers/html-helpers/charts.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ slug: htmlhelpers_charts_aspnetcore
77

88
# Charts HtmlHelper Overview
99

10-
The Charts HtmlHelper extension is a server-side wrapper for the [Kendo UI Charts](http://docs.telerik.com/kendo-ui/controls/charts/overview).
10+
The Charts HtmlHelper extension is a server-side wrapper for the [Kendo UI Charts](http://demos.telerik.com/kendo-ui/area-charts/index) widget.
1111

1212
The [Kendo UI Charts](http://demos.telerik.com/aspnet-core/) use modern browser technologies to render high-quality data visualizations. All graphics are rendered on the client by using [Scalable Vector Graphics (SVG)](https://en.wikipedia.org/wiki/Scalable_Vector_Graphics) with a fallback to [Canvas](http://www.canvasgfx.com/).
1313

@@ -59,8 +59,7 @@ The following example demonstrates the basic configuration for the Line Chart Ht
5959

6060
###### Example
6161

62-
```tab-Razor
63-
62+
```
6463
@(Html.Kendo().Chart()
6564
.Name("chart")
6665
.Title("Gross domestic product growth \n /GDP annual %/")

0 commit comments

Comments
 (0)