Skip to content

Commit f47cfae

Browse files
bclozelbclozel
committed
Merge branch 'gh-pages' of https://github.com/spring-projects/gh-pages into gh-pages
2 parents b5d5490 + b2be58e commit f47cfae

File tree

5 files changed

+54
-60
lines changed

5 files changed

+54
-60
lines changed

‎Gemfile.lock

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
RedCloth (4.2.9)
54
activesupport (4.2.6)
65
i18n (~> 0.7)
76
json (~> 1.7, >= 1.7.7)
@@ -14,48 +13,44 @@ GEM
1413
execjs
1514
coffee-script-source (1.10.0)
1615
colorator (0.1)
17-
ethon (0.8.1)
16+
ethon (0.9.0)
1817
ffi (>= 1.3.0)
19-
execjs (2.6.0)
18+
execjs (2.7.0)
2019
faraday (0.9.2)
2120
multipart-post (>= 1.2, < 3)
22-
ffi (1.9.10)
21+
ffi (1.9.13)
2322
gemoji (2.1.0)
24-
github-pages (75)
25-
RedCloth (= 4.2.9)
23+
github-pages (86)
2624
github-pages-health-check (= 1.1.0)
27-
jekyll (= 3.0.4)
25+
jekyll (= 3.1.6)
2826
jekyll-coffeescript (= 1.0.1)
2927
jekyll-feed (= 0.5.1)
3028
jekyll-gist (= 1.4.0)
31-
jekyll-github-metadata (= 1.11.1)
32-
jekyll-mentions (= 1.1.2)
29+
jekyll-github-metadata (= 2.0.2)
30+
jekyll-mentions (= 1.1.3)
3331
jekyll-paginate (= 1.1.0)
3432
jekyll-redirect-from (= 0.10.0)
3533
jekyll-sass-converter (= 1.3.0)
36-
jekyll-seo-tag (= 1.3.3)
34+
jekyll-seo-tag (= 2.0.0)
3735
jekyll-sitemap (= 0.10.0)
38-
jekyll-textile-converter (= 0.1.0)
3936
jemoji (= 0.6.2)
40-
kramdown (= 1.10.0)
37+
kramdown (= 1.11.1)
4138
liquid (= 3.0.6)
4239
listen (= 3.0.6)
4340
mercenary (~> 0.3)
44-
rdiscount (= 2.1.8)
45-
redcarpet (= 3.3.3)
46-
rouge (= 1.10.1)
41+
rouge (= 1.11.1)
4742
terminal-table (~> 1.4)
4843
github-pages-health-check (1.1.0)
4944
addressable (~> 2.3)
5045
net-dns (~> 0.8)
5146
octokit (~> 4.0)
5247
public_suffix (~> 1.4)
5348
typhoeus (~> 0.7)
54-
html-pipeline (2.4.0)
49+
html-pipeline (2.4.1)
5550
activesupport (>= 2, < 5)
5651
nokogiri (>= 1.4)
5752
i18n (0.7.0)
58-
jekyll (3.0.4)
53+
jekyll (3.1.6)
5954
colorator (~> 0.1)
6055
jekyll-sass-converter (~> 1.0)
6156
jekyll-watch (~> 1.1)
@@ -69,55 +64,54 @@ GEM
6964
jekyll-feed (0.5.1)
7065
jekyll-gist (1.4.0)
7166
octokit (~> 4.2)
72-
jekyll-github-metadata (1.11.1)
67+
jekyll-github-metadata (2.0.2)
68+
jekyll (~> 3.1)
7369
octokit (~> 4.0)
74-
jekyll-mentions (1.1.2)
70+
jekyll-mentions (1.1.3)
7571
html-pipeline (~> 2.3)
7672
jekyll (~> 3.0)
7773
jekyll-paginate (1.1.0)
7874
jekyll-redirect-from (0.10.0)
7975
jekyll (>= 2.0)
8076
jekyll-sass-converter (1.3.0)
8177
sass (~> 3.2)
82-
jekyll-seo-tag (1.3.3)
83-
jekyll (~> 3.0)
78+
jekyll-seo-tag (2.0.0)
79+
jekyll (~> 3.1)
8480
jekyll-sitemap (0.10.0)
85-
jekyll-textile-converter (0.1.0)
86-
RedCloth (~> 4.0)
87-
jekyll-watch (1.3.1)
88-
listen (~> 3.0)
81+
jekyll-watch (1.4.0)
82+
listen (~> 3.0, < 3.1)
8983
jemoji (0.6.2)
9084
gemoji (~> 2.0)
9185
html-pipeline (~> 2.2)
9286
jekyll (>= 3.0)
9387
json (1.8.3)
94-
kramdown (1.10.0)
88+
kramdown (1.11.1)
9589
liquid (3.0.6)
9690
listen (3.0.6)
9791
rb-fsevent (>= 0.9.3)
9892
rb-inotify (>= 0.9.7)
9993
mercenary (0.3.6)
100-
mini_portile2 (2.0.0)
101-
minitest (5.8.4)
94+
mini_portile2 (2.1.0)
95+
minitest (5.9.0)
10296
multipart-post (2.0.0)
10397
net-dns (0.8.0)
104-
nokogiri (1.6.7.2)
105-
mini_portile2 (~> 2.0.0.rc2)
98+
nokogiri (1.6.8)
99+
mini_portile2 (~> 2.1.0)
100+
pkg-config (~> 1.1.7)
106101
octokit (4.3.0)
107102
sawyer (~> 0.7.0, >= 0.5.3)
103+
pkg-config (1.1.7)
108104
public_suffix (1.5.3)
109105
rb-fsevent (0.9.7)
110106
rb-inotify (0.9.7)
111107
ffi (>= 0.5.0)
112-
rdiscount (2.1.8)
113-
redcarpet (3.3.3)
114-
rouge (1.10.1)
108+
rouge (1.11.1)
115109
safe_yaml (1.0.4)
116110
sass (3.4.22)
117111
sawyer (0.7.0)
118112
addressable (>= 2.3.5, < 2.5)
119113
faraday (~> 0.8, < 0.10)
120-
terminal-table (1.5.2)
114+
terminal-table (1.6.0)
121115
thread_safe (0.3.5)
122116
typhoeus (0.8.0)
123117
ethon (>= 0.8.0)
@@ -132,4 +126,4 @@ DEPENDENCIES
132126
rouge
133127

134128
BUNDLED WITH
135-
1.11.2
129+
1.12.5

‎README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Assuming you're already within your project's clone directory, and you've alread
107107

108108
Use the `--watch` flag to pick up changes to files as you make them, allowing you a nice edit-and-refresh workflow.
109109

110-
jekyll serve --watch
110+
bundle exec jekyll serve --watch
111111

112112
> **Important:** Because the `baseurl` is set explicitly within your project's `_config.yml` file, you'll need to fully-qualify the URL to view your project. For example, if your project is named "spring-xyz", your URL when running Jekyll locally will be <http://localhost:4000/spring-xyz/>. Don't forget the trailing slash! You'll get a 404 without it.
113113

‎_includes/badges.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{% if page.badges.twitter %}
22
<div class="project-sub-link">
33
<a href="https://twitter.com/{{ page.badges.twitter }}">
4-
<div class="spring-icon project-badges twitter" alt="Twitter" title="Twitter">
4+
<div class="spring-icon project-badges twitter" title="Twitter">
55
</div>
66
</a>
77
</div>
88
{% endif %}
99
{% for badge in page.badges.custom %}
1010
<div class="project-sub-link">
1111
<a href="{{ badge.url }}">
12-
<div class="spring-icon project-badges {{ badge.icon }}" alt="{{ badge.name }}" title="{{ badge.name }}">
12+
<div class="spring-icon project-badges {{ badge.icon }}" title="{{ badge.name }}">
1313
</div>
1414
</a>
1515
</div>

‎_includes/page.html

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<head>
22
<title>{{ site.name }}</title>
33

4-
<link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png"/>
4+
<link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png" />
55

66
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap.min.css" />
7-
<link href='//fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700' rel='stylesheet' type='text/css'>
7+
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700" />
88
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/font-awesome/css/font-awesome.min.css" />
99
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap-select.css" />
1010

@@ -18,21 +18,21 @@
1818

1919
{{ head_links }}
2020

21-
<script type="text/javascript" src="{{site.baseurl}}/js/jquery.js"></script>
22-
<script type="text/javascript" src="{{site.baseurl}}/bootstrap/js/bootstrap.min.js"></script>
23-
<script type="text/javascript" src="{{site.baseurl}}/bootstrap/js/bootstrap-select.js"></script>
21+
<script src="{{site.baseurl}}/js/jquery.js"></script>
22+
<script src="{{site.baseurl}}/bootstrap/js/bootstrap.min.js"></script>
23+
<script src="{{site.baseurl}}/bootstrap/js/bootstrap-select.js"></script>
2424

25-
<script type="text/javascript" src="{{site.baseurl}}/js/underscore.js"></script>
26-
<script type="text/javascript" src="{{site.baseurl}}/js/backbone.js"></script>
27-
<script type="text/javascript" src="{{site.baseurl}}/js/projectDocumentationWidget.js"></script>
28-
<script type="text/javascript" src="{{site.baseurl}}/js/application.js"></script>
29-
<script type="text/javascript" src="{{site.baseurl}}/js/clipboard.min.js"></script>
30-
<script type="text/javascript">
31-
var apiBaseUrl = "{{ site.main_site_url }}";
32-
var projectId = "{{ site.project }}";
33-
var siteBaseUrl = "{{ site.baseurl }}";
25+
<script src="{{site.baseurl}}/js/underscore.js"></script>
26+
<script src="{{site.baseurl}}/js/backbone.js"></script>
27+
<script src="{{site.baseurl}}/js/projectDocumentationWidget.js"></script>
28+
<script src="{{site.baseurl}}/js/application.js"></script>
29+
<script src="{{site.baseurl}}/js/clipboard.min.js"></script>
30+
<script>
31+
var apiBaseUrl = "{{ site.main_site_url }}",
32+
projectId = "{{ site.project }}",
33+
siteBaseUrl = "{{ site.baseurl }}";
3434
</script>
35-
<script type="text/javascript" src="{{site.baseurl}}/js/copySnippets.js"></script>
35+
<script src="{{site.baseurl}}/js/copySnippets.js"></script>
3636
<meta name="google-site-verification" content="7qGntFPD9lWAVCtUu5U77v4l68PsTHf6xpzgjQv2j2M" />
3737
<script>
3838
var _gaq = _gaq || [];
@@ -84,12 +84,12 @@
8484
<div class="container-fluid">
8585
<div class="search-form--container">
8686
<form class="form-inline form-search"
87-
action="{{site.main_site_url}}/search" method="get">
88-
<input type="text"
87+
action="{{site.main_site_url}}/search">
88+
<input type="search"
8989
class="search-query search-form--form js-search-input"
9090
placeholder="Search for documention, guides, and posts..."
9191
name="q" />
92-
<button type="submit" class="search-form--submit">
92+
<button class="search-form--submit">
9393
<i class="icon-search"></i>
9494
</button>
9595
</form>
@@ -113,10 +113,10 @@
113113
</ul>
114114
</div>
115115
</div>
116-
&copy; <script type="text/javascript"> var d = new Date();
116+
&copy; <script> var d = new Date();
117117
document.write(d.getFullYear());</script> <a href="https://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
118-
<a href="https://www.pivotal.io/terms-of-use">Terms of Use</a> and
119-
<a href="https://www.pivotal.io/privacy-policy">Privacy</a>
118+
<a href="https://pivotal.io/terms-of-use">Terms of Use</a> and
119+
<a href="https://pivotal.io/privacy-policy">Privacy</a>
120120
</div>
121121
</div>
122122
</div>

‎js/projectDocumentationWidget.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Spring.SnippetView = Backbone.View.extend({
9595
this.combinedTemplate = _.template(
9696
"<div class=\"highlight\"><pre><code>" +
9797
downloadTemplate.find("code:first").html() +
98-
"{@ if (repository) { @}" +
98+
"{@ if (typeof(repository) != \"undefined\") { @}" +
9999
repositoryTemplate.find("code:first").html() +
100100
"{@ } @}" +
101101
"</code></pre></div>"

0 commit comments

Comments
 (0)