diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index 8d06bf7411..8a521795c8 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -1418,8 +1418,10 @@ img.calendar_print_button, img.calendar_print_appicon { /*weekend slideSwitch in toolbar*/ #calendar-toolbar_app_header { - font-weight: bold; color: #616161; + font-size: 14px; + margin: auto; + height: 20px; } #calendar-toolbar_toolbar .et2_toolbar_more { margin-top: 0; diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css index cdfe6488b0..8ab4408888 100644 --- a/calendar/templates/mobile/app.css +++ b/calendar/templates/mobile/app.css @@ -69,7 +69,19 @@ #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > span.et2_label { overflow: visible !important; } + div.calendar_calEvent { + opacity: 1; + filter: opacity(0.85); + -webkit-filter: opacity(0.85); + border: 1px solid; } + /* Make times & all day description bold for better visibility */ + div.calendar_calDayColAllDay div.calendar_calEventBodySmall, + div.calendar_calEventHeader, + div.calendar_calEventHeaderSmall { + font-weight: bold; + } +} /** * Sidebox */ @@ -89,6 +101,10 @@ #calendar-sidebox_cat_id ~ * { vertical-align: top; display: inline-block; + background-color: transparent; + background-image: url(../../../vendor/bower-asset/jquery-ui/themes/redmond/images/ui-icons_469bdd_256x240.png); + border: none; + box-shadow: none; } #calendar-sidebox_buttons tbody { width: 100%; @@ -266,6 +282,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget .calendar_calBirthday a { color: #626161; } +#calendar-view .calendar_calBirthday { + background-image: url(images/cake.png); + background-repeat: no-repeat; + background-size: 16px; + background-position: 10px center; +} /* Supress tooltips on holidays shown as events */ .calendar_calEventTooltip.calendar_calBirthday, .calendar_calEventTooltip.calendar_calHoliday { @@ -328,16 +350,25 @@ Hide subsequent headers in week view with non-consolidated owners #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] { display: none; } +#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader > span.et2_label { + position: absolute; + top: 2em; +} +#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer { + height: calc(6.5em); +} #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; -} -#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label:hover { - overflow: visible; - width: auto; - background-color: inherit; - z-index: 100; + display: block; + position: static; + width: calc(42%); + margin-left: 58px; + color: white; + background-color: #2D6393; + text-align: center; + line-height: 1.5em; + font-size: 14px; + z-index: 35; } /* single row in the time-line you dont need to set a bgcolor, but you can */ @@ -537,12 +568,17 @@ Hide subsequent headers in week view with non-consolidated owners display: flex; align-items: stretch; } +#calendar-view_view.hideDayColHeader .calendar_calGridHeader > div { + height: auto; +} .calendar_calGridHeader > label { float: left; font-size: 14px; line-height: 27px; width: 58px; text-align: center; + position: absolute; + top: 0px; } .calendar_calGridHeader > span.et2_label { position: absolute; @@ -591,7 +627,7 @@ Hide subsequent headers in week view with non-consolidated owners /* alarm_date widget disabled class */ .calendar_alarm_date_display { - display: none; + display: none !important; } /*overwirte margin applied by egwGridView*/ .calendar_alarm_grid { @@ -647,6 +683,7 @@ Hide subsequent headers in week view with non-consolidated owners -ms-transition: none !important; transition: none !important; opacity: 0.85; + -moz-opacity: 0.85; /* set via inline style on runtime: * top: depending on startime * height: depending on length @@ -666,7 +703,7 @@ Hide subsequent headers in week view with non-consolidated owners } .calendar_calTimeGrid:not(.calendar_calTimeGridList) *:not(.calendar_calDayColAllDay) > .calendar_calEvent::after { width: 100%; - background-color: rgba(255, 255, 255, 0.9); + background-color: rgba(255, 255, 255, 0.8); height: 5px; content: "\02026"; left: 0px; @@ -720,7 +757,6 @@ Hide subsequent headers in week view with non-consolidated owners } .calendar_calDayColHeader .calendar_calEvent .calendar_calEventBody { white-space: nowrap; - background-color: #f0f0f0; } .calendar_calEventTooltip { padding-left: 6px; @@ -765,7 +801,7 @@ Hide subsequent headers in week view with non-consolidated owners * background-color: depending on category * color: white || black depending on cat; */ - background-color: rgba(255, 255, 255, 0.9); + background-color: rgba(255, 255, 255, 0.8); } .calendar_calEventHeader .calendar_calEventTitle { display: none; @@ -774,6 +810,9 @@ Hide subsequent headers in week view with non-consolidated owners font-size: 8pt; line-height: 10pt; } +.calendar_calEvent[data-priority='3'] .calendar_calEventTitle { + color: red; +} .calendar_calEventIcons { position: absolute; right: 0px; @@ -796,7 +835,7 @@ Hide subsequent headers in week view with non-consolidated owners right: 2px; height: 99%; white-space: normal; - background-color: rgba(255, 255, 255, 0.9); + background-color: rgba(255, 255, 255, 0.8); } .calendar_calEventBody > p, .calendar_calEventBodySmall > p { @@ -940,17 +979,18 @@ Hide subsequent headers in week view with non-consolidated owners margin: 0px; padding: 2px; font-weight: bold; + height: 23px; + line-height: 23px; } .calendar_calDayTodos .calendar_calDayTodosTable { overflow: auto; position: absolute; - top: 2em; + top: 3em; bottom: 8px; width: 100%; } .calendar_calDayTodos { width: 98%; - margin-left: 10px; border: 1px solid silver; } .calendar_calDayTodosHeader { @@ -962,6 +1002,17 @@ Hide subsequent headers in week view with non-consolidated owners .calendar_calDayTodosTable tr td span:first-child { white-space: nowrap; } +.calendar_calDayTodosHeader button { + width: 24px; + height: 24px; + padding-left: 0px; + margin: 0px 4px 1px 0; + border-radius: 3px; + border: 1px solid silver; + background-color: #fafafa; + position: absolute; + left: 2px; +} /****************************************************** * CSS settings for the planner views (calendar_plannerWidget) * ******************************************************/ @@ -1040,6 +1091,9 @@ Hide subsequent headers in week view with non-consolidated owners left: 10px; top: 2px; } +.calendar_plannerRowWidget.current_user { + background-color: rgba(0, 0, 0, 0.05); +} .calendar_plannerRowWidget:hover { background-color: rgba(103, 159, 210, 0.2); } @@ -1341,8 +1395,10 @@ img.calendar_print_appicon { } /*weekend slideSwitch in toolbar*/ #calendar-toolbar_app_header { - font-weight: bold; color: #616161; + font-size: 14px; + margin: auto; + height: 20px; } #calendar-toolbar_toolbar .et2_toolbar_more { margin-top: 0; @@ -1420,6 +1476,16 @@ img.calendar_print_appicon { #calendar-edit_role { float: left; } +.category_report_cats { + height: 80%; + overflow-y: auto; + display: block; +} +#calendar-category_report_grid { + display: block; + max-height: 550px; + overflow-y: auto; +} /*generell*/ .egw_fw_content_browser_iframe img[src$="svg"] { background-color: #828282 !important; @@ -2042,11 +2108,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget .calendar_calViewUserNameFirst:after { content: ", "; } -/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers) - */ -.calendar_calGridHeader { - background-color: #f0f0f0; -} /* contains one event: header-row & -body */ .calendar_calEvent { @@ -2225,11 +2286,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget background-color: #1aa200; background-color: #189800 !important; } -.calendar_calDayTodos { - width: 98%; - margin-left: 10px; - border: 1px solid silver; -} .calendar_calDayTodosHeader { text-align: center; } @@ -2337,53 +2393,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget margin: -2px -1px 0px -2px; width: 410px; } -/** ##################################################################################### - * @package preferences - * ###################################################################################### - */ -table.prefTable { - width: 100%; -} -tr.prefRow { - position: relative; -} -td.prefName { - width: 50%; -} -tr.prefRow > td { - vertical-align: bottom; - /* otherwise help will cover bigger prefValue */ -} -.prefHelp { - position: absolute; - right: 55%; - display: none; - width: 33%; - background-color: #ffffff; -} -tr.prefRow:hover .prefHelp { - display: block; - z-index: 10; - /* FF: displays it under next prefName without */ -} -.prefDefault, -.prefValue { - float: left; -} -.prefValue { - margin-right: 5px; -} -.prefValue textarea, -textarea.prefValue { - width: 99%; - height: 5em; -} -.prefType, -.prefApp { - font-size: 150%; - display: inline-block; - padding-bottom: 5px; -} /* ########################################################################################################################################### * Calendar specfic /* ########################################################################################################################################### @@ -2603,11 +2612,12 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { right: 2px; } #calendar-sidebox_date .ui-datepicker-year { - padding-right: 5px !important; + padding-right: 0px !important; min-width: 65px; } #calendar-sidebox_date .ui-datepicker-month { min-width: 60px; + padding-right: 0px !important; } #calendar-sidebox_date .ui-datepicker-header a span { width: 20px; @@ -2658,6 +2668,12 @@ div#calendar-container div.calendar table tbody tr.rowhilite td { #calendar_merge { margin: 9px 0 0 0; } +#calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer { + height: calc(6.5em); +} +#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label { + width: calc(42%); +} /* ######################################################################################## /* * Calendar END */ /* tablets and smartphones */ diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 13d281fbd7..25c112ce29 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -1383,8 +1383,10 @@ img.calendar_print_appicon { } /*weekend slideSwitch in toolbar*/ #calendar-toolbar_app_header { - font-weight: bold; color: #616161; + font-size: 14px; + margin: auto; + height: 20px; } #calendar-toolbar_toolbar .et2_toolbar_more { margin-top: 0; @@ -1557,13 +1559,13 @@ img.sideboxstar:active { .calendar_calEventBodySmall img[src$="svg"], .calendar_calDayColHeader img[src$="svg"] { background-color: #0c5da5; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); - background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); - background-image: linear-gradient(top, #0c5da5, #0c5da5); + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMEM1REE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #0C5DA5, #0C5DA5); + background-image: -ms-linear-gradient(top, #0C5DA5, #0C5DA5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0C5DA5), to(#0C5DA5)); + background-image: -webkit-linear-gradient(top, #0C5DA5, #0C5DA5); + background-image: -o-linear-gradient(top, #0C5DA5, #0C5DA5); + background-image: linear-gradient(top, #0C5DA5, #0C5DA5); background-repeat: repeat-x; } /* calender view*/ @@ -1599,10 +1601,10 @@ div.calendar { font-weight: bold; /* Pressing it will take you to the current date */ /*text-align: center;*/ - background-color: #679fd2; + background-color: #679FD2; } .calendar thead .title:hover { - background-color: #e6e6e6 !important; + background-color: #E6E6E6 !important; } .calendar thead .headrow { /* Row