Skip to content

Commit 2f976a0

Browse files
authored
Merge branch 'master' into update-response-headers
2 parents 29e572c + 3da5f1c commit 2f976a0

File tree

924 files changed

+18140
-6691
lines changed

Some content is hidden

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

924 files changed

+18140
-6691
lines changed

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@
1919
/favicon.ico
2020
/fonts/
2121
/styles/
22+
_excludefile.yml
2223
_site
2324
_tempconfig.yml
2425
bs-config.js
2526
build-docs.sh
27+
CODEOWNERS
2628
copy_content.sh
2729
copy_local.sh
2830
Dockerfile
31+
exclude.txt
2932
Gemfile
3033
Gemfile.lock
3134
install-npm.sh
@@ -36,4 +39,5 @@ search.html
3639
SlugLog.log
3740
start-docs.sh
3841
temp_exclude_result.tmp
42+
to_delete.md
3943
watch.sh

40x.html

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
---
2+
title: Error 404
3+
position: 1
4+
heading: Page Not Found
5+
include_in_navigation: false
6+
is_search_page: true
7+
sitemap: false
8+
---
9+
10+
<div class="container-fluid mt-30 mb-80">
11+
<div class="content">
12+
<img class="ninja" src="/devtools/aspnet-ajax/images/ninja-icon.png" />
13+
<h1>
14+
Oh, no! <br />
15+
It seems we've lost this page
16+
</h1>
17+
<h2>
18+
Things you can try:
19+
</h2>
20+
<ul>
21+
<li>
22+
<p>Use our Google-powered search bar below to search in our documentation
23+
</p>
24+
<div class="local-search mt-20">
25+
{% include search.html %}
26+
</div>
27+
</li>
28+
<li><a href="#" onclick="history.go(-1); return false;">Go back</a> and try another way</li>
29+
<li>Head to the <a href="/aspnet-ajax">Documentation Homepage</a></li>
30+
<li>Cheer up and <a href="https://www.telerik.com/download">try our products</a>. Some of them are free!</li>
31+
</ul>
32+
</div>
33+
</div>
34+
</div>
35+
36+
</div>
37+
<script>showSearchPopup = false;</script>
38+
<script src="{{site.baseurl}}/assets/jquery.js?{{randomNumber}}" defer></script>
39+
<script src="{{site.baseurl}}/assets/bootstrap.min.js?{{randomNumber}}" defer></script>
40+
<script src="{{site.baseurl}}/assets/main.js?{{randomNumber}}" defer></script>
41+
<script src="{{site.baseurl}}/assets/search-results.js?{{randomNumber}}" defer></script>
42+
43+
44+
45+
<style>
46+
html {
47+
font-family: Roboto, Helvetica, Arial, sans-serif;
48+
line-height: 1.5em;
49+
}
50+
51+
.content {
52+
max-width: 768px;
53+
margin: 0 auto;
54+
position: relative;
55+
56+
}
57+
.content > h1{
58+
padding-left: 200px;
59+
margin: 20px auto;
60+
}
61+
.content > .ninja{
62+
margin: 20px;
63+
}
64+
65+
.content > h2{
66+
margin-top: 80px
67+
}
68+
69+
.ninja {
70+
position: absolute;
71+
left: 0;
72+
top: 0;
73+
}
74+
75+
h1 {
76+
margin: 0 0 40px;
77+
font: 600 60px/.9 Roboto, Helvetica, Arial, sans-serif;
78+
letter-spacing: -.03em;
79+
}
80+
81+
h2 {
82+
margin: 0 0 20px;
83+
font: 400 28px/1 Roboto, Helvetica, Arial, sans-serif;
84+
letter-spacing: -.035em;
85+
}
86+
87+
ul {
88+
padding: 0 0 0 1.3em;
89+
margin: 0;
90+
}
91+
92+
a,
93+
a:visited {
94+
color: #0487c4;
95+
text-decoration: none;
96+
transition: color .2s ease, opacity .2s ease;
97+
}
98+
99+
a:hover,
100+
a:focus {
101+
color: #036c9c;
102+
text-decoration: underline;
103+
}
104+
</style>

LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Apache License
22
Version 2.0, January 2004
3-
https://www.apache.org/licenses/
3+
http://www.apache.org/licenses/
44

55
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
66

@@ -192,7 +192,7 @@
192192
you may not use this file except in compliance with the License.
193193
You may obtain a copy of the License at
194194

195-
https://www.apache.org/licenses/LICENSE-2.0
195+
http://www.apache.org/licenses/LICENSE-2.0
196196

197197
Unless required by applicable law or agreed to in writing, software
198198
distributed under the License is distributed on an "AS IS" BASIS,

0 commit comments

Comments
 (0)