Merge branch 'master' of github.com:shish/shimmie2

This commit is contained in:
Shish 2012-03-12 16:12:28 +00:00
commit 9f79e70f73
3 changed files with 3 additions and 2 deletions

View File

@ -45,7 +45,7 @@ class BaseThemelet {
return '<a href="'.$h_view_link.'" class="thumb">'. return '<a href="'.$h_view_link.'" class="thumb">'.
'<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'">'. '<img id="thumb_'.$i_id.'" title="'.$h_tip.'" alt="'.$h_tip.'" height="'.$tsize[1].'" width="'.$tsize[0].'" src="'.$h_thumb_link.'">'.
'</a>'; "</a>\n";
} }

View File

@ -55,7 +55,7 @@ class Block {
$h_toggler = $hidable ? " shm-toggler" : ""; $h_toggler = $hidable ? " shm-toggler" : "";
if(!is_null($h)) $html .= "<h3 data-toggle-sel='#$i' class='$h_toggler'>$h</h3>"; if(!is_null($h)) $html .= "<h3 data-toggle-sel='#$i' class='$h_toggler'>$h</h3>";
if(!is_null($b)) $html .= "<div class='blockbody'>$b</div>"; if(!is_null($b)) $html .= "<div class='blockbody'>$b</div>";
$html .= "</section>"; $html .= "</section>\n";
return $html; return $html;
} }
} }

View File

@ -5,4 +5,5 @@
box-shadow: none; box-shadow: none;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
text-align: justify;
} }