Commit 67549e60 authored by Aaron Wells's avatar Aaron Wells Committed by Gerrit Code Review
Browse files

Merge "Changing separating | to be border line (Bug 1279996)"

parents a17f0f8c b8e2fde5
......@@ -1296,6 +1296,9 @@ table.mceLayout td.mceToolbar td {
display: block;
margin-bottom: 10px;
}
#right-nav li.settings {
border-left: none;
}
#usf {
float: none;
clear: both;
......
......@@ -198,6 +198,12 @@ form.oneline.inline div,
.nojs-hidden-table-cell {
display: none;
}
.bar-before {
border-left: 1px solid #D1D1D1;
}
#footer-nav .bar-before {
border-left: 1px solid #5B5C5C;
}
/******************** Loading ********************/
#loading-box {
background-color: #DDDDDD;
......
......@@ -29,7 +29,7 @@
displaying them on your site to spread the word! -->
<div id="footer-nav">
{foreach from=$FOOTERMENU item=item name=footermenu}
{if !$.foreach.footermenu.first}| {/if}<a href="{$item.url}">{$item.title}</a>
{if !$.foreach.footermenu.first}<span class="bar-before">{/if}<a href="{$item.url}">{$item.title}</a>{if !$.foreach.footermenu.first}</span>{/if}
{/foreach}
</div>
<!-- there is a div id="performance-info" wrapping this -->{mahara_performance_info}
......
......@@ -4,9 +4,9 @@
{if $LOGGEDIN} <li class="identity"><a href="{profile_url($USER)}">{$USER|display_default_name}</a></li>{/if}
{if $RIGHTNAV}
{foreach from=$RIGHTNAV item=item}
<li class="{$item.path}{if $item.selected}{assign var=MAINNAVSELECTED value=$item} selected{/if}"> | <a href="{if $item.wwwroot}{$item.wwwroot}{else}{$WWWROOT}{/if}{$item.url}">{if $item.title}{$item.title}{/if}{if $item.icon}<img src="{$item.icon}" alt="{$item.alt}">{if isset($item.count)}<span class="navcount{if $item.countclass} {$item.countclass}{/if}">{$item.count}</span>{/if}</a></li>
<li class="{$item.path}{if $item.selected}{assign var=MAINNAVSELECTED value=$item} selected{/if} bar-before"><a href="{if $item.wwwroot}{$item.wwwroot}{else}{$WWWROOT}{/if}{$item.url}">{if $item.title}{$item.title}{/if}{if $item.icon}<img src="{$item.icon}" alt="{$item.alt}">{if isset($item.count)}<span class="navcount{if $item.countclass} {$item.countclass}{/if}">{$item.count}</span>{/if}</a></li>
{/foreach}
<li class="btn-logout"> | <a href="{$WWWROOT}?logout" accesskey="l">{str tag="logout"}</a></li>
<li class="btn-logout bar-before"><a href="{$WWWROOT}?logout" accesskey="l">{str tag="logout"}</a></li>
{/if}
{/strip}
{if !$nosearch && !$LOGGEDIN && $languageform}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment