You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2016/01/27 22:41:57 UTC
allura git commit: [#8046] Make nbhd nav_menu look cleaner and
positioned to the left [Forced Update!]
Repository: allura
Updated Branches:
refs/heads/hs/8046 45f53f866 -> c871d60f9 (forced update)
[#8046] Make nbhd nav_menu look cleaner and positioned to the left
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c871d60f
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c871d60f
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c871d60f
Branch: refs/heads/hs/8046
Commit: c871d60f96c265c19b4e941736e1c46326631cc6
Parents: fd37b2d
Author: Heith Seewald <he...@gmail.com>
Authored: Mon Jan 25 17:43:55 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Wed Jan 27 16:41:26 2016 -0500
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 9 +--------
Allura/allura/templates/jinja_master/master.html | 9 +++++++--
Allura/allura/templates/jinja_master/theme_macros.html | 2 +-
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c871d60f/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index fbda348..22998cf 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2133,13 +2133,6 @@ a.sidebar-disabled:focus {
height: 48px;
vertical-align: middle;
}
-.neighborhood_icon_left {
- float: left;
- margin-right: 0.5em;
- width: 48px;
- height: 48px;
- vertical-align: middle;
-}
.neighborhood_block {
margin-bottom: 10px;
@@ -2149,7 +2142,7 @@ a.sidebar-disabled:focus {
.neighborhood_title {
float: right;
- text-align: end;
+ text-align: right;
padding-top: 0.4rem;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/c871d60f/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index dbb6dae..f4ec78f 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -88,11 +88,16 @@
{{ theme_macros.site_notification() }}
{% set flash = tg.flash_obj.render('flash', use_js=False) %}
<section id="page-body" class="{{ g.document_class(neighborhood) }}">
- <div id="nav_menu_holder">
+<div id="nav_menu_holder">
+ {% if c.project and c.project.is_nbhd_project %}
+ {% set neighborhood=c.project.neighborhood %}
+ {% include 'allura:templates/jinja_master/neigh_nav_menu.html' with context %}
+ {% else %}
{% block nav_menu %}
{% include g.theme.nav_menu %}
{% endblock %}
- </div>
+ {% endif %}
+</div>
<div id="top_nav" class="">
{% block top_nav %}
{% include g.theme.top_nav %}
http://git-wip-us.apache.org/repos/asf/allura/blob/c871d60f/Allura/allura/templates/jinja_master/theme_macros.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/theme_macros.html b/Allura/allura/templates/jinja_master/theme_macros.html
index 8ff8763..2518f58 100644
--- a/Allura/allura/templates/jinja_master/theme_macros.html
+++ b/Allura/allura/templates/jinja_master/theme_macros.html
@@ -141,8 +141,8 @@ http://stackoverflow.com/questions/26582731/redefining-imported-jinja-macros
View More Projects
</a>
</div>
- </div>
{% endif %}
+ </div>
</div>
{% endif %}
{%- endmacro %}