mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2016-11-14 12:13:18 +01:00
commit 2dcb3746b0
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/forum/discuss.php
View File

@ -294,7 +294,7 @@ $neighbourlinks = $renderer->neighbouring_discussion_navigation($neighbours['pre
echo $neighbourlinks;
/// Print the controls across the top
echo '<div class="discussioncontrols clearfix"><div class="controlscontainer">';
echo '<div class="discussioncontrols clearfix"><div class="controlscontainer m-b-1">';
if (!empty($CFG->enableportfolios) && has_capability('mod/forum:exportdiscussion', $modcontext)) {
require_once($CFG->libdir.'/portfoliolib.php');

4
theme/boost/scss/moodle/modules.scss
View File

@ -148,6 +148,10 @@ select {
#page-mod-forum-discuss .discussioncontrols {
width: auto;
margin: 0;
.form-inline input {
margin-top: -1px;
}
}
.maincalendar .calendarmonth td,

2
theme/boost/templates/core/url_select.mustache
View File

@ -10,7 +10,7 @@
{{#helpicon}}
{{>core/help_icon}}
{{/helpicon}}
<select {{#attributes}}{{name}}="{{value}}" {{/attributes}} id="{{id}}" class="form-control {{classes}}" name="jump">
<select {{#attributes}}{{name}}="{{value}}" {{/attributes}} id="{{id}}" class="custom-select {{classes}}" name="jump">
{{#options}}
{{#isgroup}}
<optgroup label="{{name}}">