Always display apache brooklyn logo + Fix navbar issue on mobile device (cherry picked from commit 1e7987ab45b5b8ef05e79c5014308aa2bbb780a3)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/ddfd9d24 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/ddfd9d24 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/ddfd9d24 Branch: refs/heads/0.11.x Commit: ddfd9d24724e79e94ffa6fda06817d2932d187d9 Parents: ad5e53f Author: Thomas Bouron <[email protected]> Authored: Mon Apr 24 17:26:51 2017 +0100 Committer: Richard Downer <[email protected]> Committed: Wed May 31 15:26:16 2017 +0100 ---------------------------------------------------------------------- _includes/header.html | 17 ++++------------- style/css/_menu.scss | 10 ++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ddfd9d24/_includes/header.html ---------------------------------------------------------------------- diff --git a/_includes/header.html b/_includes/header.html index 3835d09..6e7243d 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -7,25 +7,16 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <div class="navbar-brand"> - <a class="brand-apache" href="http://www.apache.org/";> - <img src="https://www.apache.org/foundation/press/kit/feather.svg"; alt="[Apache]"> - </a> - {% if page.layout != "website-landing" %} - <a class="brand-brooklyn" href="{{site.path.website}}/"><img src="{{site.path.style}}/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a> - {% endif %} - </div> + <a href="{{site.path.website}}/" class="navbar-brand"> + <img src="{{site.path.style}}/img/apache-brooklyn-logo-244px-wide.png" alt="Apache Brooklyn" /> + </a> </div> <div class="collapse navbar-collapse" id="main-menu"> - - <ul class="nav navbar-nav navbar-right"> {% for item in site.data.menu %} <li class="dropdown{% if page.breadcrumb_paths contains item.path %} active{% endif %}"> {% if item.menu_customization.type == "button" %} - <form class="navbar-form"> - <a href="{{item.url}}" class="btn btn-default">{{ item.title_in_menu | downcase }}</a> - </form> + <a href="{{item.url}}" class="btn btn-default navbar-btn">{{ item.title_in_menu | downcase }}</a> {% else %} <a href="{{item.url}}" data-toggle="dropdown">{{ item.title_in_menu | downcase }} {% if item.menu %}<span class="caret"></span>{% endif %}</a> {% if item.menu %} http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ddfd9d24/style/css/_menu.scss ---------------------------------------------------------------------- diff --git a/style/css/_menu.scss b/style/css/_menu.scss index 6d0b6cc..3c72de4 100644 --- a/style/css/_menu.scss +++ b/style/css/_menu.scss @@ -1,6 +1,16 @@ /* WEBSITE MENUS ----------------------------------------------------------------------- */ +.navbar-brand > img { + margin-top: -4px; +} +.navbar a.navbar-btn { + display: inline-block; + margin-left: 15px; + margin-right: 15px; + padding: 6px 12px; +} + /* pop-up top-menu */ .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus,
![https://www.apache.org/foundation/press/kit/feather.svg"](https://www.apache.org/foundation/press/kit/feather.svg"){kind=link}