mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-25 12:21:26 +02:00
condense calendar sidebox menu
-- removed <hrule>s -- hide integration et2-box if empty --cleanup margins (cherry picked from commit 1ac6a404974aaca4355890c48c19891a155dfa5b)
This commit is contained in:
parent
ba3a3cdaa6
commit
9dddf30a64
@ -363,7 +363,7 @@ export class SidemenuDate extends Et2Date
|
|||||||
{
|
{
|
||||||
// Plain input
|
// Plain input
|
||||||
return html`
|
return html`
|
||||||
<input type="text"></input>`;
|
<input type="text" style="display: none"></input>`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,9 +70,6 @@
|
|||||||
#calendar-et2_target > div {
|
#calendar-et2_target > div {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_cat_id {
|
|
||||||
margin-bottom: 5px;
|
|
||||||
}
|
|
||||||
#calendar-sidebox_cat_id ~ * {
|
#calendar-sidebox_cat_id ~ * {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
@ -80,6 +77,11 @@
|
|||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*overrides above for disabled et2-box*/
|
||||||
|
#calendar-sidebox_cat_id ~ et2-box[disabled]{
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
#calendar-sidebox_weekend {
|
#calendar-sidebox_weekend {
|
||||||
/* Special css styling goes here */
|
/* Special css styling goes here */
|
||||||
}
|
}
|
||||||
|
@ -17,13 +17,12 @@ Egroupware
|
|||||||
<calendar-date id="date"></calendar-date>
|
<calendar-date id="date"></calendar-date>
|
||||||
<et2-textbox type="hidden" id="first"></et2-textbox>
|
<et2-textbox type="hidden" id="first"></et2-textbox>
|
||||||
<et2-textbox type="hidden" id="last"></et2-textbox>
|
<et2-textbox type="hidden" id="last"></et2-textbox>
|
||||||
<hrule/>
|
|
||||||
<et2-select-cat id="cat_id" placeholder="All categories" onchange="app.calendar.update_state({cat_id: widget.getValue()});" emptyLabel="All categories" multiple="true"></et2-select-cat>
|
<et2-select-cat id="cat_id" placeholder="All categories" onchange="app.calendar.update_state({cat_id: widget.getValue()});" emptyLabel="All categories" multiple="true"></et2-select-cat>
|
||||||
<et2-select id="status_filter" onchange="app.calendar.update_state({status_filter: widget.getValue()});" noLang="true"></et2-select>
|
<et2-select id="status_filter" onchange="app.calendar.update_state({status_filter: widget.getValue()});" noLang="true"></et2-select>
|
||||||
<hrule/>
|
|
||||||
<et2-calendar-owner id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" tabindex="0"/>
|
<et2-calendar-owner id="owner" onchange="app.calendar.update_state({owner: widget.getValue()}); return false;" multiple="true" allowFreeEntries="false" tabindex="0"/>
|
||||||
<hrule/>
|
|
||||||
<et2-box>
|
<et2-box disabled="!@integration">
|
||||||
<grid id="integration" disabled="!@integration" width="100%">
|
<grid id="integration" disabled="!@integration" width="100%">
|
||||||
<columns>
|
<columns>
|
||||||
<column/>
|
<column/>
|
||||||
|
@ -79,15 +79,16 @@
|
|||||||
#calendar-et2_target > div {
|
#calendar-et2_target > div {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
#calendar-sidebox_cat_id {
|
|
||||||
margin-bottom: 5px;
|
|
||||||
}
|
|
||||||
#calendar-sidebox_cat_id ~ * {
|
#calendar-sidebox_cat_id ~ * {
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
border: none;
|
border: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
/*overrides above for disabled et2-box*/
|
||||||
|
#calendar-sidebox_cat_id ~ et2-box[disabled] {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
#calendar-sidebox_weekend {
|
#calendar-sidebox_weekend {
|
||||||
/* Special css styling goes here */
|
/* Special css styling goes here */
|
||||||
}
|
}
|
||||||
@ -1433,7 +1434,7 @@ img.calendar_print_appicon {
|
|||||||
/*weekend slideSwitch in toolbar*/
|
/*weekend slideSwitch in toolbar*/
|
||||||
#calendar-toolbar_app_header {
|
#calendar-toolbar_app_header {
|
||||||
color: #000;
|
color: #000;
|
||||||
font-size: var(--sl-font-size-large);
|
font-size: 14px;
|
||||||
height: 1.6em;
|
height: 1.6em;
|
||||||
padding: 4px 3px 3px;
|
padding: 4px 3px 3px;
|
||||||
background: #b4cee773;
|
background: #b4cee773;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user