Skip to content

Commit

Permalink
Revert "separation between events"
Browse files Browse the repository at this point in the history
This reverts commit 6c2fb80.
  • Loading branch information
sstamer committed Feb 24, 2025
1 parent 169ec64 commit d5421ff
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
8 changes: 2 additions & 6 deletions tine20/Calendar/css/daysviewpanel.css
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
/*background: #EDEDED url(../../images/white-gradiend.png) repeat-y right;*/
/*border-radius: 8px;*/
position: absolute;
/*border: 4px solid #808080;*/
border: 4px solid #808080;
overflow: hidden;

text-align: left;
Expand All @@ -243,13 +243,9 @@
border-right: none;
}

.cal-daysviewpanel-event > * {
left: 4px;
}

.cal-daysviewpanel-scroller .cal-daysviewpanel-event {
box-sizing: border-box;
border-top: 1px solid #EDEDED !important;
border-top: 1px solid white !important;
}
.cal-daysviewpanel-scroller .cal-daysviewpanel-body-daycolumn-today .cal-daysviewpanel-event {
border-top: 1px solid #EBF3FD !important;
Expand Down
3 changes: 1 addition & 2 deletions tine20/Calendar/js/DaysView.js
Original file line number Diff line number Diff line change
Expand Up @@ -1553,8 +1553,7 @@ Ext.extend(Tine.Calendar.DaysView, Tine.Calendar.AbstractView, {
);

ts.event = new Ext.XTemplate(
'<div id="{id}" class="cal-daysviewpanel-event {extraCls}" style="width: {width}; height: {height}; left: {left}; top: {top}; z-index: {zIndex}; background-color: {bgColor}; --border-image: {infoColors};">',
'<div style="position: absolute; height: 100%; width: 4px; left: 0; top: 0; background: {infoColors}"></div>',
'<div id="{id}" class="cal-daysviewpanel-event {extraCls}" style="width: {width}; height: {height}; left: {left}; top: {top}; z-index: {zIndex}; background-color: {bgColor}; border-image: {infoColors};">',
'<div class="cal-daysviewpanel-event-header" style="background-color: {bgColor};">',
'<div class="cal-daysviewpanel-event-header-inner" style="background-color: {bgColor}; z-index: {zIndex};">{startTime}</div>',
'<div class="cal-daysviewpanel-event-header-icons">',
Expand Down
4 changes: 2 additions & 2 deletions tine20/Calendar/js/DaysViewEventUI.js
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ Tine.Calendar.DaysViewEventUI = Ext.extend(Tine.Calendar.EventUI, {

createBorderColors: function (colors) {
if(colors.length === 0) {
return 'linear-gradient(to bottom, rgb(210, 210, 210) 0%, rgb(210, 210, 210) 100%)';
return 'linear-gradient(to bottom, rgb(210, 210, 210) 0%, rgb(210, 210, 210) 100%) 0 0 0 3';
}
let out = 'linear-gradient(to bottom';
let pct = 100 / colors.length;
Expand All @@ -253,7 +253,7 @@ Tine.Calendar.DaysViewEventUI = Ext.extend(Tine.Calendar.EventUI, {
c++;
out += ', '+rgb+' '+(c*pct)+'%';
});
return out + ')';
return out + ') 0 0 0 3 stretch';
},

onSelectedChange: function(state){
Expand Down

0 comments on commit d5421ff

Please sign in to comment.