You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by ta...@apache.org on 2017/10/26 04:47:52 UTC
[04/12] incubator-predictionio git commit: [PIO-133] Add all missing
trademark attributions
[PIO-133] Add all missing trademark attributions
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/b5c9655d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/b5c9655d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/b5c9655d
Branch: refs/heads/develop
Commit: b5c9655df6f912092048454d94e4404006be90b1
Parents: d8ee0c8
Author: Donald Szeto <do...@apache.org>
Authored: Sat Oct 7 00:24:22 2017 -0700
Committer: Donald Szeto <do...@apache.org>
Committed: Sat Oct 7 00:24:22 2017 -0700
----------------------------------------------------------------------
docs/manual/data/nav/main.yml | 2 +-
docs/manual/source/index.html.md.erb | 4 ++--
docs/manual/source/partials/_footer.html.slim | 5 +++++
docs/manual/source/partials/_header.html.slim | 1 +
docs/manual/source/stylesheets/partials/_footer.css.scss | 4 ++++
docs/manual/source/stylesheets/variables/_colors.css.scss | 1 +
6 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5c9655d/docs/manual/data/nav/main.yml
----------------------------------------------------------------------
diff --git a/docs/manual/data/nav/main.yml b/docs/manual/data/nav/main.yml
index 662efb9..aa9ce58 100644
--- a/docs/manual/data/nav/main.yml
+++ b/docs/manual/data/nav/main.yml
@@ -1,6 +1,6 @@
root:
-
- body: 'Apache PredictionIO (incubating) Documentation'
+ body: 'Apache PredictionIO™ (incubating) Documentation'
url: '/'
children:
-
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5c9655d/docs/manual/source/index.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/manual/source/index.html.md.erb b/docs/manual/source/index.html.md.erb
index c1a8fcf..077999c 100644
--- a/docs/manual/source/index.html.md.erb
+++ b/docs/manual/source/index.html.md.erb
@@ -1,6 +1,6 @@
---
-title: Welcome to Apache PredictionIO (incubating)!
-description: Apache PredictionIO (incubating) Open Source Machine Learning Server
+title: Welcome to Apache PredictionIO™ (incubating)!
+description: Apache PredictionIO™ (incubating) Open Source Machine Learning Server
---
<!--
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5c9655d/docs/manual/source/partials/_footer.html.slim
----------------------------------------------------------------------
diff --git a/docs/manual/source/partials/_footer.html.slim b/docs/manual/source/partials/_footer.html.slim
index 7aa22b2..5d45b29 100644
--- a/docs/manual/source/partials/_footer.html.slim
+++ b/docs/manual/source/partials/_footer.html.slim
@@ -23,6 +23,10 @@ footer
li: a href="mailto:dev-subscribe@predictionio.incubator.apache.org" target="blank" Subscribe to Development Mailing List
.row
.col-md-12.footer-link-column
+ p Apache PredictionIO, PredictionIO, Apache, the Apache feather logo, and the Apache PredictionIO project logo are either registered trademarks or trademarks of The Apache Software Foundation in the United States and other countries.
+ p All other marks mentioned may be trademarks or registered trademarks of their respective owners.
+ .row
+ .col-md-12.footer-link-column
a.pull-right href="http://incubator.apache.org/projects/predictionio.html"
= image_tag 'logos/apache_incubator.png', alt: 'Apache Incubator'
span Apache PredictionIO is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache 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.
@@ -33,6 +37,7 @@ footer
.col-md-12
#footer-logo-wrapper
= image_tag 'logos/logo-white.png', alt: 'PredictionIO'
+ span ™
#social-icons-wrapper
a.github-button> href="https://github.com/apache/incubator-predictionio" data-style="mega" data-count-href="/apache/incubator-predictionio/stargazers" data-count-api="/repos/apache/incubator-predictionio#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star apache/incubator-predictionio on GitHub" Star
a.github-button> href="https://github.com/apache/incubator-predictionio/fork" data-icon="octicon-git-branch" data-style="mega" data-count-href="/apache/incubator-predictionio/network" data-count-api="/repos/apache/incubator-predictionio#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork apache/incubator-predictionio on GitHub" Fork
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5c9655d/docs/manual/source/partials/_header.html.slim
----------------------------------------------------------------------
diff --git a/docs/manual/source/partials/_header.html.slim b/docs/manual/source/partials/_header.html.slim
index 28ed5a5..4ecb9e0 100644
--- a/docs/manual/source/partials/_header.html.slim
+++ b/docs/manual/source/partials/_header.html.slim
@@ -7,6 +7,7 @@ header
a href="#"
= link_to 'http://predictionio.incubator.apache.org/' do
= image_tag 'logos/logo.png', alt: 'PredictionIO', id: 'logo'
+ span ™
#menu-wrapper
#pill-wrapper
a.pill.left> href="/gallery/template-gallery" TEMPLATES
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5c9655d/docs/manual/source/stylesheets/partials/_footer.css.scss
----------------------------------------------------------------------
diff --git a/docs/manual/source/stylesheets/partials/_footer.css.scss b/docs/manual/source/stylesheets/partials/_footer.css.scss
index 433f91e..50afb57 100644
--- a/docs/manual/source/stylesheets/partials/_footer.css.scss
+++ b/docs/manual/source/stylesheets/partials/_footer.css.scss
@@ -40,6 +40,10 @@ footer {
padding: 15px 0;
margin-top: 50px;
+ span {
+ color: $footer-bottom-span-color;
+ }
+
#footer-logo-wrapper {
float:left;
}
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5c9655d/docs/manual/source/stylesheets/variables/_colors.css.scss
----------------------------------------------------------------------
diff --git a/docs/manual/source/stylesheets/variables/_colors.css.scss b/docs/manual/source/stylesheets/variables/_colors.css.scss
index 96a7af9..33c80ef 100644
--- a/docs/manual/source/stylesheets/variables/_colors.css.scss
+++ b/docs/manual/source/stylesheets/variables/_colors.css.scss
@@ -96,6 +96,7 @@ $footer-background-color: #ffffff;
$footer-link-color: #888888;
$footer-heading-4-color: #262626;
$footer-bottom-background-color: #262626;
+$footer-bottom-span-color: #ffffff;
// Subscribe Form
$form-wrapper-color: #091F38;