extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 20:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - Fix today button positioning - was too far down in Firefox

Browse Source
This commit is contained in:
nathangray 2018-07-20 10:09:58 -06:00
parent 82ea4fe2de
commit b17c525e75
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/js/app.js
View File

@ -3437,12 +3437,12 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
if(today.length && go_button.length) if(today.length && go_button.length)
{ {
go_button.position({my: 'left+8px center', at: 'right center-1',of: jQuery('#calendar-sidebox_date .ui-datepicker-year')}); go_button.position({my: 'left+8px center', at: 'right center-1',of: jQuery('#calendar-sidebox_date .ui-datepicker-year')});
today.css({
'left': (buttons.first().offset().left + buttons.last().offset().left)/2 - Math.ceil(today.outerWidth(true)/2),
'top': go_button.css('top')
});
buttons.position({my: 'center', at: 'center', of: go_button}) buttons.position({my: 'center', at: 'center', of: go_button})
.css('left', ''); .css('left', '');
today.position({my: 'top', at: 'top', of: buttons});
today.css({
'left': (buttons.first().offset().left + buttons.last().offset().left)/2 - Math.ceil(today.outerWidth(true)/2),
});
} }
if(auto_update) if(auto_update)
{ {

3
calendar/templates/default/app.css
View File

@ -67,6 +67,9 @@
#calendar-et2_target { #calendar-et2_target {
position: relative; position: relative;
} }
#calendar-et2_target > div {
position: relative;
}
#calendar-sidebox_owner { #calendar-sidebox_owner {
width: 90%; width: 90%;
} }

14
calendar/templates/mobile/app.css
View File

@ -89,6 +89,9 @@
#calendar-et2_target { #calendar-et2_target {
position: relative; position: relative;
} }
#calendar-et2_target > div {
position: relative;
}
#calendar-sidebox_owner { #calendar-sidebox_owner {
width: 90%; width: 90%;
} }
@ -1362,6 +1365,12 @@ Hide subsequent headers in week view with non-consolidated owners
} }
.calendar_freetime_dow { .calendar_freetime_dow {
position: absolute; position: absolute;
width: 30ex;
height: 22em;
}
.calendar_freetime_dow ul.ui-multiselect-checkboxes {
overflow-y: visible;
height: 20em;
} }
img.calendar_print_button, img.calendar_print_button,
img.calendar_print_appicon { img.calendar_print_appicon {
@ -1518,6 +1527,8 @@ img.calendar_print_appicon {
#calendar-list { #calendar-list {
/* Keeps the scrollbar in the window in chrome */ /* Keeps the scrollbar in the window in chrome */
margin-right: 10px; margin-right: 10px;
/* Prevents going to far down (off bottom)*/
height: calc(25%);
} }
#calendar_sidebox_content .egw_fw_ui_category_content { #calendar_sidebox_content .egw_fw_ui_category_content {
padding-left: 0px !important; padding-left: 0px !important;
@ -2135,7 +2146,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
* border-color: depending on category * border-color: depending on category
* background: depending on category (shade) * background: depending on category (shade)
*/ */
background-color: #679FD2; background-color: #679fd2;
border-top: 1px solid;
} }
.calendar_calEvent:not([class*=" cat_"]) { .calendar_calEvent:not([class*=" cat_"]) {
/* Defaults for no category, so we don't override it */ /* Defaults for no category, so we don't override it */

3
calendar/templates/pixelegg/app.css
View File

@ -77,6 +77,9 @@
#calendar-et2_target { #calendar-et2_target {
position: relative; position: relative;
} }
#calendar-et2_target > div {
position: relative;
}
#calendar-sidebox_owner { #calendar-sidebox_owner {
width: 90%; width: 90%;
} }