Merge remote-tracking branch 'origin/master' into issue-107

This commit is contained in:
Richard Underwood 2016-08-24 14:59:23 +01:00
commit ff8df5e5b2
2 changed files with 3 additions and 2 deletions

View file

@ -15,6 +15,7 @@ body, html {
border: 1px solid #DDD;
font-family: 'Segoe UI Semilight','Open Sans',Verdana,Arial,Helvetica,sans-serif;
font-weight: 300;
float: left;
font-size: 14px;
line-height: 1.3;
width: 10%;

View file

@ -173,8 +173,8 @@ if ($blocklogin === TRUE) {
?>
<div id="zones">
<?php if (is_adminuser() or $allowzoneadd === TRUE) { ?>
<div style="visibility: hidden;" id="ImportZone"></div>
<div style="visibility: hidden;" id="CloneZone"></div>
<div style="display: none;" id="ImportZone"></div>
<div style="display: none;" id="CloneZone"></div>
<?php } ?>
<div class="tables" id="MasterZones">
<div class="searchbar" id="searchbar">