mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 06:18:28 +01:00
Merge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle
This commit is contained in:
commit
3a31c0349a
@ -149,7 +149,7 @@ class block_course_overview_renderer extends plugin_renderer_base {
|
|||||||
$output .= html_writer::start_tag('div', array('class' => 'activity_overview'));
|
$output .= html_writer::start_tag('div', array('class' => 'activity_overview'));
|
||||||
$url = new moodle_url("/mod/$module/index.php", array('id' => $cid));
|
$url = new moodle_url("/mod/$module/index.php", array('id' => $cid));
|
||||||
$modulename = get_string('modulename', $module);
|
$modulename = get_string('modulename', $module);
|
||||||
$icontext = html_writer::link($url, $this->output->pix_icon('icon', $modulename, 'mod_'.$module, array('class'=>'icon')).' ');
|
$icontext = html_writer::link($url, $this->output->pix_icon('icon', $modulename, 'mod_'.$module, array('class'=>'iconlarge')));
|
||||||
if (get_string_manager()->string_exists("activityoverview", $module)) {
|
if (get_string_manager()->string_exists("activityoverview", $module)) {
|
||||||
$icontext .= get_string("activityoverview", $module);
|
$icontext .= get_string("activityoverview", $module);
|
||||||
} else {
|
} else {
|
||||||
|
@ -4,12 +4,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.block_course_overview .content {
|
.block_course_overview .content {
|
||||||
margin-left: 20px;
|
margin: 0 20px;
|
||||||
|
}
|
||||||
|
.block_course_overview .content .notice {
|
||||||
|
margin: 5px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.block_course_overview .coursebox {
|
.block_course_overview .coursebox {
|
||||||
padding: 15px 0 10px 10px;
|
padding: 15px;
|
||||||
width: 98%;
|
width: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.block_course_overview .profilepicture {
|
.block_course_overview .profilepicture {
|
||||||
@ -36,8 +39,7 @@
|
|||||||
|
|
||||||
.block_course_overview .content h2.title {
|
.block_course_overview .content h2.title {
|
||||||
float: left;
|
float: left;
|
||||||
margin-bottom: 0;
|
margin: 0 0 .5em 0;
|
||||||
margin-top: 0;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
.dir-rtl .block_course_overview .content h2.title {
|
.dir-rtl .block_course_overview .content h2.title {
|
||||||
@ -109,6 +111,8 @@
|
|||||||
.block_course_overview .activity_overview {
|
.block_course_overview .activity_overview {
|
||||||
padding: 2px;
|
padding: 2px;
|
||||||
}
|
}
|
||||||
|
.block_course_overview .activity_overview img.iconlarge { vertical-align: text-bottom; margin-right: 6px; }
|
||||||
|
.dir-rtl .block_course_overview .activity_overview img.iconlarge { margin-left: 6px; margin-right: 0;}
|
||||||
|
|
||||||
.block_course_overview .singleselect {
|
.block_course_overview .singleselect {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
@ -125,7 +129,3 @@
|
|||||||
border-width: 2px;
|
border-width: 2px;
|
||||||
border-style: dashed;
|
border-style: dashed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.block_course_overview .collapsibleregioninner .name {margin-right: 20px;}
|
|
||||||
.block_course_overview .collapsibleregioninner .info,
|
|
||||||
.block_course_overview .collapsibleregioninner .details {margin-right: 25px;}
|
|
@ -338,14 +338,8 @@ input#id_externalurl {direction:ltr;}
|
|||||||
/**
|
/**
|
||||||
* My Moodle
|
* My Moodle
|
||||||
*/
|
*/
|
||||||
.path-my .coursebox .overview .name {margin-left:20px;}
|
.path-my .coursebox .overview {margin: 15px 30px 10px 30px;}
|
||||||
.dir-rtl .path-my .coursebox .overview .name {margin-right:20px;}
|
.path-my .coursebox .info {float: none; margin: 0;}
|
||||||
.path-my .coursebox .overview .info {margin-left:25px;}
|
|
||||||
.dir-rtl .path-my .coursebox .overview .info {margin-right:25px;}
|
|
||||||
.path-my .coursebox .overview .details {margin-left:25px;}
|
|
||||||
.dir-rtl .path-my .coursebox .overview .details {margin-right:25px;}
|
|
||||||
.path-my .coursebox .overview {margin-bottom:10px;}
|
|
||||||
.path-my .coursebox .info {float: none;}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Logs
|
* Logs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user