extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some of calendar's toolbar actions not having icon or caption

Browse Source
This commit is contained in:
Hadi Nategh 2022-08-05 13:03:59 +02:00
parent 10b61cc612
commit 3fe7398b18
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/js/etemplate/et2_widget_toolbar.ts
View File

@ -630,6 +630,7 @@ export class et2_toolbar extends et2_DOMWidget implements et2_IInput
toggleOff: action.data.toggle_off, toggleOff: action.data.toggle_off,
class: `et2_toolbar_draggable${this.id}`, class: `et2_toolbar_draggable${this.id}`,
}, this); }, this);
widget.style.backgroundImage = `url(${action.iconUrl})`;
widget.value = action.checked; widget.value = action.checked;
action.data.widget = widget; action.data.widget = widget;
widget.onchange = actionHandler; widget.onchange = actionHandler;

6
api/templates/default/etemplate2.css
View File

@ -2797,6 +2797,10 @@ div.ui-dialog div.ui-dialog-content > div {
.et2_toolbar *[class ^="et2_toolbar_draggable"] {cursor: pointer !important;} .et2_toolbar *[class ^="et2_toolbar_draggable"] {cursor: pointer !important;}
.et2_toolbar et2-button.et2_toolbar_onlyCaption,
.et2_toolbar .et2_toolbar_actionlist et2-button.et2_toolbar_onlyCaption::part(prefix) {
width: auto;
}
div.et2_toolbar.ui-widget-header { div.et2_toolbar.ui-widget-header {
background: none; background: none;
} }
@ -2881,7 +2885,7 @@ div.et2_toolbar.ui-widget-header {
background-color: #fafafa; background-color: #fafafa;
} }
.et2_toolbar et2-button { .et2_toolbar et2-button, .et2_toolbar et2-switch {
margin-right: 1ex; margin-right: 1ex;
min-width: 24px; min-width: 24px;
} }

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

@ -1577,12 +1577,14 @@ img.calendar_print_button, img.calendar_print_appicon {
filter: grayscale(1) contrast(0.9999) opacity(0.7); filter: grayscale(1) contrast(0.9999) opacity(0.7);
width: 24px; width: 24px;
} }
et2-switch#calendar-toolbar_toolbar-weekend {
background-image: none !important;
}
#calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked], #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked],
#toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked] , #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked] ,
#toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked]{ #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked]{
filter: none; filter: none;
box-shadow: inset 1px 1px 1px 1px gray !important; box-shadow: inset 1px 1px 1px 1px gray !important;
width: var(--width);
} }
#calendar-toolbar_toolbar span[data-group="integration"] > et2-switch span.label, #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch span.label,
#toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] span.label, #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] span.label,

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

@ -1532,12 +1532,14 @@ img.calendar_print_appicon {
filter: grayscale(1) contrast(0.9999) opacity(0.7); filter: grayscale(1) contrast(0.9999) opacity(0.7);
width: 24px; width: 24px;
} }
et2-switch#calendar-toolbar_toolbar-weekend {
background-image: none !important;
}
#calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked], #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch[checked],
#toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked], #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-integration"][checked],
#toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked] { #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"][checked] {
filter: none; filter: none;
box-shadow: inset 1px 1px 1px 1px gray !important; box-shadow: inset 1px 1px 1px 1px gray !important;
width: var(--width);
} }
#calendar-toolbar_toolbar span[data-group="integration"] > et2-switch span.label, #calendar-toolbar_toolbar span[data-group="integration"] > et2-switch span.label,
#toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] span.label, #toolbar-menulist et2-switch[id^="calendar-toolbar_toolbar-video_toggle"] span.label,