Use flexbox more (#3035)

web/css/src/themes/dark.css

@@ -66,25 +66,13 @@ strong {
   padding: 13px 18px;
 }
 
-.l-profile {
-  overflow: hidden;
-  float: right;
-}
-
 .l-profile__logout {
   color: #e7e7e7 !important;
 }
 
-.l-profile__server {
-  color: #ceefff;
-  margin-top: 10px;
-  float: left;
-}
-
 .l-profile__notifications {
   color: #fff;
   font-weight: 600;
-  padding: 10px 5px 0;
   font-size: 1.2rem !important;
   line-height: 0.95rem;
   border-left: 1px solid transparent !important;
@@ -174,7 +162,6 @@ strong {
 }
 
 .card {
-  float: left;
   background: #454545;
   color: #fafafa;
   text-shadow: 0 1px rgb(0 0 0 / 95%) !important;
@@ -941,18 +928,11 @@ td.hint {
   color: #dadada !important;
 }
 
-form#vstobjects {
-
-}
-
 form#vstobjects.suspended {
   background-color: #282828;
 }
 
-.pill {
-}
-
-.pill.usage {
+.usage-pill {
   box-shadow: inset 0 1px 1px rgb(0 0 0 / 85%), 0 1px 1px rgb(0 0 0 / 20%);
   background-color: rgb(15 15 15 / 50%);
   border: 1px solid rgb(120 120 120 / 95%);
@@ -960,7 +940,9 @@ form#vstobjects.suspended {
   color: #909090;
 }
 
-.pill.usage b { color: #d8d8d8; }
+.usage-pill b {
+  color: #d8d8d8;
+}
 
 .badge {
   box-shadow:
@@ -984,7 +966,6 @@ form#vstobjects.suspended {
   box-shadow: 0 1px 2px rgb(25 25 25 / 30%) !important;
 }
 
-.pill.gray,
 .badge.gray {
   border: 1px solid #181818;
   background-color: #252525;
@@ -992,42 +973,34 @@ form#vstobjects.suspended {
   text-shadow: 0 1px rgb(0 0 0 / 70%) !important;
 }
 
-.pill.blue,
 .badge.blue {
 
 }
 
-.pill.purple,
 .badge.purple {
 
 }
 
-.pill.teal,
 .badge.teal {
 
 }
 
-.pill.maroon,
 .badge.maroon {
   background-color: #ff3478;
 }
 
-.pill.red,
 .badge.red {
 
 }
 
-.pill.orange,
 .badge.orange {
 
 }
 
-.pill.green,
 .badge.green {
 
 }
 
-.pill.lightblue,
 .badge.lightblue {
 
 }

web/css/src/themes/default.css

@@ -255,16 +255,13 @@ table {
 .l-center {
   margin: 0 auto;
   max-width: 1020px;
-  min-width: 1020px;
 }
 
 .l-logo {
   background-image: url("/images/logo-header.svg");
   background-repeat: no-repeat;
-  float: left;
-  height: 28px;
-  margin-top: 5px;
   width: 54px;
+  height: 28px;
 }
 
 .l-header {
@@ -273,19 +270,23 @@ table {
   overflow: hidden;
   position: fixed;
   width: 100%;
-  z-index: 900;
   height: 39px;
+  z-index: 900;
+  font-size: 0.8rem;
   text-shadow: 1px 1px rgb(0 0 0 / 25%);
   box-shadow: 0 4px 10px rgb(100 100 100 / 40%);
   border-bottom: 1px solid #fff;
 }
 
-.l-header a {
-  font-size: 0.8rem;
+.l-header__inner {
+  display: flex;
+  height: 100%;
+  justify-content: space-between;
 }
 
-.l-menu__item--active {
-  /* background-color: #fff; */
+.l-header__left {
+  display: flex;
+  align-items: center;
 }
 
 .l-menu__item.l-menu__item--active a {
@@ -302,21 +303,24 @@ table {
 }
 
 .l-menu {
-  float: left;
-  position: fixed;
-  margin-left: 70px;
+  display: flex;
+  align-self: stretch;
+  margin-left: 16px;
 }
 
 .l-menu__item {
-  float: left;
+  display: flex;
+  align-self: stretch;
   font-weight: 600;
 }
 
 .l-menu__item a {
   color: #f7f7f7;
+  display: flex;
+  align-items: center;
   position: relative;
-  line-height: 39px;
-  padding: 11px 10px;
+  padding-left: 10px;
+  padding-right: 10px;
   border-left: 1px solid transparent;
   border-right: 1px solid transparent;
 }
@@ -357,14 +361,13 @@ table {
 
 .panel-icon {
   font-size: 1rem;
-  vertical-align: middle;
-  margin-top: -4px;
   margin-right: 8px;
 }
 
 .l-profile {
+  display: flex;
+  align-items: center;
   overflow: hidden;
-  float: right;
 }
 
 .l-profile__username,
@@ -378,18 +381,11 @@ table {
   color: #dbf94e !important;
 }
 
-.l-profile__server {
-  color: #ceefff;
-  margin-top: 10px;
-  float: left;
-}
-
 .l-profile__notifications {
   color: #fff;
   cursor: pointer;
   font-weight: 600;
-  padding: 10px 5px 0;
-  font-size: 1.2rem !important;
+  font-size: 1.2rem;
   line-height: 0.95rem;
 }
 
@@ -606,7 +602,7 @@ table {
   text-decoration: underline;
 }
 
-.app-list.cards {
+.cards {
   display: flex;
   flex-wrap: wrap;
   justify-content: center;
@@ -618,12 +614,11 @@ table {
   border: 1px solid #d3d3d3;
   width: 200px;
   min-height: 260px;
-  margin: 1em;
+  margin: 0 1em 2em;
   padding-bottom: 0.5em;
   box-shadow: 0 1px 4px rgb(0 0 0 / 20%);
   color: #353535;
   border-radius: 4px;
-  text-align: center;
 }
 
 .card.disable {
@@ -926,6 +921,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 .l-sort-toolbar {
+  display: flex;
   text-transform: uppercase;
   font-size: 0.8rem;
 }
@@ -1050,10 +1046,18 @@ div.l-content > div.l-separator:nth-of-type(4) {
   color: #c36;
 }
 
+.l-unit-toolbar__buttonstrip {
+  display: flex;
+}
+
 .l-unit-toolbar__buttonstrip .button {
   min-width: 0;
   padding: 2px 10px;
-  margin-right: 5px;
+  margin-right: 8px;
+}
+
+.l-unit-toolbar__buttonstrip .button:last-child {
+  margin-right: 0;
 }
 
 .body-user .l-unit.animated.fadeIn {
@@ -2669,14 +2673,9 @@ form#vstobjects.suspended {
   background-color: #54a6e5;
 }
 
-.pill {
+.usage-pill {
   border-radius: 12px;
-  display: inline-block;
-  text-shadow: 0 1px 2px rgb(0 0 0 / 40%);
-}
-
-.pill.usage {
-  margin-top: 8px;
+  display: flex;
   font-size: 0.75rem;
   padding: 4px;
   padding-left: 8px;
@@ -2691,10 +2690,16 @@ form#vstobjects.suspended {
   color: #30659d;
 }
 
-.pill.usage b { color: #30659d; }
+.usage-pill b {
+  color: #30659d;
+}
 
-.label-space-right {
-  margin-right: 8px;
+.usage-pill__item {
+  margin-right: 11px;
+}
+
+.usage-pill__item:last-child {
+  margin-right: 0;
 }
 
 .badge {
@@ -2729,7 +2734,6 @@ form#vstobjects.suspended {
   box-shadow: 0 1px 2px rgb(120 120 120 / 30%) !important;
 }
 
-.pill.gray,
 .badge.gray {
   border: 1px solid #fff;
   background-color: #eaeaea;
@@ -2737,56 +2741,48 @@ form#vstobjects.suspended {
   text-shadow: 0 1px #fafafa !important;
 }
 
-.pill.blue,
 .badge.blue {
   border: 1px solid #fff;
   background-color: #316198;
   color: #fff;
 }
 
-.pill.purple,
 .badge.purple {
   border: 1px solid #fff;
   background-color: #8e2fca;
   color: #fff;
 }
 
-.pill.teal,
 .badge.teal {
   border: 1px solid #fff;
   background-color: #3cc;
   color: #fff;
 }
 
-.pill.maroon,
 .badge.maroon {
   border: 1px solid #fff;
   background-color: #c36;
   color: #fff;
 }
 
-.pill.red,
 .badge.red {
   border: 1px solid #fff;
   background-color: #f33;
   color: #fff;
 }
 
-.pill.orange,
 .badge.orange {
   border: 1px solid #fff;
   background-color: #f6a800;
   color: #fff;
 }
 
-.pill.green,
 .badge.green {
   border: 1px solid #fff;
   background-color: #53ba55;
   color: #fff;
 }
 
-.pill.lightblue,
 .badge.lightblue {
   border: 1px solid #fff;
   background-color: #6eb6f0;
@@ -3214,7 +3210,7 @@ li[aria-expanded="true"] a {
 }
 
 .icon-server-info {
-  font-size: 5.2em;
+  font-size: 5.4em;
   float: left;
   margin-right: 32px;
   margin-left: 2px;
@@ -3382,18 +3378,6 @@ li[aria-expanded="true"] a {
   display: none !important;
 }
 
-.u-inline-block {
-  display: inline-block !important;
-}
-
-.u-float-left {
-  float: left !important;
-}
-
-.u-float-right {
-  float: right !important;
-}
-
 .u-noselect {
   user-select: none !important;
 }

web/css/src/themes/flat.css

@@ -160,7 +160,7 @@ strong {
   box-shadow: none;
 }
 
-.pill.usage {
+.usage-pill {
   box-shadow: none;
 }
 

web/css/src/themes/vestia.css

@@ -188,10 +188,6 @@ strong {
   box-shadow: none;
 }
 
-.pill.usage {
-  box-shadow: none;
-}
-
 .badge {
   box-shadow: none;
 }
@@ -225,23 +221,19 @@ strong {
   border-radius: 0;
 }
 
-.pill {
+.usage-pill {
   border-radius: 4px;
-}
-
-.pill.usage b {
-  color: #fff;
-}
-
-.pill.usage {
   color: #fafafa;
-  margin-top: 8px;
   line-height: 0.8em;
   text-shadow: none;
-  padding: 5px !important;
-  border: none !important;
-  background: none !important;
-  box-shadow: none !important;
+  padding: 5px;
+  border: none;
+  background: none;
+  box-shadow: none;
+}
+
+.usage-pill b {
+  color: #fff;
 }
 
 .l-menu__item.l-menu__item--active a {
@@ -435,7 +427,6 @@ strong {
   background: none !important;
 }
 
-.pill.gray,
 .badge.gray {
   border: 1px solid rgb(255 255 255 / 40%) !important;
 }
@@ -518,8 +509,7 @@ a#btn-back:focus {
 }
 
 .l-logo {
-  height: 24px !important;
-  margin-top: 8px !important;
+  height: 24px;
 }
 
 .mail-infoblock {

web/js/app.js

@@ -176,7 +176,7 @@ Date.prototype.format = function (mask, utc) {
 };
 
 
-/*
+/*
  * http://code.google.com/p/flexible-js-formatting/
  *
  * Copyright (C) 2004 Baron Schwartz <baron at sequent dot org>

web/js/init.js

@@ -705,4 +705,4 @@ function randomString2(length = 16) {
       throw new Error("tried a million times, something is wrong");
     }
   }
-};
+}

web/js/pages/add_mail_acc.js

@@ -131,7 +131,7 @@ generate_mail_credentials = function() {
     var pass=$('#v_password').text();
     var output = div.text();
     output=output.replace(/(?:\r\n|\r|\n|\t)/g, "|");
-    output=output.replace(/  /g, "");
+    output=output.replace(/ {2}/g, "");
     output=output.replace(/\|\|/g, "|");
     output=output.replace(/\|\|/g, "|");
     output=output.replace(/\|\|/g, "|");

web/js/pages/edit_mail.js

@@ -2,14 +2,14 @@ App.Actions.MAIL.toggle_letsencrypt = function(elm) {
     if ($(elm).prop('checked')) {
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
         $('#generate-csr').hide();
-	if(!$('.lets-encrypt-note').hasClass('enabled')){
-	    $('.lets-encrypt-note').show();
-	}
+    if(!$('.lets-encrypt-note').hasClass('enabled')){
+        $('.lets-encrypt-note').show();
+    }
     }
     else {
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
         $('#generate-csr').show();
-	$('.lets-encrypt-note').hide();
+    $('.lets-encrypt-note').hide();
     }
 }
 

web/js/pages/edit_mail_acc.js

@@ -123,7 +123,7 @@ generate_mail_credentials = function() {
     if (pass=="") div.find('#v_password').text(' ');
     var output = div.text();
     output=output.replace(/(?:\r\n|\r|\n|\t)/g, "|");
-    output=output.replace(/  /g, "");
+    output=output.replace(/ {2}/g, "");
     output=output.replace(/\|\|/g, "|");
     output=output.replace(/\|\|/g, "|");
     output=output.replace(/\|\|/g, "|");

web/js/pages/edit_web.js

@@ -190,15 +190,15 @@ App.Actions.WEB.toggle_letsencrypt = function(elm) {
         $('#ssl-details').hide();
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').attr('disabled', 'disabled');
         $('#generate-csr').hide();
-	if(!$('.lets-encrypt-note').hasClass('enabled')){
-	    $('.lets-encrypt-note').show();
-	}
+    if(!$('.lets-encrypt-note').hasClass('enabled')){
+        $('.lets-encrypt-note').show();
+    }
     }
     else {
         $('#ssltable textarea[name=v_ssl_crt],#ssltable textarea[name=v_ssl_key], #ssltable textarea[name=v_ssl_ca]').removeAttr('disabled');
         $('#generate-csr').show();
         $('#ssl-details').show();
-	$('.lets-encrypt-note').hide();
+    $('.lets-encrypt-note').hide();
     }
 }
 

web/templates/includes/panel.html

@@ -7,46 +7,48 @@
 </a>
 
 <div class="l-header">
-  <div class="l-center">
-    <!-- Logo / Home Button -->
-    <a href="<?=htmlspecialchars($home_url)?>" class="l-logo" title="<?=_('Hestia Control Panel');?>"></a>
-
-    <!-- Left Menu -->
-    <div class="l-menu clearfix u-noselect">
-      <!-- Records tab -->
-      <div class="l-menu__item <?php if(in_array($TAB, ['WEB', 'DNS', 'MAIL', 'DB', 'BACKUP', 'CRON', 'PACKAGE', 'USER', 'LOG'])) echo 'l-menu__item--active' ?>"><a href="<?=htmlspecialchars($home_url)?>"><i class="fas fa-tasks panel-icon"></i><?=_('Records');?></a></div>
-
-      <!-- File Manager tab -->
-      <?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
-        <?php if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look']) && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'yes'))) {?>
-            <!-- Hide file manager when impersonating admin-->
-          <?php } else { ?>
-            <div class="l-menu__item <?php if($TAB == 'FM') echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i><?=_('Files');?></a></div>
+  <div class="l-center l-header__inner">
+
+    <!-- Logo / Left Menu wrapper -->
+    <div class="l-header__left">
+      <!-- Logo / Home Button -->
+      <a href="<?=htmlspecialchars($home_url)?>" class="l-logo" title="<?=_('Hestia Control Panel');?>"></a>
+
+      <!-- Left Menu -->
+      <div class="l-menu clearfix u-noselect">
+        <!-- Records tab -->
+        <div class="l-menu__item <?php if(in_array($TAB, ['WEB', 'DNS', 'MAIL', 'DB', 'BACKUP', 'CRON', 'PACKAGE', 'USER', 'LOG'])) echo 'l-menu__item--active' ?>"><a href="<?=htmlspecialchars($home_url)?>"><i class="fas fa-tasks panel-icon"></i><?=_('Records');?></a></div>
+
+        <!-- File Manager tab -->
+        <?php if ((isset($_SESSION['FILE_MANAGER'])) && (!empty($_SESSION['FILE_MANAGER'])) && ($_SESSION['FILE_MANAGER'] == "true")) {?>
+          <?php if (($_SESSION['userContext'] === 'admin') && (isset($_SESSION['look']) && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] == 'yes'))) {?>
+              <!-- Hide file manager when impersonating admin-->
+            <?php } else { ?>
+              <div class="l-menu__item <?php if($TAB == 'FM') echo 'l-menu__item--active' ?>"><a href="/fm/"><i class="fas fa-folder-open panel-icon"></i><?=_('Files');?></a></div>
+          <?php } ?>
         <?php } ?>
-      <?php } ?>
 
-      <!-- Statistics tab-->
-      <div class="l-menu__item <?php if($TAB == 'STATS') echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i><?=_('Statistics');?></a></div>
+        <!-- Statistics tab-->
+        <div class="l-menu__item <?php if($TAB == 'STATS') echo 'l-menu__item--active' ?>"><a href="/list/stats/"><i class="fas fa-chart-line panel-icon"></i><?=_('Statistics');?></a></div>
+      </div>
     </div>
 
     <!-- Right Menu -->
     <div class="l-profile u-noselect">
-      <div class="l-menu__item">
-        <!-- Logged in as / Usage Statistics Overview -->
-        <span class="pill usage">
-          <?php
-            if (isset($_SESSION['look'])) {
-              $user_icon = 'fa-binoculars';
-            } else if ($_SESSION['userContext'] === 'admin') {
-              $user_icon = 'fa-user-tie';
-            } else {
-              $user_icon = 'fa-user';
-            }
-          ?>
-          <span class="label-space-right"><i class="fas <?=$user_icon;?> icon-pad-right" title="<?=_('Logged in as');?>: <?=htmlspecialchars($panel[$user]['NAME'])?>"></i><b><?=htmlspecialchars($user)?></b></span>
-          <span class="label-space-right"><i class="fas fa-hdd icon-pad-right" title="<?=_('Disk');?>: <?=humanize_usage_size($panel[$user]['U_DISK'])?> <?=humanize_usage_measure($panel[$user]['U_DISK'])?>"></i><b><?=humanize_usage_size($panel[$user]['U_DISK'])?></b> <?=humanize_usage_measure($panel[$user]['U_DISK'])?></span>
-          <span><i class="fas fa-exchange-alt icon-pad-right" title="<?=_('Bandwidth');?>: <?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?>"></i><b><?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?></span>
-        </span>
+      <!-- Logged in as / Usage Statistics Overview -->
+      <div class="usage-pill">
+        <?php
+          if (isset($_SESSION['look'])) {
+            $user_icon = 'fa-binoculars';
+          } else if ($_SESSION['userContext'] === 'admin') {
+            $user_icon = 'fa-user-tie';
+          } else {
+            $user_icon = 'fa-user';
+          }
+        ?>
+        <span class="usage-pill__item"><i class="fas <?=$user_icon;?> icon-pad-right" title="<?=_('Logged in as');?>: <?=htmlspecialchars($panel[$user]['NAME'])?>"></i><b><?=htmlspecialchars($user)?></b></span>
+        <span class="usage-pill__item"><i class="fas fa-hdd icon-pad-right" title="<?=_('Disk');?>: <?=humanize_usage_size($panel[$user]['U_DISK'])?> <?=humanize_usage_measure($panel[$user]['U_DISK'])?>"></i><b><?=humanize_usage_size($panel[$user]['U_DISK'])?></b> <?=humanize_usage_measure($panel[$user]['U_DISK'])?></span>
+        <span class="usage-pill__item"><i class="fas fa-exchange-alt icon-pad-right" title="<?=_('Bandwidth');?>: <?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?>"></i><b><?=humanize_usage_size($panel[$user]['U_BANDWIDTH'])?></b> <?=humanize_usage_measure($panel[$user]['U_BANDWIDTH'])?></span>
       </div>
 
       <!-- Notifications -->

web/templates/pages/add_access_key.html

@@ -6,7 +6,7 @@
         <i class="fas fa-arrow-left status-icon blue"></i><?= _('Back'); ?>
       </a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects">
         <i class="fas fa-save status-icon purple"></i><?= _('Save'); ?>
       </a>

web/templates/pages/add_cron.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_db.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_dns.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_dns_rec.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_firewall.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_firewall_banlist.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/banlist/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_firewall_ipset.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/ipset/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_ip.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_key.html

@@ -8,7 +8,7 @@
         <a class="button button-secondary" id="btn-back" href="/list/key/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_mail.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_mail_acc.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_package.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_user.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/user/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/add_web.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <?php if (($user_plain == 'admin') && (($_GET['accept'] === "true")) || ($user_plain !== "admin")) {?>
         <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
       <?php } ?>

web/templates/pages/edit_backup_exclusions.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/backup/exclusions/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_cron.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/cron/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_db.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/db/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_dns.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_dns_rec.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/dns/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_firewall.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/firewall/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_ip.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/ip/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_mail.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_mail_acc.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/mail/?domain=<?=htmlentities(trim($v_domain, "'"))?>&token=<?=$_SESSION['token']?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_package.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/package/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server.html

@@ -8,7 +8,7 @@
         <a href="/list/firewall/" class="button button-secondary"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
       <?php }?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_bind9.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_dovecot.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_httpd.html

@@ -5,7 +5,7 @@
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/server/php/" class="button button-secondary"><i class="fas fa-pencil-alt status-icon orange"></i><?=_('Configure');?> PHP</a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_mysql.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_nginx.html

@@ -5,7 +5,7 @@
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <a href="/edit/server/php/" class="button button-secondary"><i class="fas fa-pencil-alt status-icon orange"></i> <?=_('Configure');?> PHP</a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_pgsql.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_php.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_server_service.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/server/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="#" class="button" data-action="submit" data-id="vstobjects"><i class="fas fa-save status-icon purple"></i><?=_('Save');?></a>
     </div>
   </div>

web/templates/pages/edit_user.html

@@ -24,7 +24,7 @@
         <a href="<?=$keys_url; ?>" class="button button-secondary" id="btn-create" title="<?=_('Access Keys');?>"><i class="fas fa-key status-icon purple"></i><?=_('Access Keys');?></a>
       <?php } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <?php if (($_SESSION['user'] == $v_username) || (isset($_SESSION['look']))) {?>
         <!-- Do not show delete button for currently logged in user-->
       <?} else {?>

web/templates/pages/edit_web.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/list/web/"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="/delete/web/cache/?domain=<?=htmlentities($v_domain);?>&token=<?=$_SESSION['token'];?>" class="button button-secondary <?php if ( $v_nginx_cache == 'yes' || (($v_proxy_template == 'caching' || is_int(strpos($v_proxy_template, 'caching-'))) && $_SESSION['PROXY_SYSTEM'] == 'nginx')) { echo "block"; } else{ echo "u-hidden"; }?>" id="v-clear-cache">
         <i class="fas fa-trash status-icon red"></i><?=_('Purge Nginx Cache');?>
       </a>

web/templates/pages/generate_ssl.html

@@ -1,6 +1,6 @@
 <div class="l-center">
   <div class="l-sort">
-    <div class="l-sort-toolbar clearfix u-float-left">
+    <div class="l-sort-toolbar">
       <?php show_alert_message($_SESSION);?>
     </div>
   </div>

web/templates/pages/list_log.html

@@ -28,13 +28,13 @@
       <?php }
       } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-redo status-icon green"></i><?=_('Refresh');?></a>
       <?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
         <!-- Hide delete buttons-->
       <?php } else { ?>
         <?php if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
-          <div class="actions-panel u-inline-block" key-action="js">
+          <div class="actions-panel" key-action="js">
             <a class="data-controls do_delete button button-secondary button-danger">
               <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete');?>
               <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user']))) {?>

web/templates/pages/list_log_auth.html

@@ -8,13 +8,13 @@
         <a href="/list/log/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
       <?php } ?>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <a href="javascript:location.reload();" class="button button-secondary"><i class="fas fa-redo status-icon green"></i><?=_('Refresh');?></a>
       <?php if (($_SESSION['userContext'] === 'admin') && ($_SESSION['look'] === 'admin') && ($_SESSION['POLICY_SYSTEM_PROTECTED_ADMIN'] === 'yes')) {?>
         <!-- Hide delete buttons-->
       <?php } else { ?>
         <?php if (($_SESSION['userContext'] === 'admin') || (($_SESSION['userContext'] === 'user') && ($_SESSION['POLICY_USER_DELETE_LOGS'] !== 'no'))) {?>
-          <div class="actions-panel u-inline-block" key-action="js">
+          <div class="actions-panel" key-action="js">
             <a class="data-controls do_delete button button-secondary button-danger">
               <i class="do_delete fas fa-times-circle status-icon red"></i><?=_('Delete');?>
               <?php if (($_SESSION['userContext'] === 'admin') && (isset($_GET['user']))) {?>

web/templates/pages/list_server_preview.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a href="/edit/server/" class="button button-secondary" id="btn-back"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
     </div>
   </div>
 </div>

web/templates/pages/list_services.html

@@ -9,7 +9,7 @@
       <a href="/list/firewall/" class="button button-secondary"><i class="fas fa-shield-alt status-icon red"></i><?=_('Firewall');?></a>
       <?php }?>
       <a href="/list/log/?user=system&token=<?=$_SESSION['token']?>" class="button button-secondary"><i class="fas fa-binoculars status-icon orange"></i><?=_('Logs');?></a>
-      <div class="actions-panel u-inline-block" key-action="js">
+      <div class="actions-panel" key-action="js">
         <a class="data-controls do_servicerestart button button-secondary button-danger">
           <i class="do_servicerestart fas fa-undo status-icon red"></i><?=_('Restart');?>
           <input type="hidden" name="servicerestart_url" value="/restart/system/?hostname=<?=$sys['sysinfo']['HOSTNAME'] ?>&token=<?=$_SESSION['token']?>&system_reset_token=<?=time(); ?>">

web/templates/pages/list_ssl.html

@@ -1,7 +1,7 @@
 <!-- Begin toolbar -->
 <div class="l-center">
   <div class="l-sort">
-    <div class="l-sort-toolbar clearfix u-float-left">
+    <div class="l-sort-toolbar clearfix">
 
     </div>
   </div>

web/templates/pages/list_webapps.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/edit/web/?domain=<?=htmlentities($v_domain)?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
     </div>
   </div>
 </div>
@@ -37,7 +37,7 @@
       </span>
     </div>
   </div>
-  <div class="app-list cards u-mb20">
+  <div class="cards">
     <!-- List available web apps -->
     <?php foreach($v_web_apps as $webapp):?>
       <div class="card <?=($webapp['enabled'] ? '' : 'disable');?>">

web/templates/pages/setup_webapp.html

@@ -4,7 +4,7 @@
     <div class="l-unit-toolbar__buttonstrip">
       <a class="button button-secondary" id="btn-back" href="/add/webapp/?domain=<?=htmlentities($v_domain);?>"><i class="fas fa-arrow-left status-icon blue"></i><?=_('Back');?></a>
     </div>
-    <div class="l-unit-toolbar__buttonstrip u-float-right">
+    <div class="l-unit-toolbar__buttonstrip">
       <?php
         if (!empty($_SESSION['error_msg'])) {
           echo "<p class=\"vst-error\"> → ".htmlentities($_SESSION['error_msg'])."</p>";