From 7d1f51118fbea05497f3090147773986b5d41c91 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Mon, 27 Jul 2020 10:24:39 +0800
Subject: [PATCH] * task #7372, bug #3196, fix datatable line height in
 firefox.

---
 module/common/view/datatable.html.php | 3 +--
 module/productplan/css/browse.css     | 3 ++-
 module/project/css/common.css         | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php
index 6427d87388..a6c9f4c883 100644
--- a/module/common/view/datatable.html.php
+++ b/module/common/view/datatable.html.php
@@ -4,7 +4,7 @@
 <?php if(!empty($lang->datatable)):?>
 <style>
 .datatable {margin-bottom: 0;}
-.datatable .table>tbody>tr>td, .datatable .table>thead>tr>th {line-height: 30px; padding-top: 2px; padding-bottom: 2px; height: 36px; vertical-align: middle; white-space: nowrap;}
+.datatable .table>tbody>tr>td, .datatable .table>thead>tr>th {line-height: 29px; padding-top: 2px; padding-bottom: 2px; height: 36px; vertical-align: middle; white-space: nowrap;}
 .datatable .table>tbody>tr.hover {box-shadow: none!important;}
 .datatable .flexarea .table-children,
 .datatable .fixed-left .table-children {border-right: none;}
@@ -122,4 +122,3 @@ $(document).ready(function()
 });
 </script>
 <?php endif;?>
-
diff --git a/module/productplan/css/browse.css b/module/productplan/css/browse.css
index 8af378e3e8..736d013716 100644
--- a/module/productplan/css/browse.css
+++ b/module/productplan/css/browse.css
@@ -6,10 +6,11 @@ td.c-branch{ overflow:hidden; text-align:left!important; text-overflow:ellipsis;
 .table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .task-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .task-toggle {color: #838a9d; position: relative; top: 1px; line-height: 16px;}
 .table td.has-child > .task-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .task-toggle > .icon:before {text-align: left;}
+.table td.has-child > .task-toggle.collapsed {top: 2px}
 .table td.has-child > .task-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}
diff --git a/module/project/css/common.css b/module/project/css/common.css
index 85f7091fc3..238fe47c85 100644
--- a/module/project/css/common.css
+++ b/module/project/css/common.css
@@ -14,10 +14,11 @@
 .table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
 .table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
 .table td.has-child > a:not(.task-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-.table td.has-child > .task-toggle {color: #838a9d; position: relative; top: 1px;}
+.table td.has-child > .task-toggle {color: #838a9d; position: relative; top: 1px; line-height: 16px;}
 .table td.has-child > .task-toggle:hover {color: #006af1; cursor: pointer;}
 .table td.has-child > .task-toggle > .icon {font-size: 16px; display: inline-block; transition: transform .2s; -ms-transform:rotate(-90deg); -moz-transform:rotate(-90deg); -o-transform:rotate(-90deg); -webkit-transform:rotate(-90deg); transform: rotate(-90deg);}
 .table td.has-child > .task-toggle > .icon:before {text-align: left;}
+.table td.has-child > .task-toggle.collapsed {top: 2px}
 .table td.has-child > .task-toggle.collapsed > .icon {-ms-transform:rotate(90deg); -moz-transform:rotate(90deg); -o-transform:rotate(90deg); -webkit-transform:rotate(90deg); transform: rotate(90deg);}
 .main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
 @-moz-document url-prefix() {.main-table tbody > tr.table-children > td:first-child::before {width: 4px;}}