Add an Apache Zeppelin Logo section to the website ### What is this PR for? This PR is bringing both PNG and SVG format of the logo to the website, as well as a few other infos about color and font used. To do that we add a new page and navigation menu named: More
### What type of PR is it? Documentation ### How should this be tested? Build the website and visit the More menu ### Screenshots (if appropriate) <img width="958" alt="screen shot 2016-08-12 at 5 50 56 pm" src="https://cloud.githubusercontent.com/assets/710411/17617666/4c0b9c6c-60b6-11e6-891c-2f2a8d9cf528.png"> ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: Damien CORNEAU <cornead...@gmail.com> Closes #1325 from corneadoug/add/logoToWebsite and squashes the following commits: aff775b [Damien CORNEAU] Change the asset page to Apache menu 0d6a927 [Damien CORNEAU] Add more page and Apache Zeppelin logo section Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a98a66bc Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a98a66bc Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a98a66bc Branch: refs/heads/gh-pages Commit: a98a66bc226f091cfba40b692607097806eb8a42 Parents: e722f31 Author: Damien CORNEAU <cornead...@gmail.com> Authored: Tue Aug 16 12:09:52 2016 +0900 Committer: Damien CORNEAU <cornead...@gmail.com> Committed: Thu Aug 18 13:31:44 2016 +0900 ---------------------------------------------------------------------- _includes/themes/zeppelin/_navigation.html | 14 ++-- assets.md | 38 +++++++++ assets/themes/zeppelin/css/style.css | 10 ++- .../zeppelin/img/zeppelin_classic_logo.png | Bin 0 -> 24056 bytes .../themes/zeppelin/img/zeppelin_svg_logo.svg | 77 +++++++++++++++++++ 5 files changed, 128 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/_includes/themes/zeppelin/_navigation.html ---------------------------------------------------------------------- diff --git a/_includes/themes/zeppelin/_navigation.html b/_includes/themes/zeppelin/_navigation.html index 226b0a7..1cf5ebd 100644 --- a/_includes/themes/zeppelin/_navigation.html +++ b/_includes/themes/zeppelin/_navigation.html @@ -13,11 +13,6 @@ </a> </div> <nav class="navbar-collapse collapse" role="navigation"> - <ul class="nav navbar-nav"> - {% assign pages_list = site.pages %} - {% assign group = 'nav-left' %} - {% include JB/pages_list %} - </ul> <ul class="nav navbar-nav navbar-right"> {% assign pages_list = site.pages %} {% assign group = 'nav-right' %} @@ -34,13 +29,13 @@ <li><a href="/docs/0.5.5-incubating">0.5.5-incubating</a></li> <li><a href="/docs/0.5.0-incubating">0.5.0-incubating</a></li> <li role="separator" class="divider"></li> - <li><span><b>Snapshot</b> (development)<span></li> + <li><span><b>Snapshot</b> (development)<span></li> <li><a href="/docs/0.7.0-SNAPSHOT">0.7.0-SNAPSHOT</a></li> </ul> </li> - + <li><a href="https://github.com/apache/incubator-zeppelin">GitHub</a></li> - + <!-- Apache --> <li id="apache"> <a href="#" data-toggle="dropdown" class="dropdown-toggle">Apache<b class="caret"></b></a> @@ -48,8 +43,9 @@ <li><a href="http://www.apache.org/foundation/how-it-works.html">Apache Software Foundation</a></li> <li><a href="http://www.apache.org/licenses/">Apache License</a></li> <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li> + <li><a href="/assets.html">Assets</a></li> <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li> - </ul> + </ul> </li> </ul> </nav><!--/.navbar-collapse --> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/assets.md ---------------------------------------------------------------------- diff --git a/assets.md b/assets.md new file mode 100644 index 0000000..2434f1e --- /dev/null +++ b/assets.md @@ -0,0 +1,38 @@ +--- +layout: page +title: "Assets" +description: "Assets of Apache Zeppelin" +--- +<!-- +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> +{% include JB/setup %} + + +### Apache Zeppelin Logo + +Here you will find links and informations regarding the Apache Zeppelin logo + +<div style="text-align:center;"> + <div class="logopage_container"> + <img src="/assets/themes/zeppelin/img/zeppelin_classic_logo.png" width="200" alt="zeppelin" /> + </div> + + + <div class="logopage_container" style="text-align:left"> + <div>Font used: <a href="https://www.google.com/fonts/specimen/Patua%20One">Patua One</a></div> + <div>Color: <span style="background-color:#3071A9; color: white; padding: 1px 5px;">#3071A9</span></div> + <div><a href="/assets/themes/zeppelin/img/zeppelin_classic_logo.png">PNG format</a></div> + <div><a href="/assets/themes/zeppelin/img/zeppelin_svg_logo.svg">SVG format</a></div> + </div> +</div> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/assets/themes/zeppelin/css/style.css ---------------------------------------------------------------------- diff --git a/assets/themes/zeppelin/css/style.css b/assets/themes/zeppelin/css/style.css index e318805..482847b 100644 --- a/assets/themes/zeppelin/css/style.css +++ b/assets/themes/zeppelin/css/style.css @@ -11,6 +11,12 @@ body { letter-spacing: .2px; } +.logopage_container { + display: inline-block; + vertical-align: middle; + margin: 10px 20px; +} + .jumbotron { background-color: #3071a9; } @@ -21,7 +27,7 @@ body { } .jumbotron p { - font-size: 19px; + font-size: 19px; } .jumbotron .btn { @@ -267,7 +273,7 @@ a.anchor { position: absolute; top: 0; left: 0; - bottom: 0; + bottom: 0; } /* <hn> */ http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a98a66bc/assets/themes/zeppelin/img/zeppelin_classic_logo.png ---------------------------------------------------------------------- diff --git a/assets/themes/zeppelin/img/zeppelin_classic_logo.png b/assets/themes/zeppelin/img/zeppelin_classic_logo.png new file mode 100644 index 0000000..ed3c282 Binary files /dev/null and b/assets/themes/zeppelin/img/zeppelin_classic_logo.png differ