1
0
mirror of https://github.com/Hutchy68/pivot.git synced 2024-11-21 18:09:03 +01:00

Sidebar update to output and pivot.css title fix

This commit is contained in:
MW install maintain even with core development 2018-02-15 09:32:33 -05:00
parent 8ae56081c1
commit aa36556cb9
2 changed files with 4 additions and 8 deletions

View File

@ -291,16 +291,13 @@ class pivotTemplate extends BaseTemplate {
function renderSidebar() { function renderSidebar() {
$sidebar = $this->getSidebar(); $sidebar = $this->getSidebar();
$toolbox = $this->getToolbox(); foreach ($sidebar as $boxName => $box) {
foreach ($sidebar as $boxName => $box) { if ( ($box['header'] != wfMessage( 'toolbox' )->text()) ) { echo '<div class="sidebar" id="'.Sanitizer::escapeId( $box['id'] ).'"';echo Linker::tooltip( $box['id'] ).'>';
echo '<li id='.Sanitizer::escapeId( $box['id'] ); Linker::tooltip( $box['id'] ).'>';
echo '<li><label>'.htmlspecialchars( $box['header'] ).'</label></li>'; echo '<li><label>'.htmlspecialchars( $box['header'] ).'</label></li>';
if ( is_array( $box['content'] ) ) { if ( is_array( $box['content'] ) ) {
foreach ($box['content'] as $key => $item) { echo $this->makeListItem($key, $item); } foreach ($box['content'] as $key => $item) { echo $this->makeListItem($key, $item); }
} }
} }
echo '<li><label>Toolbox</label></li>'; echo '</div>'; }
foreach ($toolbox as $key => $tbitem) { echo $this->makeListItem($key, $tbitem); }
} }
} }
?> ?>

View File

@ -847,7 +847,6 @@ span#nav-main {
.tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4 { .tab-bar h1, .tab-bar h2, .tab-bar h3, .tab-bar h4 {
font-size: 1.5em; font-size: 1.5em;
font-weight: 400; font-weight: 400;
line-height: 1.8em;
} }
section.right-small { section.right-small {
border-left: none; border-left: none;