提交 f47cfae8 编写于 作者: B Brian Clozel

Merge branch 'gh-pages' of https://github.com/spring-projects/gh-pages into gh-pages

GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
......@@ -14,36 +13,32 @@ GEM
execjs
coffee-script-source (1.10.0)
colorator (0.1)
ethon (0.8.1)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.6.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.13)
gemoji (2.1.0)
github-pages (75)
RedCloth (= 4.2.9)
github-pages (86)
github-pages-health-check (= 1.1.0)
jekyll (= 3.0.4)
jekyll (= 3.1.6)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
jekyll-github-metadata (= 1.11.1)
jekyll-mentions (= 1.1.2)
jekyll-github-metadata (= 2.0.2)
jekyll-mentions (= 1.1.3)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.10.0)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.3.3)
jekyll-seo-tag (= 2.0.0)
jekyll-sitemap (= 0.10.0)
jekyll-textile-converter (= 0.1.0)
jemoji (= 0.6.2)
kramdown (= 1.10.0)
kramdown (= 1.11.1)
liquid (= 3.0.6)
listen (= 3.0.6)
mercenary (~> 0.3)
rdiscount (= 2.1.8)
redcarpet (= 3.3.3)
rouge (= 1.10.1)
rouge (= 1.11.1)
terminal-table (~> 1.4)
github-pages-health-check (1.1.0)
addressable (~> 2.3)
......@@ -51,11 +46,11 @@ GEM
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.4.0)
html-pipeline (2.4.1)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.4)
jekyll (3.1.6)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
......@@ -69,9 +64,10 @@ GEM
jekyll-feed (0.5.1)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-github-metadata (1.11.1)
jekyll-github-metadata (2.0.2)
jekyll (~> 3.1)
octokit (~> 4.0)
jekyll-mentions (1.1.2)
jekyll-mentions (1.1.3)
html-pipeline (~> 2.3)
jekyll (~> 3.0)
jekyll-paginate (1.1.0)
......@@ -79,45 +75,43 @@ GEM
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.3.3)
jekyll (~> 3.0)
jekyll-seo-tag (2.0.0)
jekyll (~> 3.1)
jekyll-sitemap (0.10.0)
jekyll-textile-converter (0.1.0)
RedCloth (~> 4.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
jekyll-watch (1.4.0)
listen (~> 3.0, < 3.1)
jemoji (0.6.2)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0)
json (1.8.3)
kramdown (1.10.0)
kramdown (1.11.1)
liquid (3.0.6)
listen (3.0.6)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.0.0)
minitest (5.8.4)
mini_portile2 (2.1.0)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
pkg-config (1.1.7)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdiscount (2.1.8)
redcarpet (3.3.3)
rouge (1.10.1)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.22)
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
terminal-table (1.5.2)
terminal-table (1.6.0)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
......@@ -132,4 +126,4 @@ DEPENDENCIES
rouge
BUNDLED WITH
1.11.2
1.12.5
......@@ -107,7 +107,7 @@ Assuming you're already within your project's clone directory, and you've alread
Use the `--watch` flag to pick up changes to files as you make them, allowing you a nice edit-and-refresh workflow.
jekyll serve --watch
bundle exec jekyll serve --watch
> **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.
......
{% if page.badges.twitter %}
<div class="project-sub-link">
<a href="https://twitter.com/{{ page.badges.twitter }}">
<div class="spring-icon project-badges twitter" alt="Twitter" title="Twitter">
<div class="spring-icon project-badges twitter" title="Twitter">
</div>
</a>
</div>
......@@ -9,7 +9,7 @@
{% for badge in page.badges.custom %}
<div class="project-sub-link">
<a href="{{ badge.url }}">
<div class="spring-icon project-badges {{ badge.icon }}" alt="{{ badge.name }}" title="{{ badge.name }}">
<div class="spring-icon project-badges {{ badge.icon }}" title="{{ badge.name }}">
</div>
</a>
</div>
......
<head>
<title>{{ site.name }}</title>
<link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png"/>
<link rel="icon" type="image/png" href="{{site.baseurl}}/favicon.png" />
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap.min.css" />
<link href='//fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700" />
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" type="text/css" href="{{site.baseurl}}/bootstrap/css/bootstrap-select.css" />
......@@ -18,21 +18,21 @@
{{ head_links }}
<script type="text/javascript" src="{{site.baseurl}}/js/jquery.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/bootstrap/js/bootstrap-select.js"></script>
<script src="{{site.baseurl}}/js/jquery.js"></script>
<script src="{{site.baseurl}}/bootstrap/js/bootstrap.min.js"></script>
<script src="{{site.baseurl}}/bootstrap/js/bootstrap-select.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/underscore.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/backbone.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/projectDocumentationWidget.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/application.js"></script>
<script type="text/javascript" src="{{site.baseurl}}/js/clipboard.min.js"></script>
<script type="text/javascript">
var apiBaseUrl = "{{ site.main_site_url }}";
var projectId = "{{ site.project }}";
var siteBaseUrl = "{{ site.baseurl }}";
<script src="{{site.baseurl}}/js/underscore.js"></script>
<script src="{{site.baseurl}}/js/backbone.js"></script>
<script src="{{site.baseurl}}/js/projectDocumentationWidget.js"></script>
<script src="{{site.baseurl}}/js/application.js"></script>
<script src="{{site.baseurl}}/js/clipboard.min.js"></script>
<script>
var apiBaseUrl = "{{ site.main_site_url }}",
projectId = "{{ site.project }}",
siteBaseUrl = "{{ site.baseurl }}";
</script>
<script type="text/javascript" src="{{site.baseurl}}/js/copySnippets.js"></script>
<script src="{{site.baseurl}}/js/copySnippets.js"></script>
<meta name="google-site-verification" content="7qGntFPD9lWAVCtUu5U77v4l68PsTHf6xpzgjQv2j2M" />
<script>
var _gaq = _gaq || [];
......@@ -84,12 +84,12 @@
<div class="container-fluid">
<div class="search-form--container">
<form class="form-inline form-search"
action="{{site.main_site_url}}/search" method="get">
<input type="text"
action="{{site.main_site_url}}/search">
<input type="search"
class="search-query search-form--form js-search-input"
placeholder="Search for documention, guides, and posts..."
name="q" />
<button type="submit" class="search-form--submit">
<button class="search-form--submit">
<i class="icon-search"></i>
</button>
</form>
......@@ -113,10 +113,10 @@
</ul>
</div>
</div>
&copy; <script type="text/javascript"> var d = new Date();
&copy; <script> var d = new Date();
document.write(d.getFullYear());</script> <a href="https://www.pivotal.io">Pivotal Software</a>, Inc. All Rights Reserved.
<a href="https://www.pivotal.io/terms-of-use">Terms of Use</a> and
<a href="https://www.pivotal.io/privacy-policy">Privacy</a>
<a href="https://pivotal.io/terms-of-use">Terms of Use</a> and
<a href="https://pivotal.io/privacy-policy">Privacy</a>
</div>
</div>
</div>
......
......@@ -95,7 +95,7 @@ Spring.SnippetView = Backbone.View.extend({
this.combinedTemplate = _.template(
"<div class=\"highlight\"><pre><code>" +
downloadTemplate.find("code:first").html() +
"{@ if (repository) { @}" +
"{@ if (typeof(repository) != \"undefined\") { @}" +
repositoryTemplate.find("code:first").html() +
"{@ } @}" +
"</code></pre></div>"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册