Fix Calendar alarm styling

This commit is contained in:
Hadi Nategh 2014-06-04 07:32:17 +00:00
parent 0d9e9553b3
commit 06696b1f35
3 changed files with 12 additions and 6 deletions
calendar/templates
default
pixelegg

View File

@ -227,6 +227,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_alarm_date_display { .calendar_alarm_date_display {
display: none; display: none;
} }
/*overwirte margin applied by egwGridView*/
.calendar_alarm_grid{
margin-left: 0 !important;
}
/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers) /* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
*/ */
.calendar_calGridHeader{ .calendar_calGridHeader{

View File

@ -36,8 +36,7 @@
<row class="th" disabled="@view" height="28"> <row class="th" disabled="@view" height="28">
<description value="Add new alarm" span="all"/> <description value="Add new alarm" span="all"/>
</row> </row>
<row class="row add_alarm_action" disabled="@no_add_alarm"> <row class="row add_alarm_action" valign="top" disabled="@no_add_alarm">
<description value="Set at"/>
<hbox span="all"> <hbox span="all">
<menulist> <menulist>
<menupopup type="select-number" statustext="" id="new_alarm[options]" onchange="app.calendar.alarm_custom_date"/> <menupopup type="select-number" statustext="" id="new_alarm[options]" onchange="app.calendar.alarm_custom_date"/>
@ -49,9 +48,8 @@
<button label="Add" id="button[add_alarm]" image="add" background_image="1"/> <button label="Add" id="button[add_alarm]" image="add" background_image="1"/>
</hbox> </hbox>
</row> </row>
<row valign="top" disabled="!@alarm"> <row valign="top" disabled="!@alarm" height="100%">
<description value="Alarms"/> <grid id="alarm" width="100%" class="egwGridView_grid calendar_alarm_grid">
<grid id="alarm" width="100%" class="egwGridView_grid">
<columns> <columns>
<column/> <column/>
<column/> <column/>

View File

@ -11,7 +11,7 @@
* @package calendar * @package calendar
* @version $Id$ * @version $Id$
*/ */
/* $Id: app.css 46220 2014-03-12 13:42:34Z hnategh $ */ /* $Id: app.css 47104 2014-05-27 15:02:56Z hnategh $ */
/* Header classes */ /* Header classes */
tr.dialogHeader td, tr.dialogHeader td,
tr.dialogHeader2 td, tr.dialogHeader2 td,
@ -243,6 +243,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
.calendar_alarm_date_display { .calendar_alarm_date_display {
display: none; display: none;
} }
/*overwirte margin applied by egwGridView*/
.calendar_alarm_grid {
margin-left: 0 !important;
}
/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers) /* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
*/ */
.calendar_calGridHeader { .calendar_calGridHeader {