tiny gui tidy-ups following @richardcloudsoft's dev top-level menu work external links in other menus render, and more buttons get the no-shadow light-font treatment
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4a5c34f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4a5c34f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4a5c34f7 Branch: refs/heads/master Commit: 4a5c34f7ce4e49e84c7bf786f75c26cd5c2ae6c0 Parents: 74618fb Author: Alex Heneveld <[email protected]> Authored: Tue Jan 13 15:48:27 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Jan 13 15:48:27 2015 +0000 ---------------------------------------------------------------------- docs/_includes/sidemenu.html | 10 +++++++--- docs/_includes/topmenu.html | 3 ++- docs/style/css/base.scss | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a5c34f7/docs/_includes/sidemenu.html ---------------------------------------------------------------------- diff --git a/docs/_includes/sidemenu.html b/docs/_includes/sidemenu.html index 8947b24..d231970 100644 --- a/docs/_includes/sidemenu.html +++ b/docs/_includes/sidemenu.html @@ -19,20 +19,24 @@ <a href="{{item.url}}" class="list-group-item{% if item.path == page.menu_path %} active{% endif %} breadcrumb breadcrumb{{ forloop.index0 }}"> {{ item.title_in_menu }}</a></h4> {% endfor %} + {% for item in page.menu %} - <a href="{{item.url}}" class="list-group-item{% if page.breadcrumbs contains item %} active{% endif %}">{{ item.title_in_menu }}</a> + <a href="{{item.url}}" class="list-group-item{% if page.breadcrumbs contains item %} active{% endif %}">{{ item.title_in_menu }} + {% if item.external %} <span class="octicon octicon-link-external"></span>{% endif %}</a> {% endfor %} {% else %} {% comment %} case 3a {% endcomment %} {% for item in page.menu_parent.breadcrumb_pages offset:1 %} <h4 class="{% if forloop.index0 > 0 %} with_preceding{% endif %}{% if forloop.rindex0 > 0 %} with_following{% endif %}"> <a href="{{item.url}}" class="list-group-item{% if item.path == page.menu_path %}{% unless item.menu_customization.force_inactive %} active{% endunless %}{% endif %} breadcrumb breadcrumb{{ forloop.index0 }}"> - {{ item.title_in_menu }}</a></h4> + {{ item.title_in_menu }} + {% if item.external %} <span class="octicon octicon-link-external"></span>{% endif %}</a></h4> {% endfor %} {% for item in page.menu_parent.menu %} {% if (page.breadcrumb_paths contains item.menu_path) and page.menu %} {% comment %} case 3b {% endcomment %} - <a href="{{item.url}}" class="list-group-item active with-sub-item">{{ item.title_in_menu }}</a> + <a href="{{item.url}}" class="list-group-item active with-sub-item">{{ item.title_in_menu }} + {% if item.external %} <span class="octicon octicon-link-external"></span>{% endif %}</a> <div class="sub-item"> {% for item2 in page.menu %} {% capture item_section_classes %}{% if item2.section %} section{% endif %}{% endcapture %} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a5c34f7/docs/_includes/topmenu.html ---------------------------------------------------------------------- diff --git a/docs/_includes/topmenu.html b/docs/_includes/topmenu.html index 3bc7db6..37a39d0 100644 --- a/docs/_includes/topmenu.html +++ b/docs/_includes/topmenu.html @@ -37,7 +37,8 @@ {% if item2.menu_customization.dropdown_new_section %} <div class="dropdown_new_section"><hr></div> {% endif %} - <a href="{{item2.url}}">{{item2.title_in_menu}}</a> + <a href="{{item2.url}}">{{item2.title_in_menu}} + {% if item2.external %} <span class="octicon octicon-link-external"></span>{% endif %}</a> {% if item2.menu_customization.dropdown_section_header %} <div class="dropdown_section_header"><hr></div> {% endif %} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4a5c34f7/docs/style/css/base.scss ---------------------------------------------------------------------- diff --git a/docs/style/css/base.scss b/docs/style/css/base.scss index 8643f26..e2e676d 100644 --- a/docs/style/css/base.scss +++ b/docs/style/css/base.scss @@ -34,11 +34,13 @@ a[id]:empty, a[name]:empty { .dropdown-menu > li > a { font-weight: 300; } -.btn-default { +.btn-default, .btn-primary, .btn-success, .btn-info, .btn-warning, .btn-danger { text-shadow: none; - color: #666; font-weight: 300; } +.btn-default { + color: #666; +} /* GENERAL UTILS ----------------------------------------------------------------------- */
