This is an automated email from the ASF dual-hosted git repository.
adriancole pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-zipkin-website.git
The following commit(s) were added to refs/heads/master by this push:
new bfeaae7 First pass at meeting ASF requirements for website (#1)
bfeaae7 is described below
commit bfeaae79fd82f4f6aed48e6d5b1848b78579f025
Author: Brian Devins-Suresh <[email protected]>
AuthorDate: Wed Mar 20 20:58:40 2019 -0400
First pass at meeting ASF requirements for website (#1)
---
.gitignore | 1 +
Gemfile.lock | 44 ++++++++++++++++++++++----------------------
_includes/sidebar.html | 12 +++++++++---
_layouts/default.html | 15 +++++++++++++++
public/css/zipkin.css | 8 ++++++++
5 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/.gitignore b/.gitignore
index 45c1505..12fbc18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
_site
.sass-cache
.jekyll-metadata
+.idea
diff --git a/Gemfile.lock b/Gemfile.lock
index 683e484..77e75c3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,24 +13,24 @@ GEM
execjs
coffee-script-source (1.11.1)
colorator (1.1.0)
- commonmarker (0.17.12)
+ commonmarker (0.17.13)
ruby-enum (~> 0.5)
- concurrent-ruby (1.0.5)
+ concurrent-ruby (1.1.4)
dnsruby (1.61.2)
addressable (~> 2.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
- ethon (0.11.0)
+ ethon (0.12.0)
ffi (>= 1.3.0)
eventmachine (1.2.7)
execjs (2.7.0)
- faraday (0.15.2)
+ faraday (0.15.4)
multipart-post (>= 1.2, < 3)
- ffi (1.9.25)
+ ffi (1.10.0)
forwardable-extended (2.6.0)
gemoji (3.0.0)
- github-pages (192)
+ github-pages (193)
activesupport (= 4.2.10)
github-pages-health-check (= 1.8.1)
jekyll (= 3.7.4)
@@ -38,7 +38,7 @@ GEM
jekyll-coffeescript (= 1.1.1)
jekyll-commonmark-ghpages (= 0.1.5)
jekyll-default-layout (= 0.1.4)
- jekyll-feed (= 0.10.0)
+ jekyll-feed (= 0.11.0)
jekyll-gist (= 1.5.0)
jekyll-github-metadata (= 2.9.4)
jekyll-mentions (= 1.4.1)
@@ -81,7 +81,7 @@ GEM
octokit (~> 4.0)
public_suffix (~> 2.0)
typhoeus (~> 1.3)
- html-pipeline (2.8.4)
+ html-pipeline (2.10.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
@@ -114,7 +114,7 @@ GEM
rouge (~> 2)
jekyll-default-layout (0.1.4)
jekyll (~> 3.0)
- jekyll-feed (0.10.0)
+ jekyll-feed (0.11.0)
jekyll (~> 3.3)
jekyll-gist (1.5.0)
octokit (~> 4.2)
@@ -185,7 +185,7 @@ GEM
jekyll-seo-tag (~> 2.0)
jekyll-titles-from-headings (0.5.1)
jekyll (~> 3.3)
- jekyll-watch (2.0.0)
+ jekyll-watch (2.1.2)
listen (~> 3.0)
jemoji (0.10.1)
gemoji (~> 3.0)
@@ -198,30 +198,30 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
- mini_portile2 (2.3.0)
+ mini_portile2 (2.4.0)
minima (2.5.0)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.11.3)
multipart-post (2.0.0)
- nokogiri (1.8.4)
- mini_portile2 (~> 2.3.0)
- octokit (4.11.0)
+ nokogiri (1.10.1)
+ mini_portile2 (~> 2.4.0)
+ octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
- pathutil (0.16.1)
+ pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rb-fsevent (0.10.3)
- rb-inotify (0.9.10)
- ffi (>= 0.5.0, < 2)
+ rb-inotify (0.10.0)
+ ffi (~> 1.0)
rouge (2.2.1)
ruby-enum (0.7.2)
i18n
ruby_dep (1.5.0)
rubyzip (1.2.2)
safe_yaml (1.0.4)
- sass (3.5.7)
+ sass (3.7.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -232,19 +232,19 @@ GEM
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
- typhoeus (1.3.0)
+ typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- unicode-display_width (1.4.0)
+ unicode-display_width (1.4.1)
yaml-lint (0.0.10)
PLATFORMS
ruby
DEPENDENCIES
- github-pages (= 192)
+ github-pages (= 193)
yaml-lint (~> 0.0.9)
BUNDLED WITH
- 1.16.2
+ 1.17.2
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 7a3d507..8a04b50 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -21,9 +21,15 @@
{% endif %}
{% endif %}
{% endfor %}
-
</nav>
-
- <p>© {{ site.time | date: '%Y' }}. All rights reserved.</p>
+ <nav>
+ <span>Apache Links</span>
+ <a class="sidebar-nav-item" href="http://www.apache.org/";>Apache
Software Foundation</a>
+ <a class="sidebar-nav-item"
href="http://www.apache.org/licenses/";>License</a>
+ <a class="sidebar-nav-item"
href="http://www.apache.org/events/current-event";>Events</a>
+ <a class="sidebar-nav-item"
href="http://www.apache.org/foundation/thanks";>Thanks</a>
+ <a class="sidebar-nav-item"
href="http://www.apache.org/security";>Security</a>
+ <a class="sidebar-nav-item"
href="http://www.apache.org/foundation/sponsorship";>Sponsor Apache</a>
+ </nav>
</div>
</div>
diff --git a/_layouts/default.html b/_layouts/default.html
index c438350..54b1e3f 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -11,5 +11,20 @@
{{ content }}
</div>
+ <footer class="content container">
+ <p class="disclaimer">
+ <strong>Disclaimer</strong><br/>
+ Apache Zipkin (incubating) is an effort undergoing incubation at The
Apache Software Foundation (ASF), sponsored
+ by Incubator. Incubation is required of all newly accepted projects
until a further review indicates that the
+ infrastructure, communications, and decision making process have
stabilized in a manner consistent with other
+ successful ASF projects. While incubation status is not necessarily a
reflection of the completeness or
+ stability of the code, it does indicate that the project has yet to be
fully endorsed by the ASF.
+ </p>
+ <p class="notice">
+ © {{ site.time | date: '%Y' }}, the Apache Software Foundation,
Apache Zipkin, Zipkin, Apache, the Apache
+ feather Logo, and the Apache Zipkin project logo are either registered
trademarks or trademarks of the Apache
+ Software Foundation.
+ </p>
+ </footer>
</body>
</html>
diff --git a/public/css/zipkin.css b/public/css/zipkin.css
index 720163b..0696911 100644
--- a/public/css/zipkin.css
+++ b/public/css/zipkin.css
@@ -51,3 +51,11 @@ table.wide-table td {
table.wide-table th {
font-size: 0.8em;
}
+
+p.disclaimer {
+ font-size: 0.8em;
+}
+
+p.notice {
+ font-size: 0.8em;
+}
\ No newline at end of file
