[TOREE-400] Update theme similar to current live site
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree-website/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree-website/commit/1ce0d249 Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree-website/tree/1ce0d249 Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree-website/diff/1ce0d249 Branch: refs/heads/master Commit: 1ce0d249bfb9fb15dffd3d85bcf1393a54a4add8 Parents: 2fd8426 Author: Luciano Resende <lrese...@apache.org> Authored: Fri Apr 14 23:36:22 2017 -0700 Committer: Luciano Resende <lrese...@apache.org> Committed: Sat Apr 15 01:10:14 2017 -0700 ---------------------------------------------------------------------- site/_data/navigation.yml | 43 ++++++++++++++++++++++ site/_includes/themes/apache/_navigation.html | 36 ++++++++++-------- site/_includes/themes/apache/default.html | 4 +- site/assets/themes/apache/css/style.css | 38 ++++++++----------- site/community-members.md | 3 +- 5 files changed, 81 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-toree-website/blob/1ce0d249/site/_data/navigation.yml ---------------------------------------------------------------------- diff --git a/site/_data/navigation.yml b/site/_data/navigation.yml new file mode 100644 index 0000000..dbb9a41 --- /dev/null +++ b/site/_data/navigation.yml @@ -0,0 +1,43 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to you 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. + +topnav: + +- title: Community + subcategories: + - title: Get Involved + url: /community + - title: Project Committers + url: /community-members + +- title: GitHub + subcategories: + - title: Toree + url: https://github.com/apache/incubator-toree + - title: Toree Website + url: https://github.com/apache/incubator-toree-website + +- title: Apache + subcategories: + - title: Apache Software Foundation + url: http://www.apache.org/foundation/how-it-works.html + - title: Apache License + url: http://www.apache.org/licenses/ + - title: Sponsorship + url: http://www.apache.org/foundation/sponsorship + - title: Thanks + url: http://www.apache.org/foundation/thanks.html + - title: Privacy Policy + url: /privacy-policy http://git-wip-us.apache.org/repos/asf/incubator-toree-website/blob/1ce0d249/site/_includes/themes/apache/_navigation.html ---------------------------------------------------------------------- diff --git a/site/_includes/themes/apache/_navigation.html b/site/_includes/themes/apache/_navigation.html index 786e96b..ff55b18 100644 --- a/site/_includes/themes/apache/_navigation.html +++ b/site/_includes/themes/apache/_navigation.html @@ -12,27 +12,33 @@ {{ site.data.project.name }} </a> </div> + + <nav class="navbar-collapse collapse" role="navigation"> <ul class="nav navbar-nav navbar-right"> - <li id="community"> - <a href="#" data-toggle="dropdown" class="dropdown-toggle">Community<b class="caret"></b></a> - <ul class="dropdown-menu dropdown-left"> - <li><a href="/community">Get Involved</a></li> - <li><a href="/community-members">Who we are</a></li> - </ul> - </li> - <li><a href="{{ site.data.project.source_repository }}">GitHub</a></li> - <li id="apache"> - <a href="#" data-toggle="dropdown" class="dropdown-toggle">Apache<b class="caret"></b></a> - <ul class="dropdown-menu"> - <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="http://www.apache.org/foundation/thanks.html";>Thanks</a></li> + {% for entry in site.data.navigation.topnav %} + <li id="{{ entry.title | slugify }}"> + {% if entry.subcategories %} + <a href="#" data-toggle="dropdown" class="dropdown-toggle">{{ entry.title }}<b class="caret"></b></a> + <ul class="dropdown-menu dropdown-left"> + {% for subitem in entry.subcategories %} + {% if subitem.url contains "http" %} + {% assign target = "_blank" %}{% else %} + {% assign target = "_self" %}{% endif %} + <li><a href="{{ subitem.url }}" target="{{ target }}">{{ subitem.title }}</a></li> + {% endfor %} </ul> + {% else %} + {% if entry.url contains "http" %} + {% assign target = "_blank" %}{% else %} + {% assign target = "_self" %}{% endif %} + <a href="{{ entry.url }}" target="{{ target }}">{{ entry.title }}</a> + {% endif %} </li> + {% endfor %} </ul> </nav><!--/.navbar-collapse --> + </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-toree-website/blob/1ce0d249/site/_includes/themes/apache/default.html ---------------------------------------------------------------------- diff --git a/site/_includes/themes/apache/default.html b/site/_includes/themes/apache/default.html index 7c1ca9e..8c3ae92 100644 --- a/site/_includes/themes/apache/default.html +++ b/site/_includes/themes/apache/default.html @@ -28,7 +28,7 @@ </head> - <body> + <body data-spy="scroll" data-target="#navbar" style="position: relative;"> {% include themes/apache/_navigation.html %} @@ -43,9 +43,7 @@ {% include JB/analytics %} <script src="{{ ASSET_PATH }}/jquery/jquery-2.1.1.min.js"></script> - <script src="{{ ASSET_PATH }}/bootstrap/js/bootstrap.min.js"></script> - </body> </html> http://git-wip-us.apache.org/repos/asf/incubator-toree-website/blob/1ce0d249/site/assets/themes/apache/css/style.css ---------------------------------------------------------------------- diff --git a/site/assets/themes/apache/css/style.css b/site/assets/themes/apache/css/style.css index 92f25bf..1564829 100644 --- a/site/assets/themes/apache/css/style.css +++ b/site/assets/themes/apache/css/style.css @@ -7,7 +7,7 @@ body { } .jumbotron { - background-color: #3071a9; + background-color: #222222; } .navbar-brand { @@ -17,29 +17,29 @@ body { } .navbar { - background-color:#3071a9; + background-color:#222222; border-bottom:0px; height: 50px; } .navbar-inverse .navbar-nav > li > a { color: #ffffff; - background-color:#3071a9; + background-color:#222222; } -.navbar-inverse .navbar-nav > li > a:hover, +.navbar-inverse .navbar-nav > li > a:hover, .navbar-inverse .navbar-nav > li > a:focus { color: #ffffff; - background-color: #2C6094; + background-color: ##222222; } -.navbar-inverse .navbar-nav > li > a.active:hover, +.navbar-inverse .navbar-nav > li > a.active:hover, .navbar-inverse .navbar-nav > li > a.active:focus { text-decoration: none; - background-color: #265380; + background-color: #222222; } .navbar-inverse .navbar-nav > li > a.active { - background-color: #265380; + background-color: #222222; } .navbar-inverse .navbar-brand:hover, @@ -54,8 +54,8 @@ body { .navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form { - border-color: #265380; - background-color: #3071a9; + border-color: #222222; + background-color: #222222; } @media (max-width: 768px) { @@ -76,13 +76,13 @@ body { } .navbar-inverse .navbar-toggle { - border-color: #265380; + border-color: #222222; } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { - border-color: #265380; - background-color: #265380; + border-color: #222222; + background-color: #222222; } .navbar-inverse .navbar-toggle:focus { @@ -220,14 +220,6 @@ body { transform: rotate(270deg); } - - - - - - - - /* Custom container */ .container-narrow { margin: 0 auto; @@ -320,10 +312,10 @@ body { .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus { color: #ffffff; - background-color: #286090; + background-color: ##222222; } -/* Custom, iPhone Retina */ +/* Custom, iPhone Retina */ @media only screen and (max-width : 480px) { .jumbotron h1 { display: none; http://git-wip-us.apache.org/repos/asf/incubator-toree-website/blob/1ce0d249/site/community-members.md ---------------------------------------------------------------------- diff --git a/site/community-members.md b/site/community-members.md index 4edf3ae..a4930fd 100644 --- a/site/community-members.md +++ b/site/community-members.md @@ -32,7 +32,7 @@ limitations under the License. {% if site.data.contributors %} <table class="table table-hover"> <tr> - <th><b></b></th><th><b>Full Name</b></th><th><b>Apache ID</b></th><th><b>GitHub</b><th><b>Role</b></th><th><b>Affiliation</b></th> + <th><b></b></th><th><b>Full Name</b></th><th><b>Apache ID</b></th><th><b>GitHub</b></th><th><b>Role</b></th><th><b>Affiliation</b></th> </tr> {% for member in site.data.contributors %} <tr> @@ -46,4 +46,3 @@ limitations under the License. {% endfor %} </table> {% endif %} -
