You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mi...@apache.org on 2016/06/14 16:40:58 UTC

zeppelin git commit: [MINOR] Make nav zeppelin version to point ZEPPELIN_VERSION in _config.yml

Repository: zeppelin
Updated Branches:
  refs/heads/master 11e789ed5 -> 4a4691fa5


[MINOR] Make nav zeppelin version to point ZEPPELIN_VERSION in _config.yml

### What is this PR for?
One less line to change when releasing docs by making `ZEPPELIN_VERSION` to be retrieved from `_config.yml`.

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? Will be updated in https://cwiki.apache.org/confluence/display/ZEPPELIN/Preparing+Zeppelin+Release

Author: Mina Lee <mi...@apache.org>

Closes #997 from minahlee/docs/navZeppelinVersion and squashes the following commits:

dd547b2 [Mina Lee] Make nav zeppelin version to point ZEPPELIN_VERSION in _config.yml


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/4a4691fa
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/4a4691fa
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/4a4691fa

Branch: refs/heads/master
Commit: 4a4691fa59f1025e040d31677a7a067a2b288632
Parents: 11e789e
Author: Mina Lee <mi...@apache.org>
Authored: Fri Jun 10 18:19:45 2016 -0700
Committer: Mina Lee <mi...@apache.org>
Committed: Tue Jun 14 09:40:49 2016 -0700

----------------------------------------------------------------------
 docs/README.md                                  | 3 ---
 docs/_includes/themes/zeppelin/_navigation.html | 2 +-
 docs/assets/themes/zeppelin/css/style.css       | 3 ++-
 3 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4a4691fa/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
index 71fdf68..6a4c0de 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -31,9 +31,6 @@ See https://help.github.com/articles/using-jekyll-with-pages#installing-jekyll
 ## Bumping up version in a new release
 
    * `ZEPPELIN_VERSION` and `BASE_PATH` property in _config.yml
-   * `Zeppelin <small>([VERSION])</small>` in _includes/themes/zeppelin/_navigation.html
-should be updated
-
 
 ## Deploy to ASF svnpubsub infra (for committers only)
  1. generate static website in `./_site`

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4a4691fa/docs/_includes/themes/zeppelin/_navigation.html
----------------------------------------------------------------------
diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html
index 72b5e48..00c0fc1 100644
--- a/docs/_includes/themes/zeppelin/_navigation.html
+++ b/docs/_includes/themes/zeppelin/_navigation.html
@@ -10,7 +10,7 @@
           <a class="navbar-brand" href="{{BASE_PATH}}">
             <img src="/assets/themes/zeppelin/img/zeppelin_logo.png" width="50" alt="I'm zeppelin">
             <span style="vertical-align:middle">Zeppelin</span>
-            <span style="vertical-align:baseline"><small>(0.6.0-SNAPSHOT)</small></span>
+            <span style="vertical-align:baseline"><small>{{site.ZEPPELIN_VERSION}}</small></span>
           </a>
         </div>
         <nav class="navbar-collapse collapse" role="navigation">

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/4a4691fa/docs/assets/themes/zeppelin/css/style.css
----------------------------------------------------------------------
diff --git a/docs/assets/themes/zeppelin/css/style.css b/docs/assets/themes/zeppelin/css/style.css
index 9c6c64c..2585ceb 100644
--- a/docs/assets/themes/zeppelin/css/style.css
+++ b/docs/assets/themes/zeppelin/css/style.css
@@ -501,8 +501,9 @@ a.anchor {
 
 .navbar-brand small {
   font-size: 14px;
-  font-family: 'Helvetica Neue', Helvetica;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica;
   color: white;
+  vertical-align: bottom;
 }
 
 .navbar-collapse.collapse {