Permalink
Browse files

Merge branch 'MDL-59846-master' of git://github.com/lameze/moodle

  • Loading branch information...
dmonllao committed Sep 4, 2017
2 parents 0426cc9 + 0b8e721 commit d8e789c83787c414eb9d5ad4d99acea77285a4b2
Showing with 9 additions and 8 deletions.
  1. +3 −2 calendar/renderer.php
  2. +3 −3 theme/bootstrapbase/less/moodle/calendar.less
  3. +3 −3 theme/bootstrapbase/style/moodle.css
@@ -281,7 +281,7 @@ public function event(calendar_event $event, $showactions=true) {
$output .= html_writer::tag('div', $source, array('class' => 'subscription'));
}
if (!empty($event->courselink)) {
$output .= html_writer::tag('div', $event->courselink, array('class' => 'course'));
$output .= html_writer::tag('div', $event->courselink);
}
if (!empty($event->time)) {
$output .= html_writer::tag('span', $event->time, array('class' => 'date pull-xs-right m-r-1'));
@@ -291,7 +291,8 @@ public function event(calendar_event $event, $showactions=true) {
}
if (!empty($event->actionurl)) {
$output .= html_writer::tag('div', html_writer::link(new moodle_url($event->actionurl), $event->actionname));
$actionlink = html_writer::link(new moodle_url($event->actionurl), $event->actionname);
$output .= html_writer::tag('div', $actionlink, ['class' => 'action']);
}
$output .= $this->output->box_end();
@@ -181,14 +181,14 @@
margin-right: 0.5rem;
}
.name,
.course {
.action {
margin-bottom: 5px;
}
.date {
float: right;
}
.course,
.subscription {
.subscription,
.action {
float: left;
clear: left;
}
@@ -5718,14 +5718,14 @@ img.iconsmall {
margin-right: 0.5rem;
}
.path-calendar .maincalendar .eventlist .event .name,
.path-calendar .maincalendar .eventlist .event .course {
.path-calendar .maincalendar .eventlist .event .action {
margin-bottom: 5px;
}
.path-calendar .maincalendar .eventlist .event .date {
float: right;
}
.path-calendar .maincalendar .eventlist .event .course,
.path-calendar .maincalendar .eventlist .event .subscription {
.path-calendar .maincalendar .eventlist .event .subscription,
.path-calendar .maincalendar .eventlist .event .action {
float: left;
clear: left;
}

0 comments on commit d8e789c

Please sign in to comment.