Repository: incubator-zeppelin Updated Branches: refs/heads/master 0665cef05 -> 86e2fd1e0
ZEPPELIN-445 Improve documentation menu https://issues.apache.org/jira/browse/ZEPPELIN-445 This PR improve menu of documentation. Before  After     Author: Lee moon soo <[email protected]> Closes #461 from Leemoonsoo/ZEPPELIN-445 and squashes the following commits: a5d538f [Lee moon soo] Correct caret color and give some space between logo and menu 2a53c73 [Lee moon soo] Logo to document root, not website root 8bc03e5 [Lee moon soo] Improve menu structure Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/86e2fd1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/86e2fd1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/86e2fd1e Branch: refs/heads/master Commit: 86e2fd1e05490e33aad221362922836631f5f121 Parents: 0665cef Author: Lee moon soo <[email protected]> Authored: Wed Nov 25 02:13:17 2015 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu Nov 26 10:42:35 2015 +0900 ---------------------------------------------------------------------- docs/_includes/themes/zeppelin/_navigation.html | 73 +++++++++++++++++--- docs/assets/themes/zeppelin/css/style.css | 30 +++++++- 2 files changed, 90 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/86e2fd1e/docs/_includes/themes/zeppelin/_navigation.html ---------------------------------------------------------------------- diff --git a/docs/_includes/themes/zeppelin/_navigation.html b/docs/_includes/themes/zeppelin/_navigation.html index 6ac6930..c3f8956 100644 --- a/docs/_includes/themes/zeppelin/_navigation.html +++ b/docs/_includes/themes/zeppelin/_navigation.html @@ -1,4 +1,4 @@ - <div class="navbar navbar-inverse navbar-fixed-top" role="navigation"> + <div id="menu" class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> @@ -7,21 +7,74 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="/"> + <a class="navbar-brand" href="{{BASE_PATH}}"> <img src="/assets/themes/zeppelin/img/zeppelin_logo.png" width="50" alt="I'm zeppelin"> Zeppelin <small>(0.6.0-incubating-SNAPSHOT)</small> </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' %} - {% include JB/pages_list %} + <li> + <a href="#" data-toggle="dropdown" class="dropdown-toggle">Quick Start <b class="caret"></b></a> + <ul class="dropdown-menu"> + <!-- li><span><b>Overview</b><span></li --> + <li><a href="{{BASE_PATH}}/index.html">Overview</a></li> + <li role="separator" class="divider"></li> + <!-- li><span><b>Install</b><span></li --> + <li><a href="{{BASE_PATH}}/install/install.html">Install</a></li> + <li><a href="{{BASE_PATH}}/install/yarn_install.html">YARN Install</a></li> + <li role="separator" class="divider"></li> + <!-- li><span><b>Tutorial</b><span></li --> + <li><a href="{{BASE_PATH}}/tutorial/tutorial.html">Tutorial</a></li> + <li role="separator" class="divider"></li> + <!-- li><span><b>Guide</b><span></li --> + <li><a href="{{BASE_PATH}}/manual/dynamicform.html">Dynamic Form</a></li> + </ul> + </li> + <li> + <a href="#" data-toggle="dropdown" class="dropdown-toggle">Interpreter <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="{{BASE_PATH}}/interpreter/cassandra.html">Cassandra</a></li> + <li><a href="{{BASE_PATH}}/interpreter/flink.html">Flink</a></li> + <li><a href="{{BASE_PATH}}/interpreter/geode.html">Geode</a></li> + <li><a href="{{BASE_PATH}}/pleasecontribute.html">Hive</a></li> + <li><a href="{{BASE_PATH}}/interpreter/ignite.html">Ignite</a></li> + <li><a href="{{BASE_PATH}}/interpreter/lens.html">Lens</a></li> + <li><a href="{{BASE_PATH}}/pleasecontribute.html">Markdown</a></li> + <li><a href="{{BASE_PATH}}/interpreter/postgresql.html">Postgresql, hawq</a></li> + <li><a href="{{BASE_PATH}}/pleasecontribute.html">Shell</a></li> + <li><a href="{{BASE_PATH}}/interpreter/spark.html">Spark</a></li> + <li><a href="{{BASE_PATH}}/pleasecontribute.html">Tajo</a></li> + </ul> + </li> + <li> + <a href="#" data-toggle="dropdown" class="dropdown-toggle">Display System <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="{{BASE_PATH}}/displaysystem/display.html">Text</a></li> + <li><a href="{{BASE_PATH}}/displaysystem/display.html#html">Html</a></li> + <li><a href="{{BASE_PATH}}/displaysystem/table.html">Table</a></li> + <li><a href="{{BASE_PATH}}/displaysystem/angular.html">Angular</a></li> + </ul> + </li> + <li> + <a href="#" data-toggle="dropdown" class="dropdown-toggle">More <b class="caret"></b></a> + <ul class="dropdown-menu"> + <!-- li><span><b>Manual</b><span></li --> + <li><a href="{{BASE_PATH}}/manual/notebookashomepage.html">Notebook as Homepage</a></li> + <li role="separator" class="divider"></li> + <!-- li><span><b>Notebook Storage</b><span></li --> + <li><a href="{{BASE_PATH}}/storage/storage.html">S3 Storage</a></li> + <li role="separator" class="divider"></li> + <!-- li><span><b>REST API</b><span></li --> + <li><a href="{{BASE_PATH}}/rest-api/rest-interpreter.html">Interpreter API</a></li> + <li><a href="{{BASE_PATH}}/rest-api/rest-notebook.html">Notebook API</a></li> + <li role="separator" class="divider"></li> + <!-- li><span><b>Development</b><span></li --> + <li><a href="{{BASE_PATH}}/development/writingzeppelininterpreter.html">Writing Zeppelin Interpreter</a></li> + <li><a href="{{BASE_PATH}}/development/howtocontribute.html">How to contribute (code)</a></li> + <li><a href="{{BASE_PATH}}/development/howtocontributewebsite.html">How to contribute (website)</a></li> + </ul> + </li> </ul> </nav><!--/.navbar-collapse --> </div> http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/86e2fd1e/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 d54df95..98aca0b 100644 --- a/docs/assets/themes/zeppelin/css/style.css +++ b/docs/assets/themes/zeppelin/css/style.css @@ -11,9 +11,7 @@ body { } .navbar-brand { - padding: 12px 12px; - padding-top: 15px; - padding-bottom: 10px; + padding: 15px 5px; } .navbar { @@ -351,3 +349,29 @@ and (max-width : 1024px) { padding-right: 0; } } + + +/* docs dropdown menu */ +#menu { + +} + +#menu .dropdown-menu li span { + padding : 3px 10px 10px 10px; + font-size: 13px; + +} + +#menu .caret { + border-top-color: white; + border-bottom-color: white; +} + +#menu .open .caret { + border-top-color: #428bca; + border-bottom-color: #428bca; +} + +#menu .navbar-nav { + margin-left:50px; +}
