Get nextmatch column widths sorted out so column selector is visible, and columns line up with headers.

This commit is contained in:
nathangray 2016-05-25 11:54:46 -06:00
parent d772e459dd
commit bd6c45c845
12 changed files with 32 additions and 20 deletions

View File

@ -41,7 +41,7 @@ foreach($categories as $cat)
{
// Use slightly more specific selector that just class, to allow defaults
// if the category has no color
$content .= "tr.cat_{$cat['id']} {border-left:6px solid {$cat['data']['color']};} div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n";
$content .= ".egwGridView_scrollarea tr.cat_{$cat['id']} > td:first-child {border-left-color: {$cat['data']['color']};} div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n";
}
if (!empty($cat['data']['icon']))
{

View File

@ -537,11 +537,6 @@ which caused click on free space infront of a tag stops nm row selection*/
display: table-row;
}
/*Default cat color*/
tr.row_category {
border-left: 6px solid transparent;
}
/*
These are set via javascript before printing to help tame nextmatch's layout
for printing
@ -1393,8 +1388,16 @@ div.message.floating {
}
/* Allow space for category color indicators, preserving column calculations */
.egwGridView_outer thead tr {
border-left: 12px solid transparent;
.egwGridView_outer thead tr > th:first-child {
border-left: 6px solid transparent;
}
.egwGridView_scrollarea tr.row_category > td:first-child {
border-left: 6px solid transparent;
}
.egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {
margin-left:-6px;
margin-right: -4px;
padding-left: 4px;
}
/* Left & right headers*/

View File

@ -2245,7 +2245,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
}
else if($j(view.etemplates[0].DOMContainer).is(':visible'))
{
$j(view.etemplates[0].DOMContainer).css("width","100%");
$j(view.etemplates[0].DOMContainer).css("width","");
view.etemplates[0].widgetContainer.iterateOver(function(w) {
w.set_width('100%');
},this,et2_calendar_timegrid);

View File

@ -11,7 +11,7 @@
</hbox>
</template>
<template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004">
<grid width="100%">
<grid>
<columns>
<column width="125"/>
<column width="80%"/>
@ -102,7 +102,7 @@
</grid>
</template>
<template id="calendar.list" template="" lang="" group="0" version="1.9.003">
<grid width="100%">
<grid>
<columns>
<column/>
<column width="30%"/>

View File

@ -1407,6 +1407,10 @@ input#calendar-edit_location {
background-image: linear-gradient(top, #828282, #828282) !important;
background-repeat: repeat-x !important;
}
#calendar-list {
/* Keeps the scrollbar in the window in chrome */
margin-right: 10px;
}
#calendar_sidebox_content .egw_fw_ui_category_content {
padding-left: 0px !important;
}

View File

@ -25,6 +25,11 @@
}
#calendar-list {
/* Keeps the scrollbar in the window in chrome */
margin-right: 10px
}
// ************************************************
// Seitenleiste
// Ansichten

View File

@ -96,5 +96,3 @@ div#infolog-edit_infolog-edit-description {
width: 150px;
}
#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,9 +163,6 @@ div#infolog-edit_infolog-edit-description {
#infolog_edit_info_responsible_chzn {
width: 99% !important;
}
#infolog-index_nm.et2_nextmatch .egwGridView_outer thead tr {
border-left: 12px solid transparent;
}
/*###########################################
# #
# dialogHeader #

View File

@ -888,6 +888,10 @@ iframe#mail-display_mailDisplayBodySrc {
body {
background-color: white;
}
#mail-index {
/* Keeps the scrollbar in the window in chrome */
margin-right: -10px;
}
#mail-index div#mail-index_nm div.nextmatch_header div.filters select {
margin-top: 9px;
}

View File

@ -66,6 +66,9 @@ body {
#mail-index{
/* Keeps the scrollbar in the window in chrome */
margin-right: -10px;
table.egwGridView_grid{
// border-collapse: inherit;
// width: 99%;

View File

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