Merge branch 'main' into feature/user-roles

web/templates/admin/list_mail_dns.html

@@ -42,27 +42,27 @@ if (!empty($_SESSION['WEBMAIL_ALIAS'])) $v_webmail_alias = $_SESSION['WEBMAIL_AL
     <div class="l-unit animated fadeIn">
                     <div class="l-unit__col l-unit__col--right">
                       <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="mail.<?=htmlspecialchars($_GET['domain']);?>"/></b> </div>
-                    <div class="clearfix l-unit__stat-col--left text-center"><b>A</b></div>
-                    <div class="clearfix l-unit__stat-col--left text-center"><b>10</b></div>
-                    <div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
+                    <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>A</b></div>
+                    <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>10</b></div>
+                    <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
                     <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?php echo array_key_first($ips);?>"/></b></div>
               </div>
     </div>
     <div class="l-unit animated fadeIn">
                   <div class="l-unit__col l-unit__col--right">
                     <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=$v_webmail_alias;?>.<?=htmlspecialchars($_GET['domain']);?>"/></b> </div>
-                  <div class="clearfix l-unit__stat-col--left text-center"><b>A</b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
-                  <div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>A</b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
+                  <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
                   <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" value="<?php echo array_key_first($ips);?>"/></b></div>
             </div>
     </div>
     <div class="l-unit animated fadeIn">
           <div class="l-unit__col l-unit__col--right">
             <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="@"/></b> </div>
-          <div class="clearfix l-unit__stat-col--left text-center"><b>TXT</b></div>
-          <div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
-          <div class="clearfix l-unit__stat-col--left text-center"><b>14400</b></div>
+          <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
+          <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
+          <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>14400</b></div>
           <div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?php echo htmlspecialchars('"v=spf1 a mx ip4:'.array_key_first($ips).'; -all"');?>"/></b></div>
           </div>
     </div>
@@ -70,9 +70,9 @@ if (!empty($_SESSION['WEBMAIL_ALIAS'])) $v_webmail_alias = $_SESSION['WEBMAIL_AL
 <div class="l-unit animated fadeIn">
       <div class="l-unit__col l-unit__col--right">
         <div class="clearfix l-unit__stat-col--left wide-3"><b><input type="text" class="vst-input" style="width:200px !important;" value="<?=htmlspecialchars($key);?>"/></b></div>
-      <div class="clearfix l-unit__stat-col--left text-center"><b>TXT</b></div>
-      <div class="clearfix l-unit__stat-col--left text-center"><b>&nbsp;</b></div>
-      <div class="clearfix l-unit__stat-col--left text-center"><b>3600</b></div>
+      <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>TXT</b></div>
+      <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>&nbsp;</b></div>
+      <div class="clearfix l-unit__stat-col--left text-center step-top-small"><b>3600</b></div>
       <div class="clearfix l-unit__stat-col--left  wide-3 "><b><input type="text" class="vst-input" value="<?=htmlspecialchars(str_replace("'",'"',$dkim[$key]['TXT']));?>"</b></div>
       </div>
 </div>

web/templates/admin/list_stats.html

@@ -227,6 +227,7 @@
 
             </table>
           </div>
+        </div>
           <!-- /.l-unit__stats -->
         </div>
         <!-- /.l-unit__col -->
@@ -244,7 +245,6 @@
         <div class="l-unit-ft">
           <table class='data'></table>
           <!-- /form -->
-          <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
               printf(ngettext('%d month', '%d months', $i),$i);

web/templates/user/list_stats.html

@@ -199,6 +199,7 @@
 
             </table>
           </div>
+          </div>
           <!-- /.l-unit__stats -->
         </div>
         <!-- /.l-unit__col -->
@@ -216,7 +217,6 @@
         <div class="l-unit-ft">
           <table class='data'></table>
           <!-- /form -->
-          <div class="l-unit__col l-unit__col--left clearfix"></div>
           <div class="data-count l-unit__col l-unit__col--right clearfix">
             <?php
               printf(ngettext('%d month', '%d months', $i),$i);