paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

master
andryyy 2019-10-25 08:34:05 +02:00
parent bdf56971d5 bfb000b2c0
commit 174c8458e2
8 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
data/web/css/build/008-mailcow.css
View File

@ -81,7 +81,7 @@
transform: rotate(359deg); transform: rotate(359deg);
} }
} }
pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;} pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}
.footable-sortable { .footable-sortable {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
@ -104,11 +104,11 @@ body {
max-width: 550px; max-width: 550px;
z-index: 2000; z-index: 2000;
} }
.input-group-sm .btn { margin-top: 0px !important } .input-group-sm .btn { margin-top: 0 !important }
legend { legend {
-webkit-user-select: none; -webkit-user-select: none;
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none -ms-user-select: none;
-o-user-select: none; -o-user-select: none;
user-select: none; user-select: none;
font-size: 12pt; font-size: 12pt;
@ -173,3 +173,8 @@ nav .glyphicon {
font-size: 12px; font-size: 12px;
line-height: 14px; line-height: 14px;
} }
.footer {
margin-top: 100px;
margin-bottom: 20px;
color: #959595;
}

2
data/web/css/site/admin.css
View File

@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
.pagination a { .pagination a {
text-decoration: none !important; text-decoration: none !important;
} }
.panel panel-default { .panel.panel-default {
overflow: visible !important; overflow: visible !important;
} }
.table-responsive { .table-responsive {

2
data/web/css/site/debug.css
View File

@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
.pagination a { .pagination a {
text-decoration: none !important; text-decoration: none !important;
} }
.panel panel-default { .panel.panel-default {
overflow: visible !important; overflow: visible !important;
} }
.table-responsive { .table-responsive {

2
data/web/css/site/edit.css
View File

@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
.pagination a { .pagination a {
text-decoration: none !important; text-decoration: none !important;
} }
.panel panel-default { .panel.panel-default {
overflow: visible !important; overflow: visible !important;
} }
.table-responsive { .table-responsive {

2
data/web/css/site/mailbox.css
View File

@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
.pagination a { .pagination a {
text-decoration: none !important; text-decoration: none !important;
} }
.panel panel-default { .panel.panel-default {
overflow: visible !important; overflow: visible !important;
} }
.table-responsive { .table-responsive {

7
data/web/css/site/quarantine.css
View File

@ -7,7 +7,7 @@ table.footable>tbody>tr.footable-empty>td {
text-decoration: none !important; text-decoration: none !important;
} }
.panel panel-default { .panel.panel-default {
overflow: visible !important; overflow: visible !important;
} }
@ -71,9 +71,9 @@ span#qid_detail_score {
span.rspamd-symbol { span.rspamd-symbol {
display: inline-block; display: inline-block;
margin: 2px 6px 2px 0px; margin: 2px 6px 2px 0;
border-radius: 4px; border-radius: 4px;
padding: 0px 7px; padding: 0 7px;
} }
span.rspamd-symbol.positive { span.rspamd-symbol.positive {
@ -103,7 +103,6 @@ span.mail-address-item {
border-radius: 4px; border-radius: 4px;
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 2px 7px; padding: 2px 7px;
margin-right: 7px;
display: inline-block; display: inline-block;
margin: 2px 6px 2px 0; margin: 2px 6px 2px 0;
} }

5
data/web/css/site/user.css
View File

@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
.pagination a { .pagination a {
text-decoration: none !important; text-decoration: none !important;
} }
.panel panel-default { .panel.panel-default {
overflow: visible !important; overflow: visible !important;
} }
.table-responsive { .table-responsive {
@ -25,7 +25,7 @@ table.footable>tbody>tr.footable-empty>td {
} }
.mass-actions-user { .mass-actions-user {
user-select: none; user-select: none;
padding:10px 0 10px 0; padding:10px 0;
} }
.inputMissingAttr { .inputMissingAttr {
border-color: #FF4136; border-color: #FF4136;
@ -33,7 +33,6 @@ table.footable>tbody>tr.footable-empty>td {
#logText { #logText {
white-space: pre-wrap; white-space: pre-wrap;
white-space: -moz-pre-wrap; white-space: -moz-pre-wrap;
white-space: -pre-wrap;
white-space: -o-pre-wrap; white-space: -o-pre-wrap;
word-wrap: break-word; word-wrap: break-word;
} }

23
data/web/inc/footer.inc.php
View File

@ -1,10 +1,7 @@
<?php <?php
require_once $_SERVER['DOCUMENT_ROOT'] . '/modals/footer.php'; require_once $_SERVER['DOCUMENT_ROOT'] . '/modals/footer.php';
logger(); logger();
?>
<div style="margin-bottom: 100px;"></div>
<?php
$hash = $js_minifier->getDataHash(); $hash = $js_minifier->getDataHash();
$JSPath = '/tmp/' . $hash . '.js'; $JSPath = '/tmp/' . $hash . '.js';
if(!file_exists($JSPath)) { if(!file_exists($JSPath)) {
@ -165,7 +162,7 @@ $(document).ready(function() {
}); });
// Reload after session timeout // Reload after session timeout
var session_lifetime = <?=(intval($SESSION_LIFETIME) * 1000) + 15000;?>; var session_lifetime = <?=((int)$SESSION_LIFETIME * 1000) + 15000;?>;
<?php <?php
if (isset($_SESSION['mailcow_cc_username'])): if (isset($_SESSION['mailcow_cc_username'])):
?> ?>
@ -183,16 +180,16 @@ $(document).ready(function() {
} }
}); });
</script> </script>
<?php
if (!empty($UI_TEXTS['ui_footer'])): <div class="container footer">
?> <?php
<div class="container" style="margin-bottom:20px;color:#959595;"> if (!empty($UI_TEXTS['ui_footer'])):
<hr> ?>
<?=$UI_TEXTS['ui_footer'];?> <hr><?=$UI_TEXTS['ui_footer'];?>
<?php
endif;
?>
</div> </div>
<?php
endif;
?>
</body> </body>
</html> </html>
<?php <?php