Layout fixes for smaller resolutions

LiveHelperChat · Nov 19, 2020 · 72753b0 · 72753b0
1 parent cbe3f01
commit 72753b0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/lhc_web/design/defaulttheme/css/app.css b/lhc_web/design/defaulttheme/css/app.css
@@ -55,7 +55,11 @@ a.link {
 }
 
 .container-fluid,
-.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-1, .col-10, .col-11, .col-12, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9 {
+.col-lg-1, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9,
+.col-xl-1, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9,
+.col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9,
+.col-sm-1, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9,
+.col-1, .col-10, .col-11, .col-12, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9 {
 	padding-left:7.5px;
 	padding-right:7.5px;
 }

diff --git a/lhc_web/design/defaulttheme/css/css_static/30dc84470e88171e4fca9847c8266705.css b/lhc_web/design/defaulttheme/css/css_static/30dc84470e88171e4fca9847c8266705.css
diff --git a/lhc_web/design/defaulttheme/css/css_static/520698f54a44f8d39fb59228eb9aa54c.css b/lhc_web/design/defaulttheme/css/css_static/520698f54a44f8d39fb59228eb9aa54c.css
diff --git a/lhc_web/design/defaulttheme/tpl/lhuser/userlist.tpl.php b/lhc_web/design/defaulttheme/tpl/lhuser/userlist.tpl.php
@@ -7,7 +7,7 @@
 	$canDelete = $currentUser->hasAccessTo('lhuser','deleteuser');
 	$canLoginAs = $currentUser->hasAccessTo('lhuser','loginas');
 ?>
-<table class="table" cellpadding="0" cellspacing="0" width="100%">
+<table class="table table-sm" cellpadding="0" cellspacing="0" width="100%">
 <thead>
 <tr>
     <th width="1%">ID</th>
@@ -39,7 +39,7 @@
         <td><?php echo $user->lastactivity_ago?> ago</td>
         <?php include(erLhcoreClassDesign::designtpl('lhuser/userlist/column_data_multiinclude.tpl.php')); ?>
         <?php if ($canLoginAs) : ?>
-            <td><a class="btn btn-secondary btn-xs" href="<?php echo erLhcoreClassDesign::baseurl('user/loginas')?>/<?php echo $user->id?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('user/userlist','Login As');?></a></td>
+            <td nowrap=""><a class="btn btn-secondary btn-xs" href="<?php echo erLhcoreClassDesign::baseurl('user/loginas')?>/<?php echo $user->id?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('user/userlist','Login As');?></a></td>
         <?php endif;?>
         <?php if ($canEdit) : ?><td><a class="btn btn-secondary btn-xs" href="<?php echo erLhcoreClassDesign::baseurl('user/edit')?>/<?php echo $user->id?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('user/userlist','Edit');?></a></td><?php endif;?>
         <?php if ($canDelete) : ?><td><?php if ($user->id != 1) : ?><a class="btn btn-danger btn-xs csfr-required" onclick="return confirm('<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('kernel/messages','Are you sure?');?>')" href="<?php echo erLhcoreClassDesign::baseurl('user/delete')?>/<?php echo $user->id?>"><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('user/userlist','Delete');?></a><?php endif;?></td><?php endif;?>

diff --git a/lhc_web/design/defaulttheme/tpl/pagelayouts/main.php b/lhc_web/design/defaulttheme/tpl/pagelayouts/main.php
@@ -22,7 +22,7 @@
 
         <div class="row">
 
-            <div id="middle-column-page" class="col-sm-<?php $canUseChat == true && (!isset($Result['hide_right_column']) || $Result['hide_right_column'] == false) ? print '8' : print '12'; ?> col-md-<?php $canUseChat == true && (!isset($Result['hide_right_column']) || $Result['hide_right_column'] == false) ? print '9' : print '12'; ?> pb-1">
+            <div id="middle-column-page" class="col-xl-<?php $canUseChat == true && (!isset($Result['hide_right_column']) || $Result['hide_right_column'] == false) ? print '9' : print '12'; ?> pb-1">
             	<?php echo $Result['content']; ?>
             </div>
 
@@ -32,7 +32,7 @@
             $closedTabEnabled = (int)erLhcoreClassModelUserSetting::getSetting('enable_close_list',0);
             $mchatsTabEnabled = (int)erLhcoreClassModelUserSetting::getSetting('enable_mchats_list',1);
             $unreadTabEnabled = (int)erLhcoreClassModelUserSetting::getSetting('enable_unread_list',1); ?>
-            <div class="columns col-sm-4 col-md-3 right-column-page-general" id="right-column-page" ng-cloak>
+            <div class="columns col-xl-3 right-column-page-general" id="right-column-page" ng-cloak>
 
                 <?php include(erLhcoreClassDesign::designtpl('lhchat/lists_panels/transfer_panel_container_pre.tpl.php'));?>