Nm resize fix:

- Fix dataview grid resize not taking care of category color border
- Fix Category borders make headers misaligned
This commit is contained in:
Hadi Nategh 2016-05-11 16:33:54 +00:00
parent 16bf89faa6
commit d290485058
13 changed files with 33 additions and 7 deletions

View File

@ -119,3 +119,4 @@ select#addressbook-index_col_filter\[tid\] {
float: right; float: right;
width: 134px; width: 134px;
} }
#addressbook-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}

View File

@ -134,6 +134,9 @@ select#addressbook-index_col_filter\[tid\] {
float: right; float: right;
width: 134px; width: 134px;
} }
#addressbook-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid transparent;
}
@media all { @media all {
/* ############################################################################# /* #############################################################################

View File

@ -65,9 +65,6 @@
<column width="100%"/> <column width="100%"/>
</columns> </columns>
<rows> <rows>
<row class="dialogHeader">
<description value="Access control" class=""/>
</row>
<row> <row>
<nextmatch id="nm" template="admin.acl.rows" header_left="admin.acl.add" height="400"/> <nextmatch id="nm" template="admin.acl.rows" header_left="admin.acl.add" height="400"/>
</row> </row>

View File

@ -168,3 +168,4 @@ select#admin-mailaccount_ident_id {
font-weight: bold; font-weight: bold;
font-size: 110%; font-size: 110%;
} }
#admin-acl {width:99%;}

View File

@ -18,7 +18,7 @@
* @package etemplate * @package etemplate
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker@outdoor-training.de> * @author Ralf Becker <RalfBecker@outdoor-training.de>
* @version $Id: app.css 55790 2016-04-20 18:52:55Z ralfbecker $ * @version $Id: app.css 55801 2016-04-21 16:39:59Z ralfbecker $
*/ */
.admin_tree table, .admin_tree table,
.admin_tree tr, .admin_tree tr,
@ -174,6 +174,9 @@ select#admin-mailaccount_ident_id {
font-weight: bold; font-weight: bold;
font-size: 110%; font-size: 110%;
} }
#admin-acl {
width: 99%;
}
@media all { @media all {
div.dhtmlxTree td.standartTreeRow span.selectedTreeRow { div.dhtmlxTree td.standartTreeRow span.selectedTreeRow {
background-color: #ffdd73; background-color: #ffdd73;

View File

@ -163,6 +163,9 @@ var et2_dataview = (function(){ "use strict"; return Class.extend({
{ {
this.width = _w; this.width = _w;
// Take grid header border's width into account. eg. category colors may add extra pixel into width
_w = _w - (this.thead.find('tr').outerWidth() - this.thead.find('tr').innerWidth());
// Rebuild the column stylesheets // Rebuild the column stylesheets
this.columnMgr.setTotalWidth(_w - this.scrollbarWidth); this.columnMgr.setTotalWidth(_w - this.scrollbarWidth);
this._updateColumns(); this._updateColumns();

View File

@ -95,4 +95,6 @@ div#infolog-edit_infolog-edit-description {
#infolog-index select#infolog-index_filter { #infolog-index select#infolog-index_filter {
width: 150px; width: 150px;
} }
#infolog_edit_info_responsible_chzn { width:99% !important;} #infolog_edit_info_responsible_chzn { width:99% !important;}
#infolog-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}

View File

@ -163,6 +163,9 @@ div#infolog-edit_infolog-edit-description {
#infolog_edit_info_responsible_chzn { #infolog_edit_info_responsible_chzn {
width: 99% !important; width: 99% !important;
} }
#infolog-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid transparent;
}
/*########################################### /*###########################################
# # # #
# dialogHeader # # dialogHeader #

View File

@ -877,4 +877,6 @@ div.mailComposeHeaderSection>table {
font-size: 12pt; font-size: 12pt;
vertical-align: middle; vertical-align: middle;
} }
.sieve-title .ruleID::before {content:'#'} .sieve-title .ruleID::before {content:'#'}
#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}

View File

@ -862,6 +862,9 @@ div.mailComposeHeaderSection > table {
.sieve-title .ruleID::before { .sieve-title .ruleID::before {
content: '#'; content: '#';
} }
#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid transparent;
}
#popupMainDiv { #popupMainDiv {
padding: 5px; padding: 5px;
} }

View File

@ -850,6 +850,9 @@ div.mailComposeHeaderSection > table {
.sieve-title .ruleID::before { .sieve-title .ruleID::before {
content: '#'; content: '#';
} }
#mail-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid transparent;
}
#popupMainDiv { #popupMainDiv {
padding: 5px; padding: 5px;
} }

View File

@ -24,4 +24,6 @@
{ {
display: inline-block; display: inline-block;
float: left; float: left;
} }
#timesheet-index_nm.et2_nextmatch .egwGridView_outer thead tr {border-left: 12px solid transparent;}

View File

@ -33,6 +33,9 @@
display: inline-block; display: inline-block;
float: left; float: left;
} }
#timesheet-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid transparent;
}
/*########################################### /*###########################################
# # # #
# dialogHeader # # dialogHeader #