(css,js) Fix display of all-day events

pull/190/head
Francis Lachapelle 2016-01-27 10:28:40 -05:00
parent b064512549
commit be441f5cd3
3 changed files with 18 additions and 6 deletions

View File

@ -85,8 +85,10 @@
// Set position
iElement.css('left', left + '%');
iElement.css('right', right + '%');
iElement.addClass('starts' + scope.block.start);
iElement.addClass('lasts' + scope.block.length);
if (!scope.block.component || !scope.block.component.c_isallday) {
iElement.addClass('starts' + scope.block.start);
iElement.addClass('lasts' + scope.block.length);
}
// Set background color
if (scope.block.component)

View File

@ -63,11 +63,12 @@ $quarter_height: 10px;
md-toolbar {
&.daysView, &.monthView {
background-color: #fff;
overflow: hidden;
z-index: $z-index-toolbar - 1;
.days {
margin-left: $hours_margin;
overflow-y: scroll;
&:not([sg-calendar-scroll-view$="allday"]) {
overflow-y: scroll;
}
&.dayLabels {
.day {
padding-left: 1%;
@ -78,7 +79,12 @@ $quarter_height: 10px;
}
}
}
&.daysView {
// Toolbar of day/week views
min-height: inherit;
}
&[sg-view$=dayview] {
// Toolbar of day view only
.dayLabels {
.day {
display: flex;
@ -87,6 +93,7 @@ $quarter_height: 10px;
}
}
&.monthView {
// Toolbar of month view
> div {
overflow-y: scroll;
}
@ -97,6 +104,8 @@ $quarter_height: 10px;
.allDaysView {
border-bottom: 1px solid sg-color($sogoPaper, 300);
max-height: $sg-font-size-4 * 6;
overflow: hidden;
overflow-y: scroll;
.day {
position: relative;
@ -337,7 +346,7 @@ $quarter_height: 10px;
}
&-left {
left: -$block_margin;
left: -2px;
.dragGrip {
bottom: 0;
left: -1px;
@ -345,7 +354,7 @@ $quarter_height: 10px;
}
&-right {
right: -$block_margin;
right: -2px;
.dragGrip {
right: -1px;
}

View File

@ -96,6 +96,7 @@ $detailView-width: grid-step(8) !global;
.sg-face, .sg-back {
> md-card {
// Make sure the card is visible and its content scrollable
overflow: hidden;
min-width: 100%;
min-height: 0;